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

Some responsive fixes

Browse source 
Still needs work tho :(
This commit is contained in:
snipe 2016-05-24 17:59:02 -07:00
parent 37be587c39
commit 5f91329397
9 changed files with 95 additions and 259 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2029,102 +2029,6 @@ a:focus {
.progress-description { .progress-description {
margin: 0; margin: 0;
} }
/*
* Component: Timeline
* -------------------
*/
.timeline {
position: relative;
margin: 0 0 30px 0;
padding: 0;
list-style: none;
}
.timeline:before {
content: '';
position: absolute;
top: 0;
bottom: 0;
width: 4px;
background: #ddd;
left: 31px;
margin: 0;
border-radius: 2px;
}
.timeline > li {
position: relative;
margin-right: 10px;
margin-bottom: 15px;
}
.timeline > li:before,
.timeline > li:after {
content: " ";
display: table;
}
.timeline > li:after {
clear: both;
}
.timeline > li > .timeline-item {
box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1);
border-radius: 3px;
margin-top: 0;
background: #fff;
color: #444;
margin-left: 60px;
margin-right: 15px;
padding: 0;
position: relative;
}
.timeline > li > .timeline-item > .time {
color: #999;
float: right;
padding: 10px;
font-size: 12px;
}
.timeline > li > .timeline-item > .timeline-header {
margin: 0;
color: #555;
border-bottom: 1px solid #f4f4f4;
padding: 10px;
font-size: 16px;
line-height: 1.1;
}
.timeline > li > .timeline-item > .timeline-header > a {
font-weight: 600;
}
.timeline > li > .timeline-item > .timeline-body,
.timeline > li > .timeline-item > .timeline-footer {
padding: 10px;
}
.timeline > li > .fa,
.timeline > li > .glyphicon,
.timeline > li > .ion {
width: 30px;
height: 30px;
font-size: 15px;
line-height: 30px;
position: absolute;
color: #666;
background: #d2d6de;
border-radius: 50%;
text-align: center;
left: 18px;
top: 0;
}
.timeline > .time-label > span {
font-weight: 600;
padding: 5px;
display: inline-block;
background-color: #fff;
border-radius: 4px;
}
.timeline-inverse > li > .timeline-item {
background: #f0f0f0;
border: 1px solid #ddd;
box-shadow: none;
}
.timeline-inverse > li > .timeline-item > .timeline-header {
border-bottom-color: #ddd;
}
/* /*
* Component: Button * Component: Button
* ----------------- * -----------------
@ -4793,14 +4697,6 @@ fieldset[disabled] .btn-yahoo.active {
background: #367fa9; background: #367fa9;
} }
} }
.skin-blue .main-header .logo {
background-color: #367fa9;
color: #fff;
border-bottom: 0 solid transparent;
}
.skin-blue .main-header .logo:hover {
background-color: #357ca5;
}
.skin-blue .main-header li.user-header { .skin-blue .main-header li.user-header {
background-color: #3c8dbc; background-color: #3c8dbc;
} }
@ -4881,13 +4777,8 @@ fieldset[disabled] .btn-yahoo.active {
border-bottom-right-radius: 2px; border-bottom-right-radius: 2px;
border-bottom-left-radius: 0; border-bottom-left-radius: 0;
} }
.skin-blue.layout-top-nav .main-header > .logo { .skin-blue.layout-top-nav .main-header > .logo .logo-variant {
background-color: #3c8dbc; background-color: none;
color: #fff;
border-bottom: 0 solid transparent;
}
.skin-blue.layout-top-nav .main-header > .logo:hover {
background-color: #3b8ab8;
} }
/*! /*!
@ -4947,8 +4838,10 @@ fieldset[disabled] .btn-yahoo.active {
background-color: inherit; background-color: inherit;
} }
.main-header .logo { .main-header .logo {
min-width: 430px; min-width: 530px;
text-align: left; text-align: left;
display: block;
clear: both;
} }
.huge { .huge {
font-size: 40px; font-size: 40px;
@ -5235,6 +5128,20 @@ a.accordion-header {
pointer-events: none; pointer-events: none;
} }
/*END Form Wizard*/ /*END Form Wizard*/
.left-navblock {
display: inline-block;
float: left;
text-align: left;
color: white;
padding: 0px;
/* adjust based on your layout */
}
.skin-blue .main-header .navbar .dropdown-menu li a {
color: #333;
}
a.logo.no-hover a:hover {
background-color: transparent;
}
/* WRENCHING */ /* WRENCHING */
@-webkit-keyframes wrench { @-webkit-keyframes wrench {

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

File diff suppressed because one or more lines are too long

131
public/build/assets/css/app-060dd24c8f.css → public/build/assets/css/app-8ada858a3e.css
View file

@ -2029,102 +2029,6 @@ a:focus {
.progress-description { .progress-description {
margin: 0; margin: 0;
} }
/*
* Component: Timeline
* -------------------
*/
.timeline {
position: relative;
margin: 0 0 30px 0;
padding: 0;
list-style: none;
}
.timeline:before {
content: '';
position: absolute;
top: 0;
bottom: 0;
width: 4px;
background: #ddd;
left: 31px;
margin: 0;
border-radius: 2px;
}
.timeline > li {
position: relative;
margin-right: 10px;
margin-bottom: 15px;
}
.timeline > li:before,
.timeline > li:after {
content: " ";
display: table;
}
.timeline > li:after {
clear: both;
}
.timeline > li > .timeline-item {
box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1);
border-radius: 3px;
margin-top: 0;
background: #fff;
color: #444;
margin-left: 60px;
margin-right: 15px;
padding: 0;
position: relative;
}
.timeline > li > .timeline-item > .time {
color: #999;
float: right;
padding: 10px;
font-size: 12px;
}
.timeline > li > .timeline-item > .timeline-header {
margin: 0;
color: #555;
border-bottom: 1px solid #f4f4f4;
padding: 10px;
font-size: 16px;
line-height: 1.1;
}
.timeline > li > .timeline-item > .timeline-header > a {
font-weight: 600;
}
.timeline > li > .timeline-item > .timeline-body,
.timeline > li > .timeline-item > .timeline-footer {
padding: 10px;
}
.timeline > li > .fa,
.timeline > li > .glyphicon,
.timeline > li > .ion {
width: 30px;
height: 30px;
font-size: 15px;
line-height: 30px;
position: absolute;
color: #666;
background: #d2d6de;
border-radius: 50%;
text-align: center;
left: 18px;
top: 0;
}
.timeline > .time-label > span {
font-weight: 600;
padding: 5px;
display: inline-block;
background-color: #fff;
border-radius: 4px;
}
.timeline-inverse > li > .timeline-item {
background: #f0f0f0;
border: 1px solid #ddd;
box-shadow: none;
}
.timeline-inverse > li > .timeline-item > .timeline-header {
border-bottom-color: #ddd;
}
/* /*
* Component: Button * Component: Button
* ----------------- * -----------------
@ -4793,14 +4697,6 @@ fieldset[disabled] .btn-yahoo.active {
background: #367fa9; background: #367fa9;
} }
} }
.skin-blue .main-header .logo {
background-color: #367fa9;
color: #fff;
border-bottom: 0 solid transparent;
}
.skin-blue .main-header .logo:hover {
background-color: #357ca5;
}
.skin-blue .main-header li.user-header { .skin-blue .main-header li.user-header {
background-color: #3c8dbc; background-color: #3c8dbc;
} }
@ -4881,13 +4777,8 @@ fieldset[disabled] .btn-yahoo.active {
border-bottom-right-radius: 2px; border-bottom-right-radius: 2px;
border-bottom-left-radius: 0; border-bottom-left-radius: 0;
} }
.skin-blue.layout-top-nav .main-header > .logo { .skin-blue.layout-top-nav .main-header > .logo .logo-variant {
background-color: #3c8dbc; background-color: none;
color: #fff;
border-bottom: 0 solid transparent;
}
.skin-blue.layout-top-nav .main-header > .logo:hover {
background-color: #3b8ab8;
} }
/*! /*!
@ -4947,8 +4838,10 @@ fieldset[disabled] .btn-yahoo.active {
background-color: inherit; background-color: inherit;
} }
.main-header .logo { .main-header .logo {
min-width: 430px; min-width: 530px;
text-align: left; text-align: left;
display: block;
clear: both;
} }
.huge { .huge {
font-size: 40px; font-size: 40px;
@ -5235,6 +5128,20 @@ a.accordion-header {
pointer-events: none; pointer-events: none;
} }
/*END Form Wizard*/ /*END Form Wizard*/
.left-navblock {
display: inline-block;
float: left;
text-align: left;
color: white;
padding: 0px;
/* adjust based on your layout */
}
.skin-blue .main-header .navbar .dropdown-menu li a {
color: #333;
}
a.logo.no-hover a:hover {
background-color: transparent;
}
/* WRENCHING */ /* WRENCHING */
@-webkit-keyframes wrench { @-webkit-keyframes wrench {

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-060dd24c8f.css", "assets/css/app.css": "assets/css/app-8ada858a3e.css",
"assets/js/all.js": "assets/js/all-edd914620a.js" "assets/js/all.js": "assets/js/all-edd914620a.js"
} }

1
resources/assets/less/AdminLTE.less
View file

@ -33,7 +33,6 @@
@import "small-box.less"; @import "small-box.less";
@import "boxes.less"; @import "boxes.less";
@import "info-box.less"; @import "info-box.less";
@import "timeline.less";
@import "buttons.less"; @import "buttons.less";
@import "callout.less"; @import "callout.less";
@import "alerts.less"; @import "alerts.less";

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

@ -2,8 +2,11 @@
background-color: inherit; background-color: inherit;
} }
.main-header .logo { .main-header .logo {
min-width: 430px; min-width: 530px;
text-align: left; text-align: left;
display: block;
clear: both;
//text-overflow: hidden;
} }
.huge { .huge {
font-size: 40px; font-size: 40px;
@ -260,3 +263,20 @@ a.accordion-header {
.bs-wizard > .bs-wizard-step:last-child > .progress {width: 50%;} .bs-wizard > .bs-wizard-step:last-child > .progress {width: 50%;}
.bs-wizard > .bs-wizard-step.disabled a.bs-wizard-dot{ pointer-events: none; } .bs-wizard > .bs-wizard-step.disabled a.bs-wizard-dot{ pointer-events: none; }
/*END Form Wizard*/ /*END Form Wizard*/
.left-navblock{
display: inline-block;
float: left;
text-align: left;
color: white;
padding: 0px;
/* adjust based on your layout */
}
.skin-blue .main-header .navbar .dropdown-menu li a {
color: #333;
}
a.logo.no-hover a:hover {
background-color: transparent;
}

7
resources/assets/less/skins/skin-blue.less
View file

@ -35,9 +35,6 @@
} }
} }
//Logo //Logo
.logo {
.logo-variant(darken(@light-blue, 5%));
}
li.user-header { li.user-header {
background-color: @light-blue; background-color: @light-blue;
@ -54,5 +51,7 @@
} }
.skin-blue.layout-top-nav .main-header > .logo { .skin-blue.layout-top-nav .main-header > .logo {
.logo-variant(@light-blue); .logo-variant {
background-color: none;
}
} }

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

