admin changes reverted

This commit is contained in:
Nabeel Shahzad 2017-08-21 13:41:59 -05:00
parent f29d42e2f7
commit fe725ac599
6 changed files with 66 additions and 56 deletions

View File

@ -141,7 +141,7 @@ strong {
body { body {
color: #66615b; color: #66615b;
font-size: 14px; font-size: 14px;
font-family: "Roboto","Helvetica Neue",Arial,sans-serif; } font-family: 'Muli', Arial, sans-serif; }
body .wrapper { body .wrapper {
min-height: 100vh; min-height: 100vh;
position: relative; } position: relative; }
@ -244,11 +244,8 @@ hr {
font-weight: 200; } font-weight: 200; }
.sidebar .logo, .sidebar .logo,
.off-canvas-sidebar .logo { .off-canvas-sidebar .logo {
/*padding: 18px 0px; padding: 18px 0px;
margin: 0 20px;*/ margin: 0 20px; }
padding: 6px;
background: #067ec1;
text-align: center; }
.sidebar .logo p, .sidebar .logo p,
.off-canvas-sidebar .logo p { .off-canvas-sidebar .logo p {
float: left; float: left;
@ -266,7 +263,7 @@ hr {
line-height: 30px; } line-height: 30px; }
.sidebar .nav, .sidebar .nav,
.off-canvas-sidebar .nav { .off-canvas-sidebar .nav {
margin-top: 10px; } margin-top: 20px; }
.sidebar .nav li > a, .sidebar .nav li > a,
.off-canvas-sidebar .nav li > a { .off-canvas-sidebar .nav li > a {
margin: 10px 0px; margin: 10px 0px;
@ -340,14 +337,18 @@ hr {
.off-canvas-sidebar[data-background-color="white"]:after, .off-canvas-sidebar[data-background-color="white"]:after,
.off-canvas-sidebar[data-background-color="white"]:before { .off-canvas-sidebar[data-background-color="white"]:before {
background-color: #FFFFFF; } background-color: #FFFFFF; }
.sidebar .logo p, .sidebar[data-background-color="white"] .logo p, .sidebar .logo, .sidebar[data-background-color="white"] .logo,
.off-canvas-sidebar .logo p, .off-canvas-sidebar .logo,
.off-canvas-sidebar[data-background-color="white"] .logo p { .off-canvas-sidebar[data-background-color="white"] .logo {
color: #514d48; } border-bottom: 1px solid rgba(81, 77, 72, 0.3); }
.sidebar .logo .simple-text, .sidebar[data-background-color="white"] .logo .simple-text, .sidebar .logo p, .sidebar[data-background-color="white"] .logo p,
.off-canvas-sidebar .logo .simple-text, .off-canvas-sidebar .logo p,
.off-canvas-sidebar[data-background-color="white"] .logo .simple-text { .off-canvas-sidebar[data-background-color="white"] .logo p {
color: #514d48; } 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, .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 .nav li:not(.active) > a,
.off-canvas-sidebar[data-background-color="white"] .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, .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"]:after,
.off-canvas-sidebar[data-background-color="black"]:before { .off-canvas-sidebar[data-background-color="black"]:before {
background-color: #1a2932; } background-color: #0c1419; }
.sidebar[data-background-color="black"] .logo p, .sidebar[data-background-color="black"] .logo,
.off-canvas-sidebar[data-background-color="black"] .logo p { .off-canvas-sidebar[data-background-color="black"] .logo {
color: #FFFFFF; } border-bottom: 1px solid rgba(255, 255, 255, 0.3); }
.sidebar[data-background-color="black"] .logo .simple-text, .sidebar[data-background-color="black"] .logo p,
.off-canvas-sidebar[data-background-color="black"] .logo .simple-text { .off-canvas-sidebar[data-background-color="black"] .logo p {
color: #FFFFFF; } 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, .sidebar[data-background-color="black"] .nav li:not(.active) > a,
.off-canvas-sidebar[data-background-color="black"] .nav li:not(.active) > a { .off-canvas-sidebar[data-background-color="black"] .nav li:not(.active) > a {
color: #FFFFFF; } color: #FFFFFF; }
@ -1145,22 +1149,20 @@ textarea.form-control {
.navbar .navbar-brand { .navbar .navbar-brand {
color: #FFFFFF; color: #FFFFFF;
font-weight: 300; font-weight: 300;
/*margin: $navbar-margin-brand; margin: 5px 0px;
padding: $navbar-padding-brand;*/ padding: 20px 15px;
font-size: 20px; } font-size: 20px; }
.navbar .navbar-nav > li > a { .navbar .navbar-nav > li > a {
line-height: 1.42857; line-height: 1.42857;
/*margin: $navbar-margin-a; margin: 15px 0px;
padding: $navbar-padding-a;*/ padding: 10px 15px; }
padding-top: 12px; .navbar .navbar-nav > li > a i,
font-weight: 300; } .navbar .navbar-nav > li > a p {
.navbar .navbar-nav > li > a i, .navbar .navbar-nav > li > a p {
display: inline-block; display: inline-block;
margin: 0; } margin: 0; }
.navbar .navbar-nav > li > a i { .navbar .navbar-nav > li > a i {
position: relative; position: relative;
top: 1px; top: 1px; }
margin-right: 3px; }
.navbar .navbar-nav > li > a.btn { .navbar .navbar-nav > li > a.btn {
margin: 15px 3px; margin: 15px 3px;
padding: 7px 18px; } padding: 7px 18px; }
@ -2213,7 +2215,7 @@ textarea.form-control {
@media (min-width: 992px) { @media (min-width: 992px) {
.navbar { .navbar {
height: 30px; } min-height: 75px; }
.navbar-form { .navbar-form {
margin-top: 21px; margin-top: 21px;
@ -2260,6 +2262,9 @@ textarea.form-control {
right: auto; right: auto;
left: 12px; } left: 12px; }
.navbar .navbar-header {
margin-left: 10px; }
.footer:not(.footer-big) nav > ul li:first-child { .footer:not(.footer-big) nav > ul li:first-child {
margin-left: 0; } margin-left: 0; }

View File

@ -21,18 +21,16 @@
<td><a href="{!! route('admin.aircraft.show', [$ac->id]) !!}">{!! $ac->name !!}</a></td> <td><a href="{!! route('admin.aircraft.show', [$ac->id]) !!}">{!! $ac->name !!}</a></td>
<td>{!! $ac->registration !!}</td> <td>{!! $ac->registration !!}</td>
<td style="text-align: center;"> <td style="text-align: center;">
@if($ac->active == 1) <i class="fa fa-{{$ac->active == 1?"check":""}}-square-o" aria-hidden="true"
<span class="label label-success">Active</span> style="color: {{$ac->active==1?"darkgreen":"darkred"}};font-size:20px;"></i>
@else
<span class="label label-default">Inactive</span>
@endif
</td> </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']) !!} {!! 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'> <div class='btn-group'>
<i class="fa fa-pencil-square-o"></i> {{--<a href="{!! route('admin.aircraft.show', [$ac->id]) !!}" class='btn btn-default btn-xs'><i class="glyphicon glyphicon-eye-open"></i></a>--}}
</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="fa fa-times"></i>', ['type' => 'submit', 'class' => 'btn btn-sm btn-danger btn-icon', 'onclick' => "return confirm('Are you sure?')"]) !!} {!! 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() !!} {!! Form::close() !!}
</td> </td>
</tr> </tr>

View File

@ -13,18 +13,16 @@
<td>{!! $al->iata !!}</td> <td>{!! $al->iata !!}</td>
<td>{!! $al->name !!}</td> <td>{!! $al->name !!}</td>
<td style="text-align: center;"> <td style="text-align: center;">
@if($al->active == 1) <i class="fa fa-{{$al->active == 1?"check":""}}-square-o" aria-hidden="true"
<span class="label label-success">Active</span> style="color: {{$al->active==1?"darkgreen":"darkred"}};font-size:20px;"></i>
@else
<span class="label label-default">Inactive</span>
@endif
</td> </td>
<td style="text-align: right;"> <td style="text-align: right;">
{!! Form::open(['route' => ['admin.airlines.destroy', $al->id], 'method' => 'delete']) !!} {!! 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>--}} <div class='btn-group'>
<a href="{!! route('admin.airlines.edit', [$al->id]) !!}" class='btn btn-sm btn-success btn-icon'> <a href="{!! route('admin.airlines.show', [$al->id]) !!}" class='btn btn-default btn-xs'><i class="glyphicon glyphicon-eye-open"></i></a>
<i class="fa fa-pencil-square-o"></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="fa fa-times"></i>', ['type' => 'submit', 'class' => 'btn btn-sm btn-danger btn-icon', 'onclick' => "return confirm('Are you sure?')"]) !!} {!! 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() !!} {!! Form::close() !!}
</td> </td>
</tr> </tr>

View File

@ -27,6 +27,11 @@
<style type="text/css"> <style type="text/css">
@yield('css') @yield('css')
li h5 {
-webkit-font-smoothing: antialiased;
font-family: Roboto, 'Helvetica Neue', Arial, sans-serif;
padding-left: 10px;
}
</style> </style>
</head> </head>

View File

@ -39,9 +39,11 @@
</td> </td>
<td style="text-align: right;"> <td style="text-align: right;">
{!! Form::open(['route' => ['admin.flights.destroy', $flight->id], 'method' => 'delete']) !!} {!! 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> <div class='btn-group'>
<a href="{!! route('admin.flights.edit', [$flight->id]) !!}" class='btn btn-default btn-xs'><i class="glyphicon glyphicon-edit"></i></a> <a href="{!! route('admin.flights.show', [$flight->id]) !!}" class='btn btn-default btn-xs'><i class="glyphicon glyphicon-eye-open"></i></a>
{!! Form::button('<i class="glyphicon glyphicon-trash"></i>', ['type' => 'submit', 'class' => 'btn btn-danger btn-xs', 'onclick' => "return confirm('Are you sure?')"]) !!} <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() !!} {!! Form::close() !!}
</td> </td>
</tr> </tr>

View File

@ -7,10 +7,12 @@
<div class="sidebar-wrapper"> <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=""> <img src="/assets/frontend/img/logo_blue_bg.svg" width="110px" style="">
</div> </div>
@include('admin.menu') <ul class="nav">
@include('admin.menu')
</ul>
</div> </div>
</div> </div>