DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-24 21:24:13 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

More mobile fixes

Browse source
This commit is contained in:
snipe 2016-05-24 18:50:54 -07:00
parent 5f91329397
commit 9aff515c0a
8 changed files with 81 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
public/assets/css/app.css
View file

@ -399,6 +399,21 @@ a:focus {
right: 40px;
}
}
@media (max-width: 991px) {
.content-header {
padding-top: 110px;
}
}
@media (max-width: 991px) {
ul.sidebar-menu {
padding-top: 120px;
}
}
@media (max-width: 991px) {
.sidebar-toggle-mobile a {
color: white;
}
}
/*
* Component: Sidebar
* ------------------
@ -4838,7 +4853,7 @@ fieldset[disabled] .btn-yahoo.active {
background-color: inherit;
}
.main-header .logo {
min-width: 530px;
min-width: 380px;
text-align: left;
display: block;
clear: both;

2
public/assets/css/app.css.map
View file

File diff suppressed because one or more lines are too long

17
public/build/assets/css/app-8ada858a3e.css → public/build/assets/css/app-21c49439ba.css
View file

@ -399,6 +399,21 @@ a:focus {
right: 40px;
}
}
@media (max-width: 991px) {
.content-header {
padding-top: 110px;
}
}
@media (max-width: 991px) {
ul.sidebar-menu {
padding-top: 120px;
}
}
@media (max-width: 991px) {
.sidebar-toggle-mobile a {
color: white;
}
}
/*
* Component: Sidebar
* ------------------
@ -4838,7 +4853,7 @@ fieldset[disabled] .btn-yahoo.active {
background-color: inherit;
}
.main-header .logo {
min-width: 530px;
min-width: 380px;
text-align: left;
display: block;
clear: both;

2
public/build/assets/css/app.css.map
View file

File diff suppressed because one or more lines are too long

2
public/build/rev-manifest.json
View file

@ -1,4 +1,4 @@
{
"assets/css/app.css": "assets/css/app-8ada858a3e.css",
"assets/css/app.css": "assets/css/app-21c49439ba.css",
"assets/js/all.js": "assets/js/all-edd914620a.js"
}

24
resources/assets/less/header.less
View file

@ -242,3 +242,27 @@
}
}
}
// Collapse header
@media (max-width: @screen-sm-max) {
.content-header {
padding-top: 110px;
}
}
// Collapse header
@media (max-width: @screen-sm-max) {
ul.sidebar-menu {
padding-top: 120px;
}
}
// Collapse header
@media (max-width: @screen-sm-max) {
.sidebar-toggle-mobile a {
color: white;
}
}

4
resources/assets/less/overrides.less
View file

@ -2,7 +2,7 @@
background-color: inherit;
}
.main-header .logo {
min-width: 530px;
min-width: 380px;
text-align: left;
display: block;
clear: both;
@ -280,3 +280,5 @@ a.accordion-header {
a.logo.no-hover a:hover {
background-color: transparent;
}

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

@ -87,22 +87,18 @@
</a>
<!-- 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">
<!-- Sidebar toggle button-->
<a href="#" style="color: white" class="sidebar-toggle-mobile visible-xs-inline-block btn btn-white" data-toggle="offcanvas" role="button">
<span class="sr-only">Toggle navigation</span>
<i class="fa fa-bars"></i>
</a>
@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') }}">
<img class="navbar-brand-img" src="{{ config('app.url') }}/uploads/{{ \App\Models\Setting::getSettings()->logo }}">
{{ \App\Models\Setting::getSettings()->site_name }}
@ -116,7 +112,9 @@
{{ \App\Models\Setting::getSettings()->site_name }}
</a>
@endif
</div>
</div>
@if (Auth::user()->hasAccess('admin'))
@ -148,13 +146,17 @@
</li>
@endif
<form class="navbar-form navbar-left form-inline" role="search" action="{{ route('findbytag/hardware') }}" method="get">
<div class="form-group">
<label class="sr-only" for="tagSearch">{{ trans('general.lookup_by_tag') }}</label>
<input type="text" class="form-control" id="tagSearch" name="assetTag" placeholder="{{ trans('general.lookup_by_tag') }}">
<input type="hidden" name="topsearch" value="true">
<form class="navbar-form navbar-left form-horizontal" role="search" action="{{ route('findbytag/hardware') }}" method="get">
<div class="col-xs-12 col-md-12">
<div class="col-xs-12 form-group">
<label class="sr-only" for="tagSearch">{{ trans('general.lookup_by_tag') }}</label>
<input type="text" class="form-control" id="tagSearch" name="assetTag" placeholder="{{ trans('general.lookup_by_tag') }}">
<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>
<button type="submit" class="btn btn-primary pull-right"><i class="fa fa-search"></i></button>
</form>
<li class="dropdown">