From 23e38f2670d8b7814a0dc313753d3e10e237358c Mon Sep 17 00:00:00 2001 From: Nabeel Shahzad Date: Mon, 21 Aug 2017 13:24:16 -0500 Subject: [PATCH] admin design --- public/assets/admin/sass/paper/_misc.scss | 2 +- public/assets/admin/sass/paper/_navbars.scss | 17 ++++++++++------- .../assets/admin/sass/paper/_responsive.scss | 4 ++-- .../sass/paper/_sidebar-and-main-panel.scss | 11 +++++++---- public/assets/admin/sass/paper/_variables.scss | 5 +++-- .../admin/sass/paper/mixins/_sidebar.scss | 2 +- resources/views/admin/aircraft/table.blade.php | 18 ++++++++++-------- resources/views/admin/airlines/table.blade.php | 16 +++++++++------- resources/views/admin/sidebar.blade.php | 6 ++---- 9 files changed, 45 insertions(+), 36 deletions(-) diff --git a/public/assets/admin/sass/paper/_misc.scss b/public/assets/admin/sass/paper/_misc.scss index 3482539d..0c2e5410 100755 --- a/public/assets/admin/sass/paper/_misc.scss +++ b/public/assets/admin/sass/paper/_misc.scss @@ -2,7 +2,7 @@ body{ color: $font-color; font-size: $font-size-base; - font-family: 'Muli', Arial, sans-serif; + font-family: "Roboto","Helvetica Neue",Arial,sans-serif; //'Muli', Arial, sans-serif; .wrapper{ min-height: 100vh; position: relative; diff --git a/public/assets/admin/sass/paper/_navbars.scss b/public/assets/admin/sass/paper/_navbars.scss index 9120910d..71d06c02 100644 --- a/public/assets/admin/sass/paper/_navbars.scss +++ b/public/assets/admin/sass/paper/_navbars.scss @@ -15,24 +15,27 @@ .navbar-brand{ color: $white-color; font-weight: $font-weight-light;; - margin: $navbar-margin-brand; - padding: $navbar-padding-brand; + /*margin: $navbar-margin-brand; + padding: $navbar-padding-brand;*/ font-size: $font-size-large-navbar; } .navbar-nav{ > li > a { line-height: 1.42857; - margin: $navbar-margin-a; - padding: $navbar-padding-a; + /*margin: $navbar-margin-a; + padding: $navbar-padding-a;*/ - i, - p{ + padding-top: 12px; + font-weight: $font-weight-light; + + i, p { display: inline-block; margin: 0; } - i{ + i { position: relative; top: 1px; + margin-right: 3px; } } > li > a.btn{ diff --git a/public/assets/admin/sass/paper/_responsive.scss b/public/assets/admin/sass/paper/_responsive.scss index a22fc237..84b79f21 100644 --- a/public/assets/admin/sass/paper/_responsive.scss +++ b/public/assets/admin/sass/paper/_responsive.scss @@ -1,6 +1,6 @@ @media (min-width: 992px){ .navbar{ - min-height: 75px; + height: 30px; } .navbar-form { margin-top: 21px; @@ -53,7 +53,7 @@ .navbar{ .navbar-header{ - margin-left: 10px; + //margin-left: 10px; } } diff --git a/public/assets/admin/sass/paper/_sidebar-and-main-panel.scss b/public/assets/admin/sass/paper/_sidebar-and-main-panel.scss index b7614d31..6af76994 100755 --- a/public/assets/admin/sass/paper/_sidebar-and-main-panel.scss +++ b/public/assets/admin/sass/paper/_sidebar-and-main-panel.scss @@ -35,10 +35,13 @@ font-weight: 200; .logo{ - padding: 18px 0px; - margin: 0 20px; + /*padding: 18px 0px; + margin: 0 20px;*/ + padding: 6px; + background: #067ec1; + text-align: center; - p{ + p { float: left; font-size: 20px; margin: 10px 10px; @@ -57,7 +60,7 @@ } .nav{ - margin-top: 20px; + margin-top: 10px; li{ > a{ diff --git a/public/assets/admin/sass/paper/_variables.scss b/public/assets/admin/sass/paper/_variables.scss index 81b43036..e50b00c5 100644 --- a/public/assets/admin/sass/paper/_variables.scss +++ b/public/assets/admin/sass/paper/_variables.scss @@ -24,8 +24,9 @@ $black-hr: #444444 !default; $white-background-color: #FFFFFF !default; //$black-background-color: #212120 !default; -//$black-background-color: #1a2932 !default; -$black-background-color: #0c1419 !default; +$black-background-color: #1a2932 !default; +//$black-background-color: #0c1419 !default; + $light-gray: #E3E3E3 !default; diff --git a/public/assets/admin/sass/paper/mixins/_sidebar.scss b/public/assets/admin/sass/paper/mixins/_sidebar.scss index abb62c98..53b388e3 100644 --- a/public/assets/admin/sass/paper/mixins/_sidebar.scss +++ b/public/assets/admin/sass/paper/mixins/_sidebar.scss @@ -5,7 +5,7 @@ } .logo{ - border-bottom: 1px solid rgba($font-color,.3); + //border-bottom: 1px solid rgba($font-color,.3); p{ color: $font-color; diff --git a/resources/views/admin/aircraft/table.blade.php b/resources/views/admin/aircraft/table.blade.php index 9f92bc95..90b2fb94 100644 --- a/resources/views/admin/aircraft/table.blade.php +++ b/resources/views/admin/aircraft/table.blade.php @@ -21,16 +21,18 @@ {!! $ac->name !!} {!! $ac->registration !!} - + @if($ac->active == 1) + Active + @else + Inactive + @endif - + {!! Form::open(['route' => ['admin.aircraft.destroy', $ac->id], 'method' => 'delete']) !!} -
- {{----}} - - {!! Form::button('', ['type' => 'submit', 'class' => 'btn btn-danger btn-xs', 'onclick' => "return confirm('Are you sure?')"]) !!} -
+ + + + {!! Form::button('', ['type' => 'submit', 'class' => 'btn btn-sm btn-danger btn-icon', 'onclick' => "return confirm('Are you sure?')"]) !!} {!! Form::close() !!} diff --git a/resources/views/admin/airlines/table.blade.php b/resources/views/admin/airlines/table.blade.php index 2c64b4eb..b73c3714 100644 --- a/resources/views/admin/airlines/table.blade.php +++ b/resources/views/admin/airlines/table.blade.php @@ -13,16 +13,18 @@ {!! $al->iata !!} {!! $al->name !!} - + @if($al->active == 1) + Active + @else + Inactive + @endif {!! Form::open(['route' => ['admin.airlines.destroy', $al->id], 'method' => 'delete']) !!} -
- - - {!! Form::button('', ['type' => 'submit', 'class' => 'btn btn-danger btn-xs', 'onclick' => "return confirm('Are you sure?')"]) !!} -
+ {{----}} + + + {!! Form::button('', ['type' => 'submit', 'class' => 'btn btn-sm btn-danger btn-icon', 'onclick' => "return confirm('Are you sure?')"]) !!} {!! Form::close() !!} diff --git a/resources/views/admin/sidebar.blade.php b/resources/views/admin/sidebar.blade.php index d905d870..cb48dd59 100644 --- a/resources/views/admin/sidebar.blade.php +++ b/resources/views/admin/sidebar.blade.php @@ -7,12 +7,10 @@
-