DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-01-26 13:10:55 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Tempt fix for css weirdness

Browse source 
TODO: figure out why overrides isn’t being compiled into css/dist/all.css
This commit is contained in:
snipe 2020-04-21 11:03:32 -07:00
parent 63259418b2
commit 7a6ca5cb40
No known key found for this signature in database
GPG key ID: 10BFFDA3ED34B5AC
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -29,13 +29,14 @@
{{-- stylesheets --}} {{-- stylesheets --}}
<link rel="stylesheet" href="{{ url('css/all.css') }}"> <link rel="stylesheet" href="{{ url('css/all.css') }}">
@if (($snipeSettings) && ($snipeSettings->skin!='')) <link rel="stylesheet" href="{{ url('css/overrides.css') }}">
<link rel="stylesheet" href="{{ url('css/skins/skin-'.$snipeSettings->skin.'.css') }}"> <link rel="stylesheet" href="{{ url('css/skins/skin-'.($snipeSettings->skin!='' ? $snipeSettings->skin : 'blue').'.css') }}">
@endif
{{-- page level css --}}
{{-- page level css --}}
@stack('css') @stack('css')
<link rel="stylesheet" href="{{ url('css/skins/skin-'.($snipeSettings->skin!='' ? $snipeSettings->skin : 'blue').'.css') }}">
@if (($snipeSettings) && ($snipeSettings->header_color!='')) @if (($snipeSettings) && ($snipeSettings->header_color!=''))
<style nonce="{{ csrf_token() }}"> <style nonce="{{ csrf_token() }}">