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 1 Packages Projects Releases Wiki Activity

Fixes snipeSettings error if the user was created but the settings table isn’t populated yet

Browse source
This commit is contained in:
snipe 2016-11-29 01:20:51 -08:00
parent 2603488bd6
commit 7393f0bbea
2 changed files with 22 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -34,7 +34,7 @@
<link rel="shortcut icon" type="image/ico" href="{{ asset('favicon.ico') }}"> <link rel="shortcut icon" type="image/ico" href="{{ asset('favicon.ico') }}">
@if ($snipeSettings->header_color) @if (($snipeSettings) && ($snipeSettings->header_color))
<style> <style>
.main-header .navbar, .main-header .logo { .main-header .navbar, .main-header .logo {
background-color: {{ $snipeSettings->header_color }}; background-color: {{ $snipeSettings->header_color }};
@ -58,7 +58,7 @@
<body class="hold-transition login-page"> <body class="hold-transition login-page">
@if ($snipeSettings->logo!='') @if (($snipeSettings) && ($snipeSettings->logo!=''))
<center><img class="logo" style="padding-top: 20px; padding-bottom: 10px;" src="{{ config('app.url') }}/uploads/{{ $snipeSettings->logo }}"></center> <center><img class="logo" style="padding-top: 20px; padding-bottom: 10px;" src="{{ config('app.url') }}/uploads/{{ $snipeSettings->logo }}"></center>
@endif @endif
<!-- Content --> <!-- Content -->

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

@ -35,27 +35,29 @@
<link rel="shortcut icon" type="image/ico" href="{{ asset('favicon.ico') }}"> <link rel="shortcut icon" type="image/ico" href="{{ asset('favicon.ico') }}">
<style> <style>
@if ($snipeSettings->header_color) @if ($snipeSettings)
.main-header .navbar, .main-header .logo { @if ($snipeSettings->header_color)
background-color: {{ $snipeSettings->header_color }}; .main-header .navbar, .main-header .logo {
background: -webkit-linear-gradient(top, {{ $snipeSettings->header_color }} 0%,{{ $snipeSettings->header_color }} 100%); background-color: {{ $snipeSettings->header_color }};
background: linear-gradient(to bottom, {{ $snipeSettings->header_color }} 0%,{{ $snipeSettings->header_color }} 100%); background: -webkit-linear-gradient(top, {{ $snipeSettings->header_color }} 0%,{{ $snipeSettings->header_color }} 100%);
border-color: {{ $snipeSettings->header_color }}; background: linear-gradient(to bottom, {{ $snipeSettings->header_color }} 0%,{{ $snipeSettings->header_color }} 100%);
} border-color: {{ $snipeSettings->header_color }};
.skin-blue .sidebar-menu > li:hover > a, .skin-blue .sidebar-menu > li.active > a { }
border-left-color: {{ $snipeSettings->header_color }}; .skin-blue .sidebar-menu > li:hover > a, .skin-blue .sidebar-menu > li.active > a {
} border-left-color: {{ $snipeSettings->header_color }};
}
.btn-primary { .btn-primary {
background-color: {{ $snipeSettings->header_color }}; background-color: {{ $snipeSettings->header_color }};
border-color: {{ $snipeSettings->header_color }}; border-color: {{ $snipeSettings->header_color }};
} }
@endif @endif
@if ($snipeSettings->custom_css) @if ($snipeSettings->custom_css)
{{ $snipeSettings->show_custom_css() }} {{ $snipeSettings->show_custom_css() }}
@endif @endif
@endif
@media (max-width: 400px) { @media (max-width: 400px) {
.navbar-left { .navbar-left {
margin: 2px; margin: 2px;