diff --git a/.gitignore b/.gitignore index 37e87bcb..764658bc 100644 --- a/.gitignore +++ b/.gitignore @@ -12,7 +12,6 @@ config.codekit # Assets app/assets/bower_components node_modules -public/build public/css public/js diff --git a/app/assets/js/start.js b/app/assets/js/app.js similarity index 100% rename from app/assets/js/start.js rename to app/assets/js/app.js diff --git a/app/assets/sass/_status-page.scss b/app/assets/sass/_status-page.scss index b67c09a2..bdfba8d0 100644 --- a/app/assets/sass/_status-page.scss +++ b/app/assets/sass/_status-page.scss @@ -133,7 +133,7 @@ body.status-page { height: 100%; background: #7266BA; } - .icon { + .status-icon { background: #fff; width: 35px; height: 35px; @@ -142,7 +142,7 @@ body.status-page { position: absolute; left: 25px; top: 14px; - .ion { + .icon { position: absolute; &.ion-flag { top: 10px; @@ -273,4 +273,3 @@ body.status-page { background-color: lighten($cachet_gray_light, 5%); } } - diff --git a/app/assets/sass/main.scss b/app/assets/sass/main.scss index d4fe98a4..73105dbc 100644 --- a/app/assets/sass/main.scss +++ b/app/assets/sass/main.scss @@ -1,5 +1,8 @@ @import "palette"; +$ionicons-font-path: "../../../fonts" !default; +@import "../bower_components/ionicons/scss/ionicons"; + @import "modules/bootstrap"; html, body { @@ -24,6 +27,7 @@ html, body { // Styles for specific page @import "pages/login"; @import "pages/setup"; +@import "pages/dashboard"; // Styles for plugins @import "plugins/messenger"; diff --git a/app/assets/sass/pages/_dashboard.scss b/app/assets/sass/pages/_dashboard.scss new file mode 100644 index 00000000..416294af --- /dev/null +++ b/app/assets/sass/pages/_dashboard.scss @@ -0,0 +1,8 @@ +.componet-inline-update { + @extend .text-right; + padding-top: 8px; + label { + display: initial; + font-weight: normal; + } +} diff --git a/app/views/dashboard/index.blade.php b/app/views/dashboard/index.blade.php index e7bfde41..4a6176cd 100644 --- a/app/views/dashboard/index.blade.php +++ b/app/views/dashboard/index.blade.php @@ -22,7 +22,7 @@

{{ $component->name }}

-
+
@foreach(trans('cachet.components.status') as $statusID => $status)