DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-01-11 22:07:29 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'develop' of github.com:snipe/snipe-it into develop

Browse source
This commit is contained in:
snipe 2017-11-08 17:01:50 -08:00
parent b36594f508 59c9c22a59
commit 5ce7882bf5
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
resources/views/dashboard.blade.php
View file

@ -178,7 +178,7 @@
</div> <!--/row-->
<div class="row">
<div class="col-md-6">
<div class="box box-default" style="min-height: 400px;">
<div class="box box-default">
<div class="box-header with-border">
<h3 class="box-title">{{ trans('general.assets') }} by Status</h3>
<div class="box-tools pull-right">
@ -187,7 +187,7 @@
</div>
</div>
<!-- /.box-header -->
<div class="box-body">
<div class="box-body" style="min-height: 400px;">
<div class="row">
<div class="col-md-12">
<div class="chart-responsive">

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

@ -513,7 +513,7 @@
@endcan
@can('backend.interact')
<li>
<li class="treeview">
<a href="#">
<i class="fa fa-gear"></i>
<span>{{ trans('general.settings') }}</span>