DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-03-05 20:52:15 -08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Split out custom_css from custom_header

Browse source 
This makes it so that the custom_css will still be respected even if there is no custom header
This commit is contained in:
snipe 2018-07-25 19:01:47 -07:00
parent 4e55a18a60
commit 708b1a962c
2 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
resources/views/layouts/basic.blade.php
View file

@ -33,13 +33,16 @@
border-color: {{ $snipeSettings->header_color }}; border-color: {{ $snipeSettings->header_color }};
} }
@if ($snipeSettings->custom_css)
{{ $snipeSettings->show_custom_css() }}
@endif
</style> </style>
@endif @endif
@if (($snipeSettings) && ($snipeSettings->custom_css))
<style>
{!! $snipeSettings->show_custom_css() !!}
</style>
@endif
</head> </head>
<body class="hold-transition login-page"> <body class="hold-transition login-page">

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

@ -54,9 +54,7 @@
} }
@endif @endif
@if (($snipeSettings) && ($snipeSettings->custom_css!=''))
{!! $snipeSettings->show_custom_css() !!}
@endif
@media (max-width: 400px) { @media (max-width: 400px) {
.navbar-left { .navbar-left {
@ -69,6 +67,12 @@
} }
</style> </style>
@if (($snipeSettings) && ($snipeSettings->custom_css))
<style>
{!! $snipeSettings->show_custom_css() !!}
</style>
@endif
<script nonce="{{ csrf_token() }}"> <script nonce="{{ csrf_token() }}">
window.snipeit = { window.snipeit = {
settings: { settings: {