FGFS-4.1/phpvms
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge admin changes

Browse Source
This commit is contained in:
Nabeel Shahzad
2017-08-21 13:28:52 -05:00
parent 59e794de27 146fa197ec
commit b11237c1cb
11 changed files with 79 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
public/assets/admin/css/paper-dashboard.css
View File

@@ -143,7 +143,7 @@ strong {
body { body {
color: #66615b; color: #66615b;
font-size: 14px; font-size: 14px;
font-family: 'Muli', Arial, sans-serif; } font-family: "Roboto","Helvetica Neue",Arial,sans-serif; }
body .wrapper { body .wrapper {
min-height: 100vh; min-height: 100vh;
position: relative; } position: relative; }
@@ -246,8 +246,11 @@ 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;
@@ -265,7 +268,7 @@ hr {
line-height: 30px; } line-height: 30px; }
.sidebar .nav, .sidebar .nav,
.off-canvas-sidebar .nav { .off-canvas-sidebar .nav {
margin-top: 20px; } margin-top: 10px; }
.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;
@@ -342,18 +345,14 @@ 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, .sidebar[data-background-color="white"] .logo, .sidebar .logo p, .sidebar[data-background-color="white"] .logo p,
.off-canvas-sidebar .logo, .off-canvas-sidebar .logo p,
.off-canvas-sidebar[data-background-color="white"] .logo { .off-canvas-sidebar[data-background-color="white"] .logo p {
border-bottom: 1px solid rgba(81, 77, 72, 0.3); } color: #514d48; }
.sidebar .logo p, .sidebar[data-background-color="white"] .logo p, .sidebar .logo .simple-text, .sidebar[data-background-color="white"] .logo .simple-text,
.off-canvas-sidebar .logo p, .off-canvas-sidebar .logo .simple-text,
.off-canvas-sidebar[data-background-color="white"] .logo p { .off-canvas-sidebar[data-background-color="white"] .logo .simple-text {
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 {
@@ -365,16 +364,13 @@ 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: #0c1419; } background-color: #1a2932; }
.sidebar[data-background-color="black"] .logo, .sidebar[data-background-color="black"] .logo p,
.off-canvas-sidebar[data-background-color="black"] .logo { .off-canvas-sidebar[data-background-color="black"] .logo p {
border-bottom: 1px solid rgba(255, 255, 255, 0.3); } color: #FFFFFF; }
.sidebar[data-background-color="black"] .logo p, .sidebar[data-background-color="black"] .logo .simple-text,
.off-canvas-sidebar[data-background-color="black"] .logo p { .off-canvas-sidebar[data-background-color="black"] .logo .simple-text {
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; }
@@ -1154,20 +1150,22 @@ textarea.form-control {
.navbar .navbar-brand { .navbar .navbar-brand {
color: #FFFFFF; color: #FFFFFF;
font-weight: 300; font-weight: 300;
margin: 5px 0px; /*margin: $navbar-margin-brand;
padding: 20px 15px; padding: $navbar-padding-brand;*/
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: 15px 0px; /*margin: $navbar-margin-a;
padding: 10px 15px; } padding: $navbar-padding-a;*/
.navbar .navbar-nav > li > a i, padding-top: 12px;
.navbar .navbar-nav > li > a p { font-weight: 300; }
.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; }
@@ -2220,7 +2218,7 @@ textarea.form-control {
@media (min-width: 992px) { @media (min-width: 992px) {
.navbar { .navbar {
min-height: 75px; } height: 30px; }
.navbar-form { .navbar-form {
margin-top: 21px; margin-top: 21px;
@@ -2267,9 +2265,6 @@ 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; }

4
public/assets/admin/css/paper-dashboard.css.map
View File

File diff suppressed because one or more lines are too long

2
public/assets/admin/sass/paper/_misc.scss
View File

@@ -2,7 +2,7 @@
body{ body{
color: $font-color; color: $font-color;
font-size: $font-size-base; font-size: $font-size-base;
font-family: 'Muli', Arial, sans-serif; font-family: "Roboto","Helvetica Neue",Arial,sans-serif; //'Muli', Arial, sans-serif;
.wrapper{ .wrapper{
min-height: 100vh; min-height: 100vh;
position: relative; position: relative;

17
public/assets/admin/sass/paper/_navbars.scss
View File

@@ -15,24 +15,27 @@
.navbar-brand{ .navbar-brand{
color: $white-color; color: $white-color;
font-weight: $font-weight-light;; font-weight: $font-weight-light;;
margin: $navbar-margin-brand; /*margin: $navbar-margin-brand;
padding: $navbar-padding-brand; padding: $navbar-padding-brand;*/
font-size: $font-size-large-navbar; font-size: $font-size-large-navbar;
} }
.navbar-nav{ .navbar-nav{
> li > a { > li > a {
line-height: 1.42857; line-height: 1.42857;
margin: $navbar-margin-a; /*margin: $navbar-margin-a;
padding: $navbar-padding-a; padding: $navbar-padding-a;*/
i, padding-top: 12px;
p{ font-weight: $font-weight-light;
i, p {
display: inline-block; display: inline-block;
margin: 0; margin: 0;
} }
i{ i {
position: relative; position: relative;
top: 1px; top: 1px;
margin-right: 3px;
} }
} }
> li > a.btn{ > li > a.btn{

4
public/assets/admin/sass/paper/_responsive.scss
View File

@@ -1,6 +1,6 @@
@media (min-width: 992px){ @media (min-width: 992px){
.navbar{ .navbar{
min-height: 75px; height: 30px;
} }
.navbar-form { .navbar-form {
margin-top: 21px; margin-top: 21px;
@@ -53,7 +53,7 @@
.navbar{ .navbar{
.navbar-header{ .navbar-header{
margin-left: 10px; //margin-left: 10px;
} }
} }

11
public/assets/admin/sass/paper/_sidebar-and-main-panel.scss
View File

@@ -35,10 +35,13 @@
font-weight: 200; font-weight: 200;
.logo{ .logo{
padding: 18px 0px; /*padding: 18px 0px;
margin: 0 20px; margin: 0 20px;*/
padding: 6px;
background: #067ec1;
text-align: center;
p{ p {
float: left; float: left;
font-size: 20px; font-size: 20px;
margin: 10px 10px; margin: 10px 10px;
@@ -57,7 +60,7 @@
} }
.nav{ .nav{
margin-top: 20px; margin-top: 10px;
li{ li{

5
public/assets/admin/sass/paper/_variables.scss
View File

@@ -24,8 +24,9 @@ $black-hr: #444444 !default;
$white-background-color: #FFFFFF !default; $white-background-color: #FFFFFF !default;
//$black-background-color: #212120 !default; //$black-background-color: #212120 !default;
//$black-background-color: #1a2932 !default; $black-background-color: #1a2932 !default;
$black-background-color: #0c1419 !default; //$black-background-color: #0c1419 !default;
$light-gray: #E3E3E3 !default; $light-gray: #E3E3E3 !default;

2
public/assets/admin/sass/paper/mixins/_sidebar.scss
View File

@@ -5,7 +5,7 @@
} }
.logo{ .logo{
border-bottom: 1px solid rgba($font-color,.3); //border-bottom: 1px solid rgba($font-color,.3);
p{ p{
color: $font-color; color: $font-color;

18
resources/views/admin/aircraft/table.blade.php
View File

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

16
resources/views/admin/airlines/table.blade.php
View File

@@ -13,16 +13,18 @@
<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;">
<i class="fa fa-{{$al->active == 1?"check":""}}-square-o" aria-hidden="true" @if($al->active == 1)
style="color: {{$al->active==1?"darkgreen":"darkred"}};font-size:20px;"></i> <span class="label label-success">Active</span>
@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']) !!}
<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.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'>
<a href="{!! route('admin.airlines.edit', [$al->id]) !!}" class='btn btn-default btn-xs'><i class="glyphicon glyphicon-edit"></i></a> <i class="fa fa-pencil-square-o"></i></a>
{!! Form::button('<i class="glyphicon glyphicon-trash"></i>', ['type' => 'submit', 'class' => 'btn btn-danger btn-xs', 'onclick' => "return confirm('Are you sure?')"]) !!} {!! 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>
{!! Form::close() !!} {!! Form::close() !!}
</td> </td>
</tr> </tr>

6
resources/views/admin/sidebar.blade.php
View File

@@ -7,12 +7,10 @@
<div class="sidebar-wrapper"> <div class="sidebar-wrapper">
<div class="logo" style="background: #067ec1; margin: 0px; text-align: center; min-height: 74px;"> <div class="logo">
<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>
<ul class="nav"> @include('admin.menu')
@include('admin.menu')
</ul>
</div> </div>
</div> </div>