From cfc05c1b22698280f32505e92f7516c5a5cee677 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sun, 27 Aug 2017 12:59:56 +0100
Subject: [PATCH] Improved primary color control in settings

---
 resources/views/partials/custom-styles.blade.php | 2 --
 resources/views/settings/index.blade.php         | 5 +++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/resources/views/partials/custom-styles.blade.php b/resources/views/partials/custom-styles.blade.php
index ffa39c50a..c13051df4 100644
--- a/resources/views/partials/custom-styles.blade.php
+++ b/resources/views/partials/custom-styles.blade.php
@@ -1,5 +1,4 @@
 <style id="custom-styles" data-color="{{ setting('app-color') }}" data-color-light="{{ setting('app-color-light') }}">
-    @if(setting('app-color'))
     header, [back-to-top], .primary-background {
         background-color: {{ setting('app-color') }} !important;
     }
@@ -18,5 +17,4 @@
     .text-primary, p.primary, p .primary, span.primary:hover, .text-primary:hover, a, a:hover, a:focus, .text-button, .text-button:hover, .text-button:focus {
         color: {{ setting('app-color') }};
     }
-    @endif
 </style>
\ No newline at end of file
diff --git a/resources/views/settings/index.blade.php b/resources/views/settings/index.blade.php
index 18d8b1307..cd6a25493 100644
--- a/resources/views/settings/index.blade.php
+++ b/resources/views/settings/index.blade.php
@@ -68,8 +68,8 @@
                         <div class="form-group" id="color-control">
                             <label for="setting-app-color">{{ trans('settings.app_primary_color') }}</label>
                             <p class="small">{!! trans('settings.app_primary_color_desc') !!}</p>
-                            <input  type="text" value="{{ setting('app-color', '') }}" name="setting-app-color" id="setting-app-color" placeholder="#0288D1">
-                            <input  type="hidden" value="{{ setting('app-color-light', '') }}" name="setting-app-color-light" id="setting-app-color-light" placeholder="rgba(21, 101, 192, 0.15)">
+                            <input type="text" value="{{ setting('app-color') }}" name="setting-app-color" id="setting-app-color" placeholder="#0288D1">
+                            <input type="hidden" value="{{ setting('app-color-light') }}" name="setting-app-color-light" id="setting-app-color-light">
                         </div>
                     </div>
 
@@ -152,6 +152,7 @@
                 var hexVal = '#' + this.color.colors.HEX;
                 var rgb = this.color.colors.RND.rgb;
                 var rgbLightVal = 'rgba('+ [rgb.r, rgb.g, rgb.b, '0.15'].join(',') +')';
+
                 // Set textbox color to hex color code.
                 var isEmpty = $.trim($elm.val()).length === 0;
                 if (!isEmpty) $elm.val(hexVal);