colin
/
bookstack
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improved primary color control in settings

This commit is contained in:
Dan Brown 2017-08-27 12:59:56 +01:00
parent ebf78d49a8
commit cfc05c1b22
No known key found for this signature in database
GPG Key ID: 46D9F943C24A2EF9
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/views/partials/custom-styles.blade.php
View File

@ -1,5 +1,4 @@
<style id="custom-styles" data-color="{{ setting('app-color') }}" data-color-light="{{ setting('app-color-light') }}"> <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 { header, [back-to-top], .primary-background {
background-color: {{ setting('app-color') }} !important; 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 { .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') }}; color: {{ setting('app-color') }};
} }
@endif
</style> </style>

5
resources/views/settings/index.blade.php
View File

@ -68,8 +68,8 @@
<div class="form-group" id="color-control"> <div class="form-group" id="color-control">
<label for="setting-app-color">{{ trans('settings.app_primary_color') }}</label> <label for="setting-app-color">{{ trans('settings.app_primary_color') }}</label>
<p class="small">{!! trans('settings.app_primary_color_desc') !!}</p> <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="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="hidden" value="{{ setting('app-color-light') }}" name="setting-app-color-light" id="setting-app-color-light">
</div> </div>
</div> </div>
@ -152,6 +152,7 @@
var hexVal = '#' + this.color.colors.HEX; var hexVal = '#' + this.color.colors.HEX;
var rgb = this.color.colors.RND.rgb; var rgb = this.color.colors.RND.rgb;
var rgbLightVal = 'rgba('+ [rgb.r, rgb.g, rgb.b, '0.15'].join(',') +')'; var rgbLightVal = 'rgba('+ [rgb.r, rgb.g, rgb.b, '0.15'].join(',') +')';
// Set textbox color to hex color code. // Set textbox color to hex color code.
var isEmpty = $.trim($elm.val()).length === 0; var isEmpty = $.trim($elm.val()).length === 0;
if (!isEmpty) $elm.val(hexVal); if (!isEmpty) $elm.val(hexVal);