@ -64,8 +64,6 @@
}; };
</script> </script>
<!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries --> <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!-- WARNING: Respond.js doesn't work if you view the page via file:// --> <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
<!--[if lt IE 9]> <!--[if lt IE 9]>
@ -83,39 +81,43 @@
<!-- Header Navbar: style can be found in header.less --> <!-- Header Navbar: style can be found in header.less -->
<nav class="navbar navbar-static-top" role="navigation"> <nav class="navbar navbar-static-top" role="navigation">
<!-- Sidebar toggle button--> <!-- Sidebar toggle button above the compact sidenav -->
<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>
@if (\App\Models\Setting::getSettings()->brand == '3')
<a class="logo navbar-brand" 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" href="{{ config('app.url') }}">
<img class="navbar-brand-img" src="{{ config('app.url') }}/uploads/{{ \App\Models\Setting::getSettings()->logo }}">
</a>
@else
<a class="logo" href="{{ config('app.url') }}">
{{ \App\Models\Setting::getSettings()->site_name }}
</a>
@endif
<!-- 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>
<!-- 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">
<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')
<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>
</div>
@if (Auth::user()->hasAccess('admin')) @if (Auth::user()->hasAccess('admin'))
@if (!Request::is('/')) @if (!Request::is('/'))
@ -146,12 +148,13 @@
</li> </li>
@endif @endif
<form class="navbar-form navbar-left" role="search" action="{{ route('findbytag/hardware') }}" method="get"> <form class="navbar-form navbar-left form-inline" role="search" action="{{ route('findbytag/hardware') }}" method="get">
<div class="form-group"> <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="text" class="form-control" id="tagSearch" name="assetTag" placeholder="{{ trans('general.lookup_by_tag') }}">
<input type="hidden" name="topsearch" value="true"> <input type="hidden" name="topsearch" value="true">
</div> </div>
<button type="submit" class="btn btn-primary"><i class="fa fa-search"></i></button> <button type="submit" class="btn btn-primary pull-right"><i class="fa fa-search"></i></button>
</form> </form>
<li class="dropdown"> <li class="dropdown">
@ -352,6 +355,7 @@
</ul> </ul>
</div> </div>
</nav> </nav>
</header> </header>
<!-- Left side column. contains the logo and sidebar --> <!-- Left side column. contains the logo and sidebar -->