IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into websocket

Browse Source
This commit is contained in:
Torkel Ödegaard 2016-03-22 18:33:39 +01:00
commit 7366cef1fe
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package.json
View File

@ -13,7 +13,7 @@
"angular2": "2.0.0-beta.0", "angular2": "2.0.0-beta.0",
"autoprefixer": "^6.3.3", "autoprefixer": "^6.3.3",
"es6-promise": "^3.0.2", "es6-promise": "^3.0.2",
"es6-shim": "^0.33.3", "es6-shim": "^0.35.0",
"expect.js": "~0.2.0", "expect.js": "~0.2.0",
"glob": "~3.2.7", "glob": "~3.2.7",
"grunt": "~0.4.0", "grunt": "~0.4.0",
@ -51,7 +51,7 @@
"karma-phantomjs-launcher": "0.2.1", "karma-phantomjs-launcher": "0.2.1",
"load-grunt-tasks": "3.4.0", "load-grunt-tasks": "3.4.0",
"mocha": "2.3.4", "mocha": "2.3.4",
"phantomjs": "~2.1.3", "phantomjs": "^2.1.3",
"reflect-metadata": "0.1.2", "reflect-metadata": "0.1.2",
"rxjs": "5.0.0-beta.2", "rxjs": "5.0.0-beta.2",
"sass-lint": "^1.5.0", "sass-lint": "^1.5.0",

12
public/sass/components/_cards.scss
View File

@ -99,6 +99,10 @@
.card-list-layout-grid { .card-list-layout-grid {
.card-item-header-action {
float: right;
}
.card-item-wrapper { .card-item-wrapper {
width: 100%; width: 100%;
padding: 0 1.5rem 1.5rem 0rem; padding: 0 1.5rem 1.5rem 0rem;
@ -128,6 +132,14 @@
width: 33.333333%; width: 33.333333%;
} }
} }
&.card-list-layout-grid--max-2-col {
@include media-breakpoint-up(lg) {
.card-item-wrapper {
width: 50%;
}
}
}
} }
.card-list-layout-list { .card-list-layout-list {

2
public/views/index.html
View File

@ -51,9 +51,7 @@
</script> </script>
<!-- build:js [[.AppSubUrl]]/public/app/boot.js --> <!-- build:js [[.AppSubUrl]]/public/app/boot.js -->
<script src="[[.AppSubUrl]]/public/vendor/npm/es5-shim/es5-shim.js"></script>
<script src="[[.AppSubUrl]]/public/vendor/npm/es6-shim/es6-shim.js"></script> <script src="[[.AppSubUrl]]/public/vendor/npm/es6-shim/es6-shim.js"></script>
<script src="[[.AppSubUrl]]/public/vendor/npm/es6-promise/dist/es6-promise.js"></script>
<script src="[[.AppSubUrl]]/public/vendor/npm/systemjs/dist/system.src.js"></script> <script src="[[.AppSubUrl]]/public/vendor/npm/systemjs/dist/system.src.js"></script>
<script src="[[.AppSubUrl]]/public/app/system.conf.js"></script> <script src="[[.AppSubUrl]]/public/app/system.conf.js"></script>
<script src="[[.AppSubUrl]]/public/app/boot.js"></script> <script src="[[.AppSubUrl]]/public/app/boot.js"></script>