Infra-Mirrors/BookStack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2024-08-24 19:25:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed theme color elements not showing on new instance

Browse Source 
Also cleaned notification session access
This commit is contained in:
Dan Brown 2016-06-12 13:37:15 +01:00
parent 991dd8a558
commit d582e76fed
3 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/setting-defaults.php
View File

@ -5,6 +5,8 @@
*/ */
return [ return [
'app-editor' => 'wysiwyg' 'app-editor' => 'wysiwyg',
'app-color' => '#0288D1',
'app-color-light' => 'rgba(21, 101, 192, 0.15)'
]; ];

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

@ -1,22 +1,20 @@
@if(Setting::get('app-color')) <style>
<style> header, #back-to-top, .primary-background {
header, #back-to-top, .primary-background { background-color: {{ Setting::get('app-color') }} !important;
background-color: {{ Setting::get('app-color') }} !important; }
} .faded-small, .primary-background-light {
.faded-small, .primary-background-light { background-color: {{ Setting::get('app-color-light') }};
background-color: {{ Setting::get('app-color-light') }}; }
} .button-base, .button, input[type="button"], input[type="submit"] {
.button-base, .button, input[type="button"], input[type="submit"] { background-color: {{ Setting::get('app-color') }};
background-color: {{ Setting::get('app-color') }}; }
} .button-base:hover, .button:hover, input[type="button"]:hover, input[type="submit"]:hover, .button:focus {
.button-base:hover, .button:hover, input[type="button"]:hover, input[type="submit"]:hover, .button:focus { background-color: {{ Setting::get('app-color') }};
background-color: {{ Setting::get('app-color') }}; }
} .nav-tabs a.selected, .nav-tabs .tab-item.selected {
.nav-tabs a.selected, .nav-tabs .tab-item.selected { border-bottom-color: {{ Setting::get('app-color') }};
border-bottom-color: {{ Setting::get('app-color') }}; }
} p.primary:hover, p .primary:hover, span.primary:hover, .text-primary:hover, a, a:hover, a:focus, .text-button, .text-button:hover, .text-button:focus {
p.primary:hover, p .primary:hover, span.primary:hover, .text-primary:hover, a, a:hover, a:focus, .text-button, .text-button:hover, .text-button:focus { color: {{ Setting::get('app-color') }};
color: {{ Setting::get('app-color') }}; }
} </style>
</style>
@endif

12
resources/views/partials/notifications.blade.php
View File

@ -1,12 +1,12 @@
<div class="notification anim pos" @if(!Session::has('success')) style="display:none;" @endif> <div class="notification anim pos" @if(!session()->has('success')) style="display:none;" @endif>
<i class="zmdi zmdi-check-circle"></i> <span>{!! nl2br(htmlentities(Session::get('success'))) !!}</span> <i class="zmdi zmdi-check-circle"></i> <span>{!! nl2br(htmlentities(session()->get('success'))) !!}</span>
</div> </div>
<div class="notification anim warning stopped" @if(!Session::has('warning')) style="display:none;" @endif> <div class="notification anim warning stopped" @if(!session()->has('warning')) style="display:none;" @endif>
<i class="zmdi zmdi-info"></i> <span>{!! nl2br(htmlentities(Session::get('warning'))) !!}</span> <i class="zmdi zmdi-info"></i> <span>{!! nl2br(htmlentities(session()->get('warning'))) !!}</span>
</div> </div>
<div class="notification anim neg stopped" @if(!Session::has('error')) style="display:none;" @endif> <div class="notification anim neg stopped" @if(!session()->has('error')) style="display:none;" @endif>
<i class="zmdi zmdi-alert-circle"></i> <span>{!! nl2br(htmlentities(Session::get('error'))) !!}</span> <i class="zmdi zmdi-alert-circle"></i> <span>{!! nl2br(htmlentities(session()->get('error'))) !!}</span>
</div> </div>