DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-10 23:54:12 -08:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse source
This commit is contained in:
snipe 2017-11-15 14:27:47 -08:00
parent e433b0f9d8 edcd3afc3e
commit 4f1b58cd35
2 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/Models/Setting.php
View file

@ -89,6 +89,18 @@ class Setting extends Model
} }
/**
* Escapes the custom CSS, and then un-escapes the greater-than symbol
* so it can work with direct descendant characters for bootstrap
* menu overrides like:
*
* .skin-blue .sidebar-menu>li.active>a, .skin-blue .sidebar-menu>li:hover>a
*
* Important: Do not remove the e() escaping here, as we output raw in the blade.
*
* @return string escaped CSS
* @author A. Gianotto <snipe@snipe.net>
*/
public function show_custom_css() public function show_custom_css()
{ {
$custom_css = Setting::getSettings()->custom_css; $custom_css = Setting::getSettings()->custom_css;

2
resources/views/layouts/default.blade.php
View file

@ -52,7 +52,7 @@
@endif @endif
@if ($snipeSettings->custom_css) @if ($snipeSettings->custom_css)
{{ $snipeSettings->show_custom_css() }} {!! $snipeSettings->show_custom_css() !!}
@endif @endif
@endif @endif
@media (max-width: 400px) { @media (max-width: 400px) {