diff --git a/package.json b/package.json
index d9f5cb27c79..e2e65472cc3 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,7 @@
"angular2": "2.0.0-beta.0",
"autoprefixer": "^6.3.3",
"es6-promise": "^3.0.2",
- "es6-shim": "^0.33.3",
+ "es6-shim": "^0.35.0",
"expect.js": "~0.2.0",
"glob": "~3.2.7",
"grunt": "~0.4.0",
@@ -51,7 +51,7 @@
"karma-phantomjs-launcher": "0.2.1",
"load-grunt-tasks": "3.4.0",
"mocha": "2.3.4",
- "phantomjs": "~2.1.3",
+ "phantomjs": "^2.1.3",
"reflect-metadata": "0.1.2",
"rxjs": "5.0.0-beta.2",
"sass-lint": "^1.5.0",
diff --git a/public/sass/components/_cards.scss b/public/sass/components/_cards.scss
index 0d4d1ae88c9..582e782ce9a 100644
--- a/public/sass/components/_cards.scss
+++ b/public/sass/components/_cards.scss
@@ -99,6 +99,10 @@
.card-list-layout-grid {
+ .card-item-header-action {
+ float: right;
+ }
+
.card-item-wrapper {
width: 100%;
padding: 0 1.5rem 1.5rem 0rem;
@@ -128,6 +132,14 @@
width: 33.333333%;
}
}
+
+ &.card-list-layout-grid--max-2-col {
+ @include media-breakpoint-up(lg) {
+ .card-item-wrapper {
+ width: 50%;
+ }
+ }
+ }
}
.card-list-layout-list {
diff --git a/public/views/index.html b/public/views/index.html
index 49bfe2c5bb9..c4bffae5019 100644
--- a/public/views/index.html
+++ b/public/views/index.html
@@ -51,9 +51,7 @@
-
-