diff --git a/resources/assets/sass/modules/_btns.scss b/resources/assets/sass/modules/_btns.scss index c3757d66..f1cdfa22 100644 --- a/resources/assets/sass/modules/_btns.scss +++ b/resources/assets/sass/modules/_btns.scss @@ -1,3 +1,58 @@ +@mixin pretty-buttons($color, $background, $text-shadow: none) { + color: $color; + @include gradient-vertical(lighten($background, 5%), darken($background, 5%), 0%, 100%); + border-color: darken($background, 10%); + border-bottom-color: darken($background, 20%); + text-shadow: $text-shadow; + @include box-shadow(inset 0 1px 0 rgba(255, 255, 255, .1)); + + &:hover, + &:focus, + &:active, + &.active { + @include gradient-vertical(darken($background, 0), darken($background, 10%), 0%, 100%); + border-color: darken($background, 20%); + color: $color; + } + + &.disabled, + &[disabled], + fieldset[disabled] & { + &, + &:hover, + &:focus, + &:active, + &.active { + background-color: $background; + border-color: darken($background, 5%); + } + } +} + +.btn { + &.btn-default { + @include pretty-buttons($btn-default-color, $btn-default-bg); + } + &.btn-primary { + @include pretty-buttons($btn-primary-color, $btn-primary-bg); + } + &.btn-success { + @include pretty-buttons($btn-success-color, $btn-success-bg); + } + &.btn-info { + @include pretty-buttons($btn-info-color, $btn-info-bg); + } + &.btn-warning { + @include pretty-buttons($btn-warning-color, $btn-warning-bg); + } + &.btn-danger { + @include pretty-buttons($btn-danger-color, $btn-danger-bg); + } + &.btn-inverse { + @include pretty-buttons(white, #474949); + } +} + .btn-outline { background-color: transparent; color: inherit; diff --git a/resources/assets/sass/modules/_forms.scss b/resources/assets/sass/modules/_forms.scss index efa5abda..2348fa82 100755 --- a/resources/assets/sass/modules/_forms.scss +++ b/resources/assets/sass/modules/_forms.scss @@ -26,7 +26,7 @@ textarea { .form-control { display: block; width: 100%; - height: 34px; + height: 45px; padding: 6px 12px; font-size: 14px; line-height: 1.42857143; @@ -53,3 +53,8 @@ textarea { } } } + +.minicolors-theme-bootstrap .minicolors-swatch { + top: 9px; + left: 9px; +} diff --git a/resources/assets/sass/modules/_variables.scss b/resources/assets/sass/modules/_variables.scss index 6b684386..3b68fbcc 100755 --- a/resources/assets/sass/modules/_variables.scss +++ b/resources/assets/sass/modules/_variables.scss @@ -1,21 +1,21 @@ // Brand colours. -$brand-primary: darken(#428bca, 6.5%) !default; +$brand-primary: darken(#78909c, 6.5%) !default; $brand-success: $cachet-primary !default; $brand-info: $cachet-blue !default; $brand-warning: $cachet-orange !default; $brand-danger: $cachet-red !default; // Default border radius -$border-radius-base: 2px !default; +$border-radius-base: 3px !default; $border-radius-large: 4px !default; -$border-radius-small: 1px !default; +$border-radius-small: 2px !default; //** Tooltip background color $tooltip-bg: #333 !default; $tooltip-opacity: .9 !default; $base-background-color: #f1f1f1; -$base-font-family: "Helvetica Neue", "Helvetica", "Arial", sans-serif; +$base-font-family: "Open Sans", "Helvetica Neue", "Helvetica", "Arial", sans-serif; $base-font-weight: 400; $base-letter-spacing: 0.08em; $base-font-size: 15px; @@ -28,12 +28,12 @@ $header-background-color: lighten(#00695C, 10%); $header-border-color: 1px solid darken($header-background-color, 10%); $sidebar-transition-speed: .2s; -$sidebar-background-color: #F0F3F4; -$sidebar-border-color: 1px solid rgba(255, 255, 255, .1); +$sidebar-background-color: #78909c; +$sidebar-border-color: 1px solid #6c818c; $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-text-color: #ffffff; +$sidebar-text-active-color: #ffffff; $sidebar-normal-width: 230px; $sidebar-phone-width: 75%; $sidebar-active-color: #00695C; diff --git a/resources/assets/sass/pages/_login.scss b/resources/assets/sass/pages/_login.scss index b7ad6b3a..b2bce082 100755 --- a/resources/assets/sass/pages/_login.scss +++ b/resources/assets/sass/pages/_login.scss @@ -1,15 +1,10 @@ body.login { - background: linear-gradient(rgba($cachet-icons, 0.2), rgba($cachet-icons, 0.3)), $cachet-green; + background: $sidebar-background-color; .form-bg { - padding:20px; - border-radius:10px; - position: absolute; + border-radius: 10px; margin: auto; - top: 0; - right: 0; - bottom: 0; - left: 0; + padding-top: 100px; width: 320px; height: 280px; } diff --git a/resources/assets/sass/partials/_content.scss b/resources/assets/sass/partials/_content.scss index bd835c33..683e2ce6 100755 --- a/resources/assets/sass/partials/_content.scss +++ b/resources/assets/sass/partials/_content.scss @@ -46,6 +46,9 @@ body.dashboard { margin-top: 0; text-transform: uppercase; } + .ion { + margin-right: 2px; + } } .sub-header { diff --git a/resources/assets/sass/partials/_sidebar.scss b/resources/assets/sass/partials/_sidebar.scss index e3b55ac2..3cfed0bc 100755 --- a/resources/assets/sass/partials/_sidebar.scss +++ b/resources/assets/sass/partials/_sidebar.scss @@ -23,6 +23,7 @@ body.dashboard { list-style: none; .profile { + text-align: center; padding: 20px 10px; margin-bottom: 0; .dropdown-toggle { @@ -33,18 +34,18 @@ body.dashboard { } .avatar { width: 60px; - margin-right: 10px; img { border-radius: 50%; width: 50px; } } - .username-wrapper { - @extend .hidden-sm; - } - &.username { + .username { word-break: break-all; + margin-bottom: 0; + } + a { color: $sidebar-text-color; + text-decoration: none; } } .quick-add-incident { @@ -70,9 +71,13 @@ body.dashboard { a { padding-top: 14px; padding-bottom: 14px; - border-top: 1px solid #BED3EA; - border-bottom: 1px solid #BED3EA; + border-top: 1px solid #6c818c; + border-bottom: 1px solid #6c818c; color: $sidebar-text-active-color; + &:focus, + &:hover { + text-decoration: none; + } } } a { @@ -85,7 +90,9 @@ body.dashboard { text-align: center; position: relative; top: 1px; + margin-right: 5px; } + &:focus, &:hover { text-decoration: none; } @@ -127,6 +134,7 @@ body.dashboard { border-right: 1px solid #ddd; border-top: 1px solid #ddd; a { + color: #333333; display: block; position: relative; text-align: center; @@ -196,7 +204,7 @@ body.dashboard { position: fixed; margin-left: 228px; width: 22%; - background: #fcfcfc; + background: #f9fdff; border-right: 1px solid #E8ECF1; h3 { @@ -228,6 +236,9 @@ body.dashboard { color: $cachet-secondary; } } + i { + margin-right: 5px; + } } } diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php index f1d4bec6..ae316bf5 100644 --- a/resources/views/auth/login.blade.php +++ b/resources/views/auth/login.blade.php @@ -22,36 +22,45 @@
-
- - - @if(Session::has('error')) -

{{ Session::get('error') }}

- @endif - -
- - -
-
- - -
-
-
-
- - - - - -
-
- -
+
+
+
+

Log In

+
+ + + + @if(Session::has('error')) +

{{ Session::get('error') }}

+ @endif + +
+ + +
+
+ + +
+
+
+
+
+ + + + + +
+
+ +
+
+
+
- +
diff --git a/resources/views/auth/two-factor-auth.blade.php b/resources/views/auth/two-factor-auth.blade.php index ee7b7992..048fa9a7 100644 --- a/resources/views/auth/two-factor-auth.blade.php +++ b/resources/views/auth/two-factor-auth.blade.php @@ -7,38 +7,46 @@
-
- +
-
-

{{ trans('dashboard.login.two-factor') }}

- - @if(Session::has('error')) -

{{ Session::get('error') }}

- @endif - -
- - +
+
+
+

{{ trans('dashboard.login.two-factor') }}

-
- -
-
-
+
+
+ + +
+ @if(Session::has('error')) +

{{ Session::get('error') }}

+ @endif + +
+ + +
+
+ +
+
+
+
+
diff --git a/resources/views/dashboard/components/add.blade.php b/resources/views/dashboard/components/add.blade.php index e17413b2..43fe12b6 100644 --- a/resources/views/dashboard/components/add.blade.php +++ b/resources/views/dashboard/components/add.blade.php @@ -3,10 +3,10 @@ @section('content')
- +
- {{ trans('dashboard.components.components') }} + {{ trans('dashboard.components.components') }} > {{ trans('dashboard.components.add.title') }}
diff --git a/resources/views/dashboard/components/edit.blade.php b/resources/views/dashboard/components/edit.blade.php index f160e24c..6324f878 100644 --- a/resources/views/dashboard/components/edit.blade.php +++ b/resources/views/dashboard/components/edit.blade.php @@ -3,10 +3,10 @@ @section('content')
- +
- {{ trans('dashboard.components.components') }} + {{ trans('dashboard.components.components') }} > {{ trans('dashboard.components.edit.title') }}
diff --git a/resources/views/dashboard/components/groups/add.blade.php b/resources/views/dashboard/components/groups/add.blade.php index bf678184..3111e463 100644 --- a/resources/views/dashboard/components/groups/add.blade.php +++ b/resources/views/dashboard/components/groups/add.blade.php @@ -3,10 +3,10 @@ @section('content')
- +
- {{ trans_choice('dashboard.components.groups.groups', 2) }} + {{ trans_choice('dashboard.components.groups.groups', 2) }} > {{ trans('dashboard.components.groups.add.title') }}
diff --git a/resources/views/dashboard/components/groups/edit.blade.php b/resources/views/dashboard/components/groups/edit.blade.php index 53400f4b..72d27a1c 100644 --- a/resources/views/dashboard/components/groups/edit.blade.php +++ b/resources/views/dashboard/components/groups/edit.blade.php @@ -3,10 +3,10 @@ @section('content')
- +
- {{ trans_choice('dashboard.components.groups.groups', 2) }} + {{ trans_choice('dashboard.components.groups.groups', 2) }} > {{ trans('dashboard.components.groups.edit.title') }}
diff --git a/resources/views/dashboard/components/groups/index.blade.php b/resources/views/dashboard/components/groups/index.blade.php index bed117e0..fa8f4b44 100644 --- a/resources/views/dashboard/components/groups/index.blade.php +++ b/resources/views/dashboard/components/groups/index.blade.php @@ -8,7 +8,7 @@
- {{ trans_choice('dashboard.components.groups.groups', 2) }} + {{ trans_choice('dashboard.components.groups.groups', 2) }} {{ trans('dashboard.components.groups.add.title') }} @@ -23,7 +23,7 @@

@if($groups->count() > 1) - + @endif {{ $group->name }} {{ $group->components->count() }} diff --git a/resources/views/dashboard/components/index.blade.php b/resources/views/dashboard/components/index.blade.php index 9fd4a7d9..1f7a0162 100644 --- a/resources/views/dashboard/components/index.blade.php +++ b/resources/views/dashboard/components/index.blade.php @@ -8,7 +8,7 @@
- {{ trans('dashboard.components.components') }} + {{ trans('dashboard.components.components') }} {{ trans('dashboard.components.add.title') }} @@ -23,7 +23,7 @@

@if($components->count() > 1) - + @endif {{ $component->name }} {{ $component->human_status }}

diff --git a/resources/views/dashboard/incidents/add.blade.php b/resources/views/dashboard/incidents/add.blade.php index 8d992af9..281d6cfd 100644 --- a/resources/views/dashboard/incidents/add.blade.php +++ b/resources/views/dashboard/incidents/add.blade.php @@ -3,10 +3,10 @@ @section('content')
- +
- {{ trans('dashboard.incidents.incidents') }} + {{ trans('dashboard.incidents.incidents') }} > {{ trans('dashboard.incidents.add.title') }}
@@ -36,22 +36,22 @@
diff --git a/resources/views/dashboard/incidents/edit.blade.php b/resources/views/dashboard/incidents/edit.blade.php index d76236ad..3d078179 100644 --- a/resources/views/dashboard/incidents/edit.blade.php +++ b/resources/views/dashboard/incidents/edit.blade.php @@ -3,10 +3,10 @@ @section('content')
- +
- {{ trans('dashboard.incidents.incidents') }} + {{ trans('dashboard.incidents.incidents') }} > {{ trans('dashboard.incidents.edit.title') }}
@@ -25,22 +25,22 @@
diff --git a/resources/views/dashboard/incidents/index.blade.php b/resources/views/dashboard/incidents/index.blade.php index a4f9308f..e9b8951b 100644 --- a/resources/views/dashboard/incidents/index.blade.php +++ b/resources/views/dashboard/incidents/index.blade.php @@ -8,7 +8,7 @@
- {{ trans('dashboard.incidents.incidents') }} + {{ trans('dashboard.incidents.incidents') }} {{ trans('dashboard.incidents.add.title') }} diff --git a/resources/views/dashboard/index.blade.php b/resources/views/dashboard/index.blade.php index 02c3e95e..1f98adf8 100644 --- a/resources/views/dashboard/index.blade.php +++ b/resources/views/dashboard/index.blade.php @@ -3,10 +3,10 @@ @section('content')
- +
- {{ trans('dashboard.dashboard') }} + {{ trans('dashboard.dashboard') }}
diff --git a/resources/views/dashboard/metrics/add.blade.php b/resources/views/dashboard/metrics/add.blade.php index 17e329ef..706c5706 100644 --- a/resources/views/dashboard/metrics/add.blade.php +++ b/resources/views/dashboard/metrics/add.blade.php @@ -3,10 +3,10 @@ @section('content')
- +
- {{ trans('dashboard.metrics.metrics') }} + {{ trans('dashboard.metrics.metrics') }} > {{ trans('dashboard.metrics.add.title') }}
diff --git a/resources/views/dashboard/metrics/edit.blade.php b/resources/views/dashboard/metrics/edit.blade.php index cc84ffea..d8c28403 100644 --- a/resources/views/dashboard/metrics/edit.blade.php +++ b/resources/views/dashboard/metrics/edit.blade.php @@ -3,10 +3,10 @@ @section('content')
- +
- {{ trans('dashboard.metrics.metrics') }} + {{ trans('dashboard.metrics.metrics') }} > {{ trans('dashboard.metrics.edit.title') }}
diff --git a/resources/views/dashboard/metrics/index.blade.php b/resources/views/dashboard/metrics/index.blade.php index 6aa12601..9de3652b 100644 --- a/resources/views/dashboard/metrics/index.blade.php +++ b/resources/views/dashboard/metrics/index.blade.php @@ -3,10 +3,10 @@ @section('content')
- +
- {{ trans('dashboard.metrics.metrics') }} + {{ trans('dashboard.metrics.metrics') }} {{ trans('dashboard.metrics.add.title') }} diff --git a/resources/views/dashboard/notifications/index.blade.php b/resources/views/dashboard/notifications/index.blade.php index ea4f837b..1c2b3062 100644 --- a/resources/views/dashboard/notifications/index.blade.php +++ b/resources/views/dashboard/notifications/index.blade.php @@ -3,7 +3,7 @@ @section('content')
- +
{{ trans('dashboard.notifications.notifications') }}
diff --git a/resources/views/dashboard/partials/sidebar.blade.php b/resources/views/dashboard/partials/sidebar.blade.php index c8da3316..a746d4a4 100644 --- a/resources/views/dashboard/partials/sidebar.blade.php +++ b/resources/views/dashboard/partials/sidebar.blade.php @@ -1,77 +1,69 @@
-
- - {{ $current_user->username }} - - - -
+ + + + +

{{ $current_user->username }}

+
- - + +