From 4ad6a8256d64110bdeb452c1bbcbe7c51f451ba0 Mon Sep 17 00:00:00 2001 From: Nick de Kruijk Date: Thu, 11 Jan 2018 14:02:33 +0100 Subject: [PATCH 1/6] Ability to load custom css --- src/config.php | 14 ++++++++++++++ src/css/larapages2.css | 0 src/views/admin.blade.php | 9 ++++++++- 3 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 src/css/larapages2.css diff --git a/src/config.php b/src/config.php index a8aefa0..e0ca537 100644 --- a/src/config.php +++ b/src/config.php @@ -117,4 +117,18 @@ 'page' => 'laraPages::main.page', ], + /* + |-------------------------------------------------------------------------- + | css + |-------------------------------------------------------------------------- + | + | Extra CSS files to load, you can use this to customize the look anf feel + | + */ + + 'css' => [ + '/vendor/larapages/css/larapages2.css', +// '/css/lp-admin-custom.css', + ], + ]; diff --git a/src/css/larapages2.css b/src/css/larapages2.css new file mode 100644 index 0000000..e69de29 diff --git a/src/views/admin.blade.php b/src/views/admin.blade.php index fecf3b1..039deed 100644 --- a/src/views/admin.blade.php +++ b/src/views/admin.blade.php @@ -6,8 +6,15 @@ - {{ str_replace('www.','',$_SERVER['HTTP_HOST']) }} - Admin @yield('title') + + {{ str_replace('www.','',$_SERVER['HTTP_HOST']) }} - Admin @yield('title') + + @if (config('larapages.css')) + @foreach (config('larapages.css') as $css) + + @endforeach + @endif @if (isset($admin)) From b4d2db019fe98a0e1fc50b099a5eee9b60831653 Mon Sep 17 00:00:00 2001 From: Nick de Kruijk Date: Thu, 11 Jan 2018 14:15:44 +0100 Subject: [PATCH 2/6] Typo --- src/config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/config.php b/src/config.php index e0ca537..3342b61 100644 --- a/src/config.php +++ b/src/config.php @@ -122,7 +122,7 @@ | css |-------------------------------------------------------------------------- | - | Extra CSS files to load, you can use this to customize the look anf feel + | Extra CSS files to load, you can use this to customize the look and feel | */ From 3d9b24e1aee3a583944fc4df2b19841b9c0504dc Mon Sep 17 00:00:00 2001 From: Nick de Kruijk Date: Thu, 11 Jan 2018 14:17:57 +0100 Subject: [PATCH 3/6] tabs --- src/views/admin.blade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/admin.blade.php b/src/views/admin.blade.php index 039deed..e0eac5c 100644 --- a/src/views/admin.blade.php +++ b/src/views/admin.blade.php @@ -7,8 +7,8 @@ - {{ str_replace('www.','',$_SERVER['HTTP_HOST']) }} - Admin @yield('title') - + {{ str_replace('www.','',$_SERVER['HTTP_HOST']) }} - Admin @yield('title') + @if (config('larapages.css')) @foreach (config('larapages.css') as $css) From 1584496ef79135de6130943e88f4cbed671c1cbd Mon Sep 17 00:00:00 2001 From: Nick de Kruijk Date: Thu, 11 Jan 2018 14:19:05 +0100 Subject: [PATCH 4/6] Revert changing --- src/views/admin.blade.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/views/admin.blade.php b/src/views/admin.blade.php index e0eac5c..a96682f 100644 --- a/src/views/admin.blade.php +++ b/src/views/admin.blade.php @@ -6,9 +6,7 @@ <meta name="csrf-token" content="{{ csrf_token() }}"> <meta name="robots" content="NOINDEX, NOFOLLOW"> <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable = no"> - <title> - {{ str_replace('www.','',$_SERVER['HTTP_HOST']) }} - Admin @yield('title') - + {{ str_replace('www.','',$_SERVER['HTTP_HOST']) }} - Admin @yield('title') @if (config('larapages.css')) @foreach (config('larapages.css') as $css) From 253d5381826c006dde8c65fef24442b7b10f8f04 Mon Sep 17 00:00:00 2001 From: Nick de Kruijk Date: Thu, 11 Jan 2018 14:21:48 +0100 Subject: [PATCH 5/6] Default no extra css --- src/config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/config.php b/src/config.php index 3342b61..3c75df7 100644 --- a/src/config.php +++ b/src/config.php @@ -127,7 +127,7 @@ */ 'css' => [ - '/vendor/larapages/css/larapages2.css', +// '/vendor/larapages/css/larapages2.css', // '/css/lp-admin-custom.css', ], From 98d7608fa282493302c25f3f48a399c39ce0dfb5 Mon Sep 17 00:00:00 2001 From: Nick de Kruijk Date: Thu, 11 Jan 2018 14:21:58 +0100 Subject: [PATCH 6/6] Better ident --- src/views/admin.blade.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/admin.blade.php b/src/views/admin.blade.php index a96682f..611ea31 100644 --- a/src/views/admin.blade.php +++ b/src/views/admin.blade.php @@ -8,11 +8,11 @@ {{ str_replace('www.','',$_SERVER['HTTP_HOST']) }} - Admin @yield('title') - @if (config('larapages.css')) - @foreach (config('larapages.css') as $css) +@if (config('larapages.css')) +@foreach (config('larapages.css') as $css) - @endforeach - @endif +@endforeach +@endif @if (isset($admin))