diff --git a/.gitignore b/.gitignore index 2824c8fe..35a7317c 100644 --- a/.gitignore +++ b/.gitignore @@ -51,3 +51,6 @@ local.conf.php # Error Logs error_log + +.sass-cache +.DS_Store diff --git a/resources/views/admin/app.blade.php b/resources/views/admin/app.blade.php index c832cd0b..f4568dd9 100644 --- a/resources/views/admin/app.blade.php +++ b/resources/views/admin/app.blade.php @@ -1,201 +1,105 @@ - - + + - - phpvms4 admin - + + + - - - - - - - {{-- --}} + Light Bootstrap Dashboard by Creative Tim - + + - - {{----}} + + + + + + + + + - - @yield('css') + - -@if (!Auth::guest()) -
- -
+
- - + @include('admin.sidebar') - -
- - - @include('admin.sidebar') - -
- @yield('content') -
- - - {{----}} - -
-@else - - - - - -
-
-
-
- @yield('content') +
+
+
+
+ @yield('content') +
+
- @endif +
- - - - - - - - - - - - - - {{-- --}} - - - - @yield('scripts') + + + + + + + + + + + + + + + + +@yield('scripts') diff --git a/resources/views/admin/app.old.blade.php b/resources/views/admin/app.old.blade.php new file mode 100644 index 00000000..0c6b5a8e --- /dev/null +++ b/resources/views/admin/app.old.blade.php @@ -0,0 +1,215 @@ + + + + + phpvms4 admin + + + + + + + + + {{-- --}} + + + + + {{----}} + + + @yield('css') + + + +@if (!Auth::guest()) +
+ +
+ + + + + + +
+ + + @include('admin.sidebar') + +
+ @yield('content') +
+ + + {{--
+ Copyright © 2017 phpvms. All rights reserved. +
--}} + +
+@else + + +
+
+
+
+ @yield('content') +
+
+
+
+@endif + + + + + + + + + + + + + + + +{{-- --}} + + + +@yield('scripts') + + diff --git a/resources/views/admin/menu.blade.php b/resources/views/admin/menu.blade.php index f4a8aa84..5520edc6 100644 --- a/resources/views/admin/menu.blade.php +++ b/resources/views/admin/menu.blade.php @@ -2,7 +2,7 @@ dashboard -
  • operations
  • +
  • operations

  •  pireps 3 diff --git a/resources/views/admin/sidebar.blade.php b/resources/views/admin/sidebar.blade.php index d5d230fb..51660db5 100644 --- a/resources/views/admin/sidebar.blade.php +++ b/resources/views/admin/sidebar.blade.php @@ -1,36 +1,21 @@ - +
  • +