mirror of
https://github.com/snipe/snipe-it.git
synced 2025-02-21 03:15:45 -08:00
Fix navbar spacing on screen and mobile. Move the items on the left of the navbar to their own list. Style fixes. Move breadcrumb to outside navbar because it was breaking things and I think it looks better
This commit is contained in:
Daniel Meltzer
parent
2ff1ee4d33
commit
5d206f2c20
|
|
@ -54,6 +54,12 @@
|
||||||
@if (\App\Models\Setting::getSettings()->custom_css)
|
@if (\App\Models\Setting::getSettings()->custom_css)
|
||||||
{{ \App\Models\Setting::getSettings()->show_custom_css() }}
|
{{ \App\Models\Setting::getSettings()->show_custom_css() }}
|
||||||
@endif
|
@endif
|
||||||
|
@media (max-width: 400px) {
|
||||||
|
.navbar-left {
|
||||||
|
margin: 2px;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
|
|
@ -85,84 +91,77 @@
|
||||||
<a href="#" style="color: white" class="sidebar-toggle btn btn-white" data-toggle="offcanvas" role="button">
|
<a href="#" style="color: white" class="sidebar-toggle btn btn-white" data-toggle="offcanvas" role="button">
|
||||||
<span class="sr-only">Toggle navigation</span>
|
<span class="sr-only">Toggle navigation</span>
|
||||||
</a>
|
</a>
|
||||||
|
<ul class="nav navbar-nav navbar-left">
|
||||||
|
<li class="left-navblock">
|
||||||
|
<div class="pull-left">
|
||||||
|
@if (\App\Models\Setting::getSettings()->brand == '3')
|
||||||
|
<a class="logo navbar-brand no-hover" href="{{ config('app.url') }}">
|
||||||
|
<img class="navbar-brand-img" src="{{ config('app.url') }}/uploads/{{ \App\Models\Setting::getSettings()->logo }}">
|
||||||
|
{{ \App\Models\Setting::getSettings()->site_name }}
|
||||||
|
</a>
|
||||||
|
@elseif (\App\Models\Setting::getSettings()->brand == '2')
|
||||||
|
<a class="logo navbar-brand no-hover" href="{{ config('app.url') }}">
|
||||||
|
<img class="navbar-brand-img" src="{{ config('app.url') }}/uploads/{{ \App\Models\Setting::getSettings()->logo }}">
|
||||||
|
</a>
|
||||||
|
@else
|
||||||
|
<a class="logo no-hover" href="{{ config('app.url') }}">
|
||||||
|
{{ \App\Models\Setting::getSettings()->site_name }}
|
||||||
|
</a>
|
||||||
|
@endif
|
||||||
|
</div>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
|
||||||
<!-- Navbar Right Menu -->
|
<!-- Navbar Right Menu -->
|
||||||
<div class="navbar-custom-menu">
|
<div class="navbar-custom-menu">
|
||||||
<ul class="nav navbar-nav">
|
<ul class="nav navbar-nav">
|
||||||
<!-- Sidebar toggle button-->
|
@if (Auth::user()->hasAccess('admin'))
|
||||||
<li>
|
@if (!Request::is('/'))
|
||||||
<a href="#" style="color: white; float: right;" class="sidebar-toggle-mobile visible-xs btn btn-white pull-right" data-toggle="offcanvas" role="button">
|
<li {!! (Request::is('hardware*') ? ' class="active"' : '') !!}>
|
||||||
<span class="sr-only">Toggle navigation</span>
|
<a href="{{ URL::to('hardware') }}">
|
||||||
<i class="fa fa-bars"></i>
|
<i class="fa fa-barcode"></i>
|
||||||
</a>
|
</a>
|
||||||
</li>
|
</li>
|
||||||
<div class="left-navblock">
|
<li {!! (Request::is('admin/licenses*') ? ' class="active"' : '') !!}>
|
||||||
<div class="pull-left">
|
<a href="{{ URL::to('admin/licenses') }}">
|
||||||
@if (\App\Models\Setting::getSettings()->brand == '3')
|
<i class="fa fa-floppy-o"></i>
|
||||||
<a class="logo navbar-brand no-hover" href="{{ config('app.url') }}">
|
</a>
|
||||||
<img class="navbar-brand-img" src="{{ config('app.url') }}/uploads/{{ \App\Models\Setting::getSettings()->logo }}">
|
</li>
|
||||||
{{ \App\Models\Setting::getSettings()->site_name }}
|
<li {!! (Request::is('admin/accessories*') ? ' class="active"' : '') !!}>
|
||||||
</a>
|
<a href="{{ URL::to('admin/accessories') }}">
|
||||||
@elseif (\App\Models\Setting::getSettings()->brand == '2')
|
<i class="fa fa-keyboard-o"></i>
|
||||||
<a class="logo navbar-brand no-hover" href="{{ config('app.url') }}">
|
</a>
|
||||||
<img class="navbar-brand-img" src="{{ config('app.url') }}/uploads/{{ \App\Models\Setting::getSettings()->logo }}">
|
</li>
|
||||||
</a>
|
<li {!! (Request::is('admin/consumables*') ? ' class="active"' : '') !!}>
|
||||||
@else
|
<a href="{{ URL::to('admin/consumables') }}">
|
||||||
<a class="logo no-hover" href="{{ config('app.url') }}">
|
<i class="fa fa-tint"></i>
|
||||||
{{ \App\Models\Setting::getSettings()->site_name }}
|
</a>
|
||||||
</a>
|
</li>
|
||||||
@endif
|
<li {!! (Request::is('admin/components*') ? ' class="active"' : '') !!}>
|
||||||
</div>
|
<a href="{{ URL::to('admin/components') }}">
|
||||||
</div>
|
<i class="fa fa-hdd-o"></i>
|
||||||
|
</a>
|
||||||
|
</li>
|
||||||
|
@endif
|
||||||
|
|
||||||
@if (Auth::user()->hasAccess('admin'))
|
<form class="navbar-form navbar-left form-horizontal" role="search" action="{{ route('findbytag/hardware') }}" method="get">
|
||||||
@if (!Request::is('/'))
|
<div class="col-xs-12 col-md-12">
|
||||||
<li {!! (Request::is('hardware*') ? ' class="active"' : '') !!}>
|
<div class="col-xs-12 form-group">
|
||||||
<a href="{{ URL::to('hardware') }}">
|
<label class="sr-only" for="tagSearch">{{ trans('general.lookup_by_tag') }}</label>
|
||||||
<i class="fa fa-barcode"></i>
|
<input type="text" class="form-control" id="tagSearch" name="assetTag" placeholder="{{ trans('general.lookup_by_tag') }}">
|
||||||
</a>
|
<input type="hidden" name="topsearch" value="true">
|
||||||
</li>
|
</div>
|
||||||
<li {!! (Request::is('admin/licenses*') ? ' class="active"' : '') !!}>
|
<div class="col-xs-1">
|
||||||
<a href="{{ URL::to('admin/licenses') }}">
|
<button type="submit" class="btn btn-primary pull-right"><i class="fa fa-search"></i></button>
|
||||||
<i class="fa fa-floppy-o"></i>
|
</div>
|
||||||
</a>
|
</div>
|
||||||
</li>
|
</form>
|
||||||
<li {!! (Request::is('admin/accessories*') ? ' class="active"' : '') !!}>
|
|
||||||
<a href="{{ URL::to('admin/accessories') }}">
|
|
||||||
<i class="fa fa-keyboard-o"></i>
|
|
||||||
</a>
|
|
||||||
</li>
|
|
||||||
<li {!! (Request::is('admin/consumables*') ? ' class="active"' : '') !!}>
|
|
||||||
<a href="{{ URL::to('admin/consumables') }}">
|
|
||||||
<i class="fa fa-tint"></i>
|
|
||||||
</a>
|
|
||||||
</li>
|
|
||||||
<li {!! (Request::is('admin/components*') ? ' class="active"' : '') !!}>
|
|
||||||
<a href="{{ URL::to('admin/components') }}">
|
|
||||||
<i class="fa fa-hdd-o"></i>
|
|
||||||
</a>
|
|
||||||
</li>
|
|
||||||
@endif
|
|
||||||
|
|
||||||
<form class="navbar-form navbar-left form-horizontal" role="search" action="{{ route('findbytag/hardware') }}" method="get">
|
<li class="dropdown">
|
||||||
<div class="col-xs-12 col-md-12">
|
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
|
||||||
<div class="col-xs-12 form-group">
|
@lang('general.create')
|
||||||
<label class="sr-only" for="tagSearch">{{ trans('general.lookup_by_tag') }}</label>
|
<b class="caret"></b>
|
||||||
<input type="text" class="form-control" id="tagSearch" name="assetTag" placeholder="{{ trans('general.lookup_by_tag') }}">
|
</a>
|
||||||
<input type="hidden" name="topsearch" value="true">
|
|
||||||
</div>
|
|
||||||
<div class="col-xs-1">
|
|
||||||
<button type="submit" class="btn btn-primary pull-right"><i class="fa fa-search"></i></button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</form>
|
|
||||||
|
|
||||||
<li class="dropdown">
|
|
||||||
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
|
|
||||||
@lang('general.create')
|
|
||||||
<b class="caret"></b>
|
|
||||||
</a>
|
|
||||||
<ul class="dropdown-menu">
|
<ul class="dropdown-menu">
|
||||||
<li {!! (Request::is('hardware/create') ? 'class="active>"' : '') !!}>
|
<li {!! (Request::is('hardware/create') ? 'class="active>"' : '') !!}>
|
||||||
<a href="{{ route('create/hardware') }}">
|
<a href="{{ route('create/hardware') }}">
|
||||||
|
|
@ -349,6 +348,13 @@
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
</nav>
|
</nav>
|
||||||
|
<!-- Sidebar toggle button-->
|
||||||
|
<li>
|
||||||
|
<a href="#" style="float:left" class="sidebar-toggle-mobile visible-xs btn" data-toggle="offcanvas" role="button">
|
||||||
|
<span class="sr-only">Toggle navigation</span>
|
||||||
|
<i class="fa fa-bars"></i>
|
||||||
|
</a>
|
||||||
|
</li>
|
||||||
</header>
|
</header>
|
||||||
<!-- Left side column. contains the logo and sidebar -->
|
<!-- Left side column. contains the logo and sidebar -->
|
||||||
<aside class="main-sidebar">
|
<aside class="main-sidebar">
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue