From d4824ecda5187d8e9a81d5395f3f70145dff1b8d Mon Sep 17 00:00:00 2001 From: Deon George Date: Mon, 28 Jun 2021 12:50:28 +1000 Subject: [PATCH] Dont use asset() for remote URLs, added metronic theme --- .../views/auth/partials/scripts.blade.php | 19 +- .../adminlte/views/layouts/auth.blade.php | 15 +- .../views/layouts/partials/footer.blade.php | 2 +- .../layouts/partials/htmlheader.blade.php | 18 +- .../views/layouts/partials/scripts.blade.php | 8 +- .../views/layouts/partials/sidebar.blade.php | 2 +- .../layouts/partials/htmlheader.blade.php | 2 +- .../themes/metronic/assets/components.css | 650 ++++ .../metronic/assets/style-responsive.css | 805 +++++ resources/themes/metronic/assets/style.css | 3089 +++++++++++++++++ .../themes/metronic/assets/themes/blue.css | 382 ++ .../themes/metronic/assets/themes/gray.css | 382 ++ .../themes/metronic/assets/themes/green.css | 382 ++ .../themes/metronic/assets/themes/orange.css | 382 ++ .../themes/metronic/assets/themes/red.css | 377 ++ .../metronic/assets/themes/turquoise.css | 383 ++ .../metronic/views/layouts/app.blade.php | 47 + .../layouts/partials/contentheader.blade.php | 0 .../layouts/partials/controlsidebar.blade.php | 0 .../views/layouts/partials/footer.blade.php | 99 + .../layouts/partials/htmlheader.blade.php | 41 + .../layouts/partials/mainheader.blade.php | 81 + .../views/layouts/partials/scripts.blade.php | 22 + .../views/layouts/partials/sidebar.blade.php | 0 src/Providers/LeenooksServiceProvider.php | 2 + 25 files changed, 7158 insertions(+), 32 deletions(-) create mode 100644 resources/themes/metronic/assets/components.css create mode 100644 resources/themes/metronic/assets/style-responsive.css create mode 100644 resources/themes/metronic/assets/style.css create mode 100644 resources/themes/metronic/assets/themes/blue.css create mode 100644 resources/themes/metronic/assets/themes/gray.css create mode 100644 resources/themes/metronic/assets/themes/green.css create mode 100644 resources/themes/metronic/assets/themes/orange.css create mode 100644 resources/themes/metronic/assets/themes/red.css create mode 100644 resources/themes/metronic/assets/themes/turquoise.css create mode 100644 resources/themes/metronic/views/layouts/app.blade.php create mode 100644 resources/themes/metronic/views/layouts/partials/contentheader.blade.php create mode 100644 resources/themes/metronic/views/layouts/partials/controlsidebar.blade.php create mode 100644 resources/themes/metronic/views/layouts/partials/footer.blade.php create mode 100644 resources/themes/metronic/views/layouts/partials/htmlheader.blade.php create mode 100644 resources/themes/metronic/views/layouts/partials/mainheader.blade.php create mode 100644 resources/themes/metronic/views/layouts/partials/scripts.blade.php create mode 100644 resources/themes/metronic/views/layouts/partials/sidebar.blade.php diff --git a/resources/themes/adminlte/views/auth/partials/scripts.blade.php b/resources/themes/adminlte/views/auth/partials/scripts.blade.php index b54ad97..80318ad 100644 --- a/resources/themes/adminlte/views/auth/partials/scripts.blade.php +++ b/resources/themes/adminlte/views/auth/partials/scripts.blade.php @@ -1,21 +1,8 @@ - - + + - - - - - - + @if(file_exists('js/custom-auth.js')) diff --git a/resources/themes/adminlte/views/layouts/auth.blade.php b/resources/themes/adminlte/views/layouts/auth.blade.php index 8792e04..c3bf5de 100644 --- a/resources/themes/adminlte/views/layouts/auth.blade.php +++ b/resources/themes/adminlte/views/layouts/auth.blade.php @@ -4,7 +4,7 @@ @include('adminlte::layouts.partials.htmlheader') - + @show @@ -14,6 +14,19 @@ @section('scripts') @include('adminlte::auth.partials.scripts') + + + + + @show \ No newline at end of file diff --git a/resources/themes/adminlte/views/layouts/partials/footer.blade.php b/resources/themes/adminlte/views/layouts/partials/footer.blade.php index 728092a..1601245 100644 --- a/resources/themes/adminlte/views/layouts/partials/footer.blade.php +++ b/resources/themes/adminlte/views/layouts/partials/footer.blade.php @@ -6,5 +6,5 @@ - Copyright © 2014-2018 © Leenooks. All rights reserved. + Copyright © 2014-{{ \Carbon\Carbon::now()->year }} © Leenooks. All rights reserved. \ No newline at end of file diff --git a/resources/themes/adminlte/views/layouts/partials/htmlheader.blade.php b/resources/themes/adminlte/views/layouts/partials/htmlheader.blade.php index f4b267b..88ff8d3 100644 --- a/resources/themes/adminlte/views/layouts/partials/htmlheader.blade.php +++ b/resources/themes/adminlte/views/layouts/partials/htmlheader.blade.php @@ -6,27 +6,27 @@ - + - + {{-- - + --}} - + @if(file_exists('css/social.css')) - + @endif @if(file_exists('css/print.css')) - + @endif {{-- @@ -41,13 +41,15 @@ {!! Asset::styles() !!} + @yield('page-styles') + @if(file_exists('css/fixes.css')) - + @endif @if(file_exists('css/custom.css')) - + @endif diff --git a/resources/themes/adminlte/views/layouts/partials/scripts.blade.php b/resources/themes/adminlte/views/layouts/partials/scripts.blade.php index 4b8405b..daba0ee 100644 --- a/resources/themes/adminlte/views/layouts/partials/scripts.blade.php +++ b/resources/themes/adminlte/views/layouts/partials/scripts.blade.php @@ -1,10 +1,10 @@ - - - + + + - + diff --git a/resources/themes/adminlte/views/layouts/partials/sidebar.blade.php b/resources/themes/adminlte/views/layouts/partials/sidebar.blade.php index 7b9ec5a..49362b3 100644 --- a/resources/themes/adminlte/views/layouts/partials/sidebar.blade.php +++ b/resources/themes/adminlte/views/layouts/partials/sidebar.blade.php @@ -2,7 +2,7 @@