Update elixir and some design changes

bower.json

@@ -2,7 +2,7 @@
     "name": "Cachet",
     "dependencies": {
         "autosize": "~2.0.0",
-        "bootstrap-sass": "~3.3.3",
+        "bootstrap-sass": "~3.3.4",
         "humane-js": "~3.2.2",
         "ionicons": "~2.0.0",
         "jquery": "~2.1.1",

gulpfile.js

@@ -2,14 +2,16 @@ var elixir = require('laravel-elixir');
 
 require('laravel-elixir-jshint');
 
+elixir.config.sourcemaps = false;
+
 elixir(function (mix) {
     mix
-        .sass('main.scss')
+        .sass('app.scss')
         .jshint('resources/assets/js/*.js')
         .styles([
             'bower_components/ionicons/css/ionicons.css',
             'bower_components/jquery-minicolors/jquery.minicolors.css',
-            'public/dist/css/main.css'
+            'public/dist/css/app.css'
         ], 'public/dist/css/all.css', './')
         .scripts([
             'bower_components/jquery/dist/jquery.js',

package.json

@@ -2,8 +2,8 @@
     "dependencies": {
         "bower": "~1.3.12",
         "gulp": "~3.8.8",
-        "laravel-elixir": "~0.10.7",
+        "laravel-elixir": "~2.3.11",
-        "laravel-elixir-jshint": "~0.1.6"
+        "laravel-elixir-jshint": "~0.1.7"
     },
     "private": true
 }

public/build/rev-manifest.json

@@ -1,4 +1,4 @@
 {
-  "dist/css/all.css": "dist/css/all-2420ac6b.css",
+  "dist/css/all.css": "dist/css/all-8fa3db8d.css",
   "dist/js/all.js": "dist/js/all-c132bc1e.js"
 }

resources/assets/sass/_status-page.scss

@@ -278,11 +278,13 @@ body.status-page {
 
             &.break {
                 padding: 1px;
-                background-color: $cachet_gray_light;
+                background-color: $cachet-teal;
             }
         }
 
         &.components {
+            @extend .panel;
+            border-color: $cachet_gray_light;
             margin-bottom: 30px;
 
             p {
@@ -296,9 +298,6 @@ body.status-page {
                 color: $cachet-base-dark !important;
             }
 
-            .component:nth-child(2n) {
-                background-color: $cachet-base-medium;
-            }
         }
     }
 

resources/assets/sass/pages/_login.scss

@@ -25,6 +25,14 @@ body.login {
         font-size: 18px;
     }
 
+    .login-input {
+        height: 45px;
+    }
+
+    i {
+        font-size: 22px;
+    }
+
     .btn {
         &.btn-white {
             background-color: white;

resources/assets/sass/partials/_sidebar.scss

@@ -39,16 +39,23 @@ body.dashboard {
                         width: 50px;
                     }
                 }
-                .profile {
+                .username-wrapper {
-                    &.username {
+                    @extend .hidden-sm;
-                        word-break: break-all;
+                }
-                        color: $sidebar-text-color;
+                &.username {
-                    }
+                    word-break: break-all;
+                    color: $sidebar-text-color;
                 }
             }
             .quick-add-incident {
                 @extend .text-center;
                 padding: 10px;
+                i {
+                    @extend .visible-sm;
+                }
+                span {
+                    @extend .hidden-sm;
+                }
             }
             ul {
                 clear: both;
@@ -104,8 +111,14 @@ body.dashboard {
                     }
                 }
             }
+            & > ul > li > a {
+                & > span {
+                    @extend .hidden-sm;
+                }
+            }
         }
         .bottom-menu-sidebar {
+            @extend .hidden-sm;
             position: fixed;
             bottom: 0;
             width: 230px;
@@ -131,9 +144,6 @@ body.dashboard {
     @media (min-width: $screen-xs-max) {
         .sidebar {
             width: $sidebar-normal-width;
-            .bottom-menu-sidebar {
-                @extend .hidden-xs;
-            }
         }
 
         .wrapper.toggled .sidebar {
@@ -151,34 +161,21 @@ body.dashboard {
                 .profile .avatar img {
                     width: 40px;
                 }
-                .profile .username-wrapper {
-                    @extend .hidden-sm;
-                }
                 .quick-add-incident {
                     .btn {
                         padding: 3px 6px;
                     }
                     i {
-                        @extend .visible-sm;
                         font-size: 20px;
                     }
-                    span {
-                        @extend .hidden-sm;
-                    }
                 }
                 & > ul > li > a {
                     text-align: center;
                     & > i {
                         font-size: 25px;
                     }
-                    & > span {
-                        @extend .hidden-sm;
-                    }
                 }
             }
-            .bottom-menu-sidebar {
-                @extend .hidden-sm;
-            }
         }
     }
 

resources/views/auth/login.blade.php

@@ -20,7 +20,9 @@
                     </svg>
                 </div>
 
-                <form method="POST" action="/auth/login" accept-charset="UTF-8" autocomplete="off" name="{{ str_random(10) }}">
+                <br>
+
+                <form method="POST" action="{{ route('login') }}" accept-charset="UTF-8" autocomplete="off" name="{{ str_random(10) }}">
                     <input type="hidden" name="_token" value="{{ csrf_token() }}">
 
                     @if(Session::has('error'))
@@ -29,16 +31,26 @@
 
                     <div class="form-group">
                         <label class="sr-only">{{ trans('forms.login.email') }}</label>
-                        <input autocomplete="off" class="form-control" placeholder="{{ trans('forms.login.email') }}" required="required" name="email" type="email">
+                        <input autocomplete="off" class="form-control login-input" placeholder="{{ trans('forms.login.email') }}" required="required" name="email" type="email">
                     </div>
                     <div class="form-group">
                         <label class="sr-only">{{ trans('forms.login.password') }}</label>
-                        <input autocomplete="off" class="form-control" placeholder="{{ trans('forms.login.password') }}" required="required" name="password" type="password" value="">
+                        <input autocomplete="off" class="form-control login-input" placeholder="{{ trans('forms.login.password') }}" required="required" name="password" type="password" value="">
                     </div>
                     <div class="form-group">
-                        <button type="submit" class="btn btn-lg btn-block btn-white btn-trans">{{ trans('dashboard.login.login') }}</button>
+                        <div class="row">
+                            <div class="col-md-2">
+                                <a class="btn btn-white btn-trans" href="{{ route('status-page') }}">
+                                    <span class="text-center">
+                                        <i class="ion-home"></i>
+                                    </span>
+                                </a>
+                            </div>
+                            <div class="col-md-10">
+                                <button type="submit" class="btn btn-lg btn-block btn-white btn-trans">{{ trans('dashboard.login.login') }}</button>
+                            </div>
+                        </div>
                     </div>
-                    <h1 class="text-center"><a href="/" style="color: white;"><i class="ion-home"></i></a></h1>
                 </form>
             </div>
         </div>