From fe725ac599653614cf88afa0b755986cc7d37726 Mon Sep 17 00:00:00 2001
From: Nabeel Shahzad <nshahzad@gmail.com>
Date: Mon, 21 Aug 2017 13:41:59 -0500
Subject: [PATCH] admin changes reverted

---
 public/assets/admin/css/paper-dashboard.css   | 69 ++++++++++---------
 .../views/admin/aircraft/table.blade.php      | 18 +++--
 .../views/admin/airlines/table.blade.php      | 16 ++---
 resources/views/admin/app.blade.php           |  5 ++
 resources/views/admin/flights/table.blade.php |  8 ++-
 resources/views/admin/sidebar.blade.php       |  6 +-
 6 files changed, 66 insertions(+), 56 deletions(-)

diff --git a/public/assets/admin/css/paper-dashboard.css b/public/assets/admin/css/paper-dashboard.css
index 30392c3f..cab77d42 100644
--- a/public/assets/admin/css/paper-dashboard.css
+++ b/public/assets/admin/css/paper-dashboard.css
@@ -141,7 +141,7 @@ strong {
 body {
   color: #66615b;
   font-size: 14px;
-  font-family: "Roboto","Helvetica Neue",Arial,sans-serif; }
+  font-family: 'Muli', Arial, sans-serif; }
   body .wrapper {
     min-height: 100vh;
     position: relative; }
