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

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

Browse source
This commit is contained in:
Daniel Meltzer 2016-05-31 21:19:32 -05:00
parent 2ff1ee4d33
commit 5d206f2c20
1 changed files with 80 additions and 74 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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,19 +91,8 @@
<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">
<!-- Navbar Right Menu -->
<div class="navbar-custom-menu">
<ul class="nav navbar-nav">
<!-- Sidebar toggle button-->
<li>
<a href="#" style="color: white; float: right;" class="sidebar-toggle-mobile visible-xs btn btn-white pull-right" data-toggle="offcanvas" role="button">
<span class="sr-only">Toggle navigation</span>
<i class="fa fa-bars"></i>
</a>
</li>
<div class="left-navblock">
<div class="pull-left"> <div class="pull-left">
@if (\App\Models\Setting::getSettings()->brand == '3') @if (\App\Models\Setting::getSettings()->brand == '3')
<a class="logo navbar-brand no-hover" href="{{ config('app.url') }}"> <a class="logo navbar-brand no-hover" href="{{ config('app.url') }}">
@ -114,8 +109,12 @@
</a> </a>
@endif @endif
</div> </div>
</div> </li>
</ul>
<!-- Navbar Right Menu -->
<div class="navbar-custom-menu">
<ul class="nav navbar-nav">
@if (Auth::user()->hasAccess('admin')) @if (Auth::user()->hasAccess('admin'))
@if (!Request::is('/')) @if (!Request::is('/'))
<li {!! (Request::is('hardware*') ? ' class="active"' : '') !!}> <li {!! (Request::is('hardware*') ? ' class="active"' : '') !!}>
@ -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">