From f1c613249a15a06cbc463baa7c9a7b9aed5080bf Mon Sep 17 00:00:00 2001 From: Michael Mollick Date: Tue, 20 Oct 2015 23:52:48 -0400 Subject: [PATCH] Support for full width header added --- app/Composers/ThemeComposer.php | 2 ++ .../views/dashboard/settings/theme.blade.php | 27 +++++++++++++++++++ resources/views/index.blade.php | 5 ++++ resources/views/layout/master.blade.php | 5 ++++ resources/views/partials/about-app.blade.php | 1 + resources/views/partials/stylesheet.blade.php | 11 ++++++++ 6 files changed, 51 insertions(+) diff --git a/app/Composers/ThemeComposer.php b/app/Composers/ThemeComposer.php index 98074023..83fd95c8 100644 --- a/app/Composers/ThemeComposer.php +++ b/app/Composers/ThemeComposer.php @@ -28,6 +28,8 @@ class ThemeComposer // Theme colors. $view->withThemeBackgroundColor(Setting::get('style_background_color', '#F0F3F4')); $view->withThemeBackgroundFills(Setting::get('style_background_fills', '#FFFFFF')); + $view->withThemeBannerBackgroundColor(Setting::get('style_banner_background_color', '')); + $view->withThemeBannerPadding(Setting::get('style_banner_padding', '40px 0 0 0')); $view->withThemeTextColor(Setting::get('style_text_color', '#333333')); $view->withThemeReds(Setting::get('style_reds', '#ff6f6f')); $view->withThemeBlues(Setting::get('style_blues', '#3498db')); diff --git a/resources/views/dashboard/settings/theme.blade.php b/resources/views/dashboard/settings/theme.blade.php index d10ea484..a4c5d870 100644 --- a/resources/views/dashboard/settings/theme.blade.php +++ b/resources/views/dashboard/settings/theme.blade.php @@ -32,6 +32,33 @@
+
+
+
+ {{----}} + + +
+
+
+
+ {{----}} + + +
+
+
+
+ +
+
+
+
diff --git a/resources/views/index.blade.php b/resources/views/index.blade.php index b3fca4ba..55e026e8 100644 --- a/resources/views/index.blade.php +++ b/resources/views/index.blade.php @@ -7,6 +7,11 @@ @include('partials.about-app') +@if(Setting::get('style_fullwidth_header')) +
+
+@endif +
{{ $systemMessage }}
diff --git a/resources/views/layout/master.blade.php b/resources/views/layout/master.blade.php index e5a03ecc..2682ab28 100644 --- a/resources/views/layout/master.blade.php +++ b/resources/views/layout/master.blade.php @@ -57,7 +57,12 @@ + @if(Setting::get('style_fullwidth_header')) +
+ @else
+ @endif + @yield('content')
diff --git a/resources/views/partials/about-app.blade.php b/resources/views/partials/about-app.blade.php index 48aaa011..3e83865c 100644 --- a/resources/views/partials/about-app.blade.php +++ b/resources/views/partials/about-app.blade.php @@ -17,3 +17,4 @@

{!! $about_app !!}

@endif + diff --git a/resources/views/partials/stylesheet.blade.php b/resources/views/partials/stylesheet.blade.php index cafc4122..a979947c 100644 --- a/resources/views/partials/stylesheet.blade.php +++ b/resources/views/partials/stylesheet.blade.php @@ -2,6 +2,9 @@ body.status-page { background-color: {{ $theme_background_color }}; color: {{ $theme_text_color }}; + @if(Setting::get('app_banner')) + padding-top: 0; + @endif } .reds { color: {{ $theme_reds }} !important; } .blues { color: {{ $theme_blues }} !important; } @@ -11,6 +14,14 @@ body.status-page { .metrics { color: {{ $theme_metrics }} !important; } .links { color: {{ $theme_links }} !important; } +/** + * Banner background + */ +.app-banner { + background-color: {{ $theme_banner_background_color }} !important; + padding: {{ $theme_banner_padding }} !important; +} + /** * Alert overrides. */