@@ -244,11 +244,8 @@ hr {
   font-weight: 200; }
   .sidebar .logo,
   .off-canvas-sidebar .logo {
-    /*padding: 18px 0px;
-    margin: 0 20px;*/
-    padding: 6px;
-    background: #067ec1;
-    text-align: center; }
+    padding: 18px 0px;
+    margin: 0 20px; }
     .sidebar .logo p,
     .off-canvas-sidebar .logo p {
       float: left;
@@ -266,7 +263,7 @@ hr {
       line-height: 30px; }
   .sidebar .nav,
   .off-canvas-sidebar .nav {
-    margin-top: 10px; }
+    margin-top: 20px; }
     .sidebar .nav li > a,
     .off-canvas-sidebar .nav li > a {
       margin: 10px 0px;
@@ -340,14 +337,18 @@ hr {
   .off-canvas-sidebar[data-background-color="white"]:after,
   .off-canvas-sidebar[data-background-color="white"]:before {
     background-color: #FFFFFF; }
-  .sidebar .logo p, .sidebar[data-background-color="white"] .logo p,
-  .off-canvas-sidebar .logo p,
-  .off-canvas-sidebar[data-background-color="white"] .logo p {
-    color: #514d48; }
-  .sidebar .logo .simple-text, .sidebar[data-background-color="white"] .logo .simple-text,
-  .off-canvas-sidebar .logo .simple-text,
-  .off-canvas-sidebar[data-background-color="white"] .logo .simple-text {
-    color: #514d48; }
+  .sidebar .logo, .sidebar[data-background-color="white"] .logo,
+  .off-canvas-sidebar .logo,
+  .off-canvas-sidebar[data-background-color="white"] .logo {
+    border-bottom: 1px solid rgba(81, 77, 72, 0.3); }
+    .sidebar .logo p, .sidebar[data-background-color="white"] .logo p,
+    .off-canvas-sidebar .logo p,
+    .off-canvas-sidebar[data-background-color="white"] .logo p {
+      color: #514d48; }
+    .sidebar .logo .simple-text, .sidebar[data-background-color="white"] .logo .simple-text,
+    .off-canvas-sidebar .logo .simple-text,
+    .off-canvas-sidebar[data-background-color="white"] .logo .simple-text {
+      color: #514d48; }
   .sidebar .nav li:not(.active) > a, .sidebar[data-background-color="white"] .nav li:not(.active) > a,
   .off-canvas-sidebar .nav li:not(.active) > a,
   .off-canvas-sidebar[data-background-color="white"] .nav li:not(.active) > a {
@@ -359,13 +360,16 @@ hr {
   .sidebar[data-background-color="black"]:after, .sidebar[data-background-color="black"]:before,
   .off-canvas-sidebar[data-background-color="black"]:after,
   .off-canvas-sidebar[data-background-color="black"]:before {
-    background-color: #1a2932; }
-  .sidebar[data-background-color="black"] .logo p,
-  .off-canvas-sidebar[data-background-color="black"] .logo p {
-    color: #FFFFFF; }
-  .sidebar[data-background-color="black"] .logo .simple-text,
-  .off-canvas-sidebar[data-background-color="black"] .logo .simple-text {
-    color: #FFFFFF; }
+    background-color: #0c1419; }
+  .sidebar[data-background-color="black"] .logo,
+  .off-canvas-sidebar[data-background-color="black"] .logo {
+    border-bottom: 1px solid rgba(255, 255, 255, 0.3); }
+    .sidebar[data-background-color="black"] .logo p,
+    .off-canvas-sidebar[data-background-color="black"] .logo p {
+      color: #FFFFFF; }
+    .sidebar[data-background-color="black"] .logo .simple-text,
+    .off-canvas-sidebar[data-background-color="black"] .logo .simple-text {
+      color: #FFFFFF; }
   .sidebar[data-background-color="black"] .nav li:not(.active) > a,
   .off-canvas-sidebar[data-background-color="black"] .nav li:not(.active) > a {
     color: #FFFFFF; }
@@ -1145,22 +1149,20 @@ textarea.form-control {
   .navbar .navbar-brand {
     color: #FFFFFF;
     font-weight: 300;
-    /*margin: $navbar-margin-brand;
-    padding: $navbar-padding-brand;*/
+    margin: 5px 0px;
+    padding: 20px 15px;
     font-size: 20px; }
   .navbar .navbar-nav > li > a {
     line-height: 1.42857;
-    /*margin: $navbar-margin-a;
-    padding: $navbar-padding-a;*/
-    padding-top: 12px;
-    font-weight: 300; }
-    .navbar .navbar-nav > li > a i, .navbar .navbar-nav > li > a p {
+    margin: 15px 0px;
+    padding: 10px 15px; }
+    .navbar .navbar-nav > li > a i,
+    .navbar .navbar-nav > li > a p {
       display: inline-block;
       margin: 0; }
     .navbar .navbar-nav > li > a i {
       position: relative;
-      top: 1px;
-      margin-right: 3px; }
+      top: 1px; }
   .navbar .navbar-nav > li > a.btn {
     margin: 15px 3px;
     padding: 7px 18px; }
@@ -2213,7 +2215,7 @@ textarea.form-control {
 
 @media (min-width: 992px) {
   .navbar {
-    height: 30px; }
+    min-height: 75px; }
 
   .navbar-form {
     margin-top: 21px;
@@ -2260,6 +2262,9 @@ textarea.form-control {
     right: auto;
     left: 12px; }
 
+  .navbar .navbar-header {
+    margin-left: 10px; }
+
   .footer:not(.footer-big) nav > ul li:first-child {
     margin-left: 0; }
 
diff --git a/resources/views/admin/aircraft/table.blade.php b/resources/views/admin/aircraft/table.blade.php
index 90b2fb94..9f92bc95 100644
--- a/resources/views/admin/aircraft/table.blade.php
+++ b/resources/views/admin/aircraft/table.blade.php
@@ -21,18 +21,16 @@
             <td><a href="{!! route('admin.aircraft.show', [$ac->id]) !!}">{!! $ac->name !!}</a></td>
             <td>{!! $ac->registration !!}</td>
             <td style="text-align: center;">
-                @if($ac->active == 1)
-                    <span class="label label-success">Active</span>
-                @else
-                    <span class="label label-default">Inactive</span>
-                @endif
+                <i class="fa fa-{{$ac->active == 1?"check":""}}-square-o" aria-hidden="true"
+                   style="color: {{$ac->active==1?"darkgreen":"darkred"}};font-size:20px;"></i>
             </td>
-            <td style="width: 10%; text-align: right;">
+            <td style="width: 10%; text-align: right;" class="form-inline">
                 {!! Form::open(['route' => ['admin.aircraft.destroy', $ac->id], 'method' => 'delete']) !!}
-                <a href="{!! route('admin.aircraft.edit', [$ac->id]) !!}" class='btn btn-sm btn-success btn-icon'>
-                    <i class="fa fa-pencil-square-o"></i>
-                </a>
-                {!! Form::button('<i class="fa fa-times"></i>', ['type' => 'submit', 'class' => 'btn btn-sm btn-danger btn-icon', 'onclick' => "return confirm('Are you sure?')"]) !!}
+                <div class='btn-group'>
+                    {{--<a href="{!! route('admin.aircraft.show', [$ac->id]) !!}" class='btn btn-default btn-xs'><i class="glyphicon glyphicon-eye-open"></i></a>--}}
+                    <a href="{!! route('admin.aircraft.edit', [$ac->id]) !!}" class='btn btn-default btn-xs'><i class="glyphicon glyphicon-edit"></i></a>
+                    {!! Form::button('<i class="glyphicon glyphicon-trash"></i>', ['type' => 'submit', 'class' => 'btn btn-danger btn-xs', 'onclick' => "return confirm('Are you sure?')"]) !!}
+                </div>
                 {!! Form::close() !!}
             </td>
         </tr>
diff --git a/resources/views/admin/airlines/table.blade.php b/resources/views/admin/airlines/table.blade.php
index b73c3714..2c64b4eb 100644
--- a/resources/views/admin/airlines/table.blade.php
+++ b/resources/views/admin/airlines/table.blade.php
@@ -13,18 +13,16 @@
             <td>{!! $al->iata !!}</td>
             <td>{!! $al->name !!}</td>
             <td style="text-align: center;">
-                @if($al->active == 1)
-                    <span class="label label-success">Active</span>
-                @else
-                    <span class="label label-default">Inactive</span>
-                @endif
+                <i class="fa fa-{{$al->active == 1?"check":""}}-square-o" aria-hidden="true"
+                   style="color: {{$al->active==1?"darkgreen":"darkred"}};font-size:20px;"></i>
             </td>
             <td style="text-align: right;">
                 {!! Form::open(['route' => ['admin.airlines.destroy', $al->id], 'method' => 'delete']) !!}
-                {{--<a href="{!! route('admin.airlines.show', [$al->id]) !!}" class='btn btn-default btn-xs'><i class="glyphicon glyphicon-eye-open"></i></a>--}}
-                <a href="{!! route('admin.airlines.edit', [$al->id]) !!}" class='btn btn-sm btn-success btn-icon'>
-                    <i class="fa fa-pencil-square-o"></i></a>
-                {!! Form::button('<i class="fa fa-times"></i>', ['type' => 'submit', 'class' => 'btn btn-sm btn-danger btn-icon', 'onclick' => "return confirm('Are you sure?')"]) !!}
+                <div class='btn-group'>
+                    <a href="{!! route('admin.airlines.show', [$al->id]) !!}" class='btn btn-default btn-xs'><i class="glyphicon glyphicon-eye-open"></i></a>
+                    <a href="{!! route('admin.airlines.edit', [$al->id]) !!}" class='btn btn-default btn-xs'><i class="glyphicon glyphicon-edit"></i></a>
+                    {!! Form::button('<i class="glyphicon glyphicon-trash"></i>', ['type' => 'submit', 'class' => 'btn btn-danger btn-xs', 'onclick' => "return confirm('Are you sure?')"]) !!}
+                </div>
                 {!! Form::close() !!}
             </td>
         </tr>
diff --git a/resources/views/admin/app.blade.php b/resources/views/admin/app.blade.php
index 50513ab7..1aa06c78 100644
--- a/resources/views/admin/app.blade.php
+++ b/resources/views/admin/app.blade.php
@@ -27,6 +27,11 @@
     <style type="text/css">
     @yield('css')
 
+    li h5 {
+        -webkit-font-smoothing: antialiased;
+        font-family: Roboto, 'Helvetica Neue', Arial, sans-serif;
+        padding-left: 10px;
+    }
     </style>
 
 </head>
diff --git a/resources/views/admin/flights/table.blade.php b/resources/views/admin/flights/table.blade.php
index ccfcae83..ecdf5baa 100644
--- a/resources/views/admin/flights/table.blade.php
+++ b/resources/views/admin/flights/table.blade.php
@@ -39,9 +39,11 @@
             </td>
             <td style="text-align: right;">
                 {!! Form::open(['route' => ['admin.flights.destroy', $flight->id], 'method' => 'delete']) !!}
-                <a href="{!! route('admin.flights.show', [$flight->id]) !!}" class='btn btn-default btn-xs'><i class="glyphicon glyphicon-eye-open"></i></a>
-                <a href="{!! route('admin.flights.edit', [$flight->id]) !!}" class='btn btn-default btn-xs'><i class="glyphicon glyphicon-edit"></i></a>
-                {!! Form::button('<i class="glyphicon glyphicon-trash"></i>', ['type' => 'submit', 'class' => 'btn btn-danger btn-xs', 'onclick' => "return confirm('Are you sure?')"]) !!}
+                <div class='btn-group'>
+                    <a href="{!! route('admin.flights.show', [$flight->id]) !!}" class='btn btn-default btn-xs'><i class="glyphicon glyphicon-eye-open"></i></a>
+                    <a href="{!! route('admin.flights.edit', [$flight->id]) !!}" class='btn btn-default btn-xs'><i class="glyphicon glyphicon-edit"></i></a>
+                    {!! Form::button('<i class="glyphicon glyphicon-trash"></i>', ['type' => 'submit', 'class' => 'btn btn-danger btn-xs', 'onclick' => "return confirm('Are you sure?')"]) !!}
+                </div>
                 {!! Form::close() !!}
             </td>
         </tr>
diff --git a/resources/views/admin/sidebar.blade.php b/resources/views/admin/sidebar.blade.php
index cb48dd59..d905d870 100644
--- a/resources/views/admin/sidebar.blade.php
+++ b/resources/views/admin/sidebar.blade.php
@@ -7,10 +7,12 @@
 
 
     <div class="sidebar-wrapper">
-        <div class="logo">
+        <div class="logo" style="background: #067ec1; margin: 0px; text-align: center; min-height: 74px;">
             <img src="/assets/frontend/img/logo_blue_bg.svg" width="110px" style="">
         </div>
 
-        @include('admin.menu')
+        <ul class="nav">
+            @include('admin.menu')
+        </ul>
     </div>
 </div>