diff --git a/app/assets/sass/_helpers.scss b/app/assets/sass/_helpers.scss new file mode 100644 index 00000000..089f89bf --- /dev/null +++ b/app/assets/sass/_helpers.scss @@ -0,0 +1,3 @@ +.uppercase { + text-transform: uppercase; +} diff --git a/app/assets/sass/main.scss b/app/assets/sass/main.scss index 326d8854..58bc31a5 100644 --- a/app/assets/sass/main.scss +++ b/app/assets/sass/main.scss @@ -6,6 +6,8 @@ html, body { height: 100%; } +@import "helpers"; + // Module overrides @import "modules/tabs"; @import "modules/forms"; diff --git a/app/assets/sass/pages/_login.scss b/app/assets/sass/pages/_login.scss index 614e52cf..31c33d97 100644 --- a/app/assets/sass/pages/_login.scss +++ b/app/assets/sass/pages/_login.scss @@ -1,3 +1,7 @@ +.login { + padding-top: 90px; +} + .login .logo { display: block; margin: 0 auto 30px; diff --git a/app/assets/sass/partials/_content.scss b/app/assets/sass/partials/_content.scss index 4493b77f..645aea9b 100644 --- a/app/assets/sass/partials/_content.scss +++ b/app/assets/sass/partials/_content.scss @@ -1,6 +1,5 @@ body.dashboard { .content { - padding-top: 69px; position: relative; display: table-cell; vertical-align: top; @@ -9,11 +8,21 @@ body.dashboard { margin: 10px 0; } .header { - background: #fff; - padding: 14px; + position: absolute; + top: 0; + left: 0; + color: #333; + background-color: #fff; + padding: 22px 14px; width: 100%; - height: 50px; + height: 70px; font-size: 1.2em; + border-bottom: 1px solid #eee; + z-index: 99; + &.fixed { + position: fixed; + padding-left: 250px; + } i { // padding-right: 10px; } @@ -28,10 +37,20 @@ body.dashboard { + .row { margin-top: 23px; } - } - h3 { - margin-top: 0; + h3 { + color: #444; + margin-top: 0; + text-transform: uppercase; + } } + .content-wrapper { + margin-top: 80px; + } + + .sub-header { + font-weight: 300; + text-transform: uppercase; + } } } diff --git a/app/assets/sass/partials/_sidebar.scss b/app/assets/sass/partials/_sidebar.scss index 59bbc00f..f16d9487 100644 --- a/app/assets/sass/partials/_sidebar.scss +++ b/app/assets/sass/partials/_sidebar.scss @@ -4,14 +4,13 @@ body.dashboard { vertical-align: top; width: $sidebar-normal-width; background: $sidebar-background-color; + @include box-shadow($sidebar-border-shadow); position: relative; z-index: 100; .sidebar-inner { position: relative; - margin-top: 69px; - .profile { padding: 20px; margin-bottom: 20px; @@ -26,6 +25,10 @@ body.dashboard { color: $sidebar-text-color; } } + .quick-add-incident { + @extend text-center; + padding: 10px; + } ul { clear: both; margin: 0; @@ -33,7 +36,7 @@ body.dashboard { list-style: none; li { - font-size: 0.8em; + font-size: $sidebar-text-size; &:last-child { border-bottom: $sidebar-border-color; } @@ -49,7 +52,11 @@ body.dashboard { border-top: $sidebar-border-color; color: $sidebar-text-color; i { - padding-right: 10px; + font-size: 18px; + min-width: 17px; + text-align: center; + position: relative; + top: 1px; } &:hover { text-decoration: none; diff --git a/app/assets/sass/partials/_variables.scss b/app/assets/sass/partials/_variables.scss index 67200533..a6f4bd80 100644 --- a/app/assets/sass/partials/_variables.scss +++ b/app/assets/sass/partials/_variables.scss @@ -12,11 +12,13 @@ $header-background-color: lighten(#00695C, 10%); $header-border-color: 1px solid darken($header-background-color, 10%); $sidebar-transition-speed: .2s; -$sidebar-background-color: #2c3e50; +$sidebar-background-color: #F0F3F4; $sidebar-border-color: 1px solid rgba(255, 255, 255, .1); -$sidebar-text-color: #d7dadc; -$sidebar-text-active-color: #ffffff; -$sidebar-normal-width: 250px; +$sidebar-border-shadow: inset 0px -2px 3px rgba(0,0,0,0.25); +$sidebar-text-size: 0.9em; +$sidebar-text-color: #333; +$sidebar-text-active-color: #333; +$sidebar-normal-width: 230px; $sidebar-phone-width: 75%; $sidebar-active-color: #00695C; diff --git a/app/views/dashboard/component-add.blade.php b/app/views/dashboard/component-add.blade.php index bbc94ba1..9d46eaa7 100644 --- a/app/views/dashboard/component-add.blade.php +++ b/app/views/dashboard/component-add.blade.php @@ -1,45 +1,49 @@ @extends('layout.dashboard') @section('content') -
{{ $component->description }}
- @endif -{{ $component->description }}
+ @endif +Woah! No incidents, your doing well!
+ @else +You have {{ $incidents->count() }} incidents.
+ @endif - @if ($incidents->count() === 0) -Woah! No incidents, your doing well!
- @else -You have {{ $incidents->count() }} incidents.
- @endif - -{{ Str::words($incident->message, 5) }}
- @endif -{{ Str::words($incident->message, 5) }}
+ @endif +Let's put cool things here.
-Let's put cool things here.
+