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

Backing out the ribbon - too finicky on mobile :(

Browse source 
Signed-off-by: snipe <snipe@snipe.net>
This commit is contained in:
snipe 2021-09-24 14:30:29 -07:00
parent e03d7b7016
commit a9b306f2d2
6 changed files with 17 additions and 96 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
public/css/build/app.css
View file

Binary file not shown.

BIN
public/css/build/overrides.css
View file

Binary file not shown.

BIN
public/css/dist/all.css vendored
View file

Binary file not shown.

6
public/mix-manifest.json
View file

@ -1,8 +1,8 @@
{
"/js/build/app.js": "/js/build/app.js?id=2041f181f1136a9a18d8",
"/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=cf32592ae76e1134312c",
"/css/build/overrides.css": "/css/build/overrides.css?id=e450097d74701643c241",
"/css/build/app.css": "/css/build/app.css?id=f97816f469b4cc535af4",
"/css/build/overrides.css": "/css/build/overrides.css?id=bd465539322247cb6adb",
"/css/build/app.css": "/css/build/app.css?id=ec40a32815dbea12aee8",
"/css/build/AdminLTE.css": "/css/build/AdminLTE.css?id=65ca7a34198fa16ba846",
"/css/dist/skins/skin-orange.css": "/css/dist/skins/skin-orange.css?id=b25c92dab95a46c8573a",
"/css/dist/skins/skin-orange-dark.css": "/css/dist/skins/skin-orange-dark.css?id=da8f1b5753826de00425",
@ -18,7 +18,7 @@
"/css/dist/skins/skin-green.css": "/css/dist/skins/skin-green.css?id=39defadc0705db43a793",
"/css/dist/skins/skin-contrast.css": "/css/dist/skins/skin-contrast.css?id=3f9f3427eccdf82db31e",
"/css/dist/skins/skin-red.css": "/css/dist/skins/skin-red.css?id=f9015c9b4554c6bfa4fe",
"/css/dist/all.css": "/css/dist/all.css?id=f848fecd03425889e9cb",
"/css/dist/all.css": "/css/dist/all.css?id=8d84226d8c7eb44fa35c",
"/css/blue.png": "/css/blue.png?id=e83a6c29e04fe851f212",
"/css/blue@2x.png": "/css/blue@2x.png?id=51135dd4d24f88f5de0b",
"/css/dist/signature-pad.css": "/css/dist/signature-pad.css?id=6a89d3cd901305e66ced",

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

@ -488,7 +488,7 @@ h4 {
}
.row-new-striped > .row:nth-of-type(odd) {
background-color: #f9f9f9;
background-color: #F8F8F8;
border-top: 1px solid #dddddd;
display: table-row;
@ -496,88 +496,19 @@ h4 {
.row-new-striped div {
display: table-cell;
border-top: 1px solid #dddddd;
}
.row-new-striped div {
display: table-cell;
border-top: 1px solid #dddddd;
}
/**
* Ribbon stuff
* https://codepen.io/devinsays/pen/PwEbmR
**/
.product {
width: 100%;
min-width: 100%;
.row-new-striped div[class^="col"]:first-child {
font-weight: bold;
}
.product-image {
position: relative;
min-height: 250px;
min-width: 4;
}
.onsale-section {
position: absolute;
top: -6px;
right: 15px;
}
.onsale-section:after {
position: absolute;
content: '';
display: block;
width: 0;
height: 0;
border-left: 50px solid transparent;
border-right: 50px solid transparent;
//border-top: 6px solid #6ec5d5;
}
.onsale {
position: relative;
display: inline-block;
text-align: center;
color: #fff;
font-size: 12px;
line-height: 1;
padding: 12px 8px 6px;
border-top-right-radius: 8px;
width: 100px;
text-transform: uppercase
}
.onsale:before,
.onsale:after {
position: absolute;
content: '';
display: block;
}
.onsale:before {
height: 7px;
width: 6px;
left: -6px;
top: 0;
}
.onsale:after {
background: #96a0a2;
height: 7px;
width: 8px;
border-radius: 8px 8px 0 0;
left: -8px;
top: 0;
}
.product img {
display: block;
}
/**

24
resources/views/users/view.blade.php
View file

@ -90,7 +90,7 @@
<li>
<a href="#managed" data-toggle="tab">
<span class="hidden-lg hidden-md">
<i class="fa fa-map-marker fa-2x"></i></span>
<i class="fas fa-map-marker-alt fa-2x"></i></span>
<span class="hidden-xs hidden-sm">{{ trans('admin/users/table.managed_locations') }}
{!! ($user->managedLocations->count() > 0 ) ? '<badge class="badge badge-secondary">'.$user->managedLocations->count().'</badge>' : '' !!}
</a>
@ -146,25 +146,15 @@
<div class="col-md-12 text-center">
<div class="product">
<div class="product-image">
<img src="{{ $user->present()->gravatar() }}" class="img-thumbnail hidden-print" style="margin-bottom: 20px;" alt="{{ $user->present()->fullName() }}">
<span class="onsale-section{{ ($user->isSuperUser()) ? ' danger' : ' warning'}}">
<span class="onsale{{ ($user->isSuperUser()) ? ' danger' : ' warning'}}">
<i class="fas fa-crown" title="superuser"></i>
@if ($user->isSuperUser())
superadmin
@elseif ($user->hasAccess('admin'))
admin
@if (($user->isSuperUser()) || ($user->hasAccess('admin')))
<i class="fas fa-crown fa-2x {{ ($user->isSuperUser()) ? 'text-danger' : ' text-orange'}}"></i>
<div class="{{ ($user->isSuperUser()) ? 'text-danger' : ' text-orange'}}" style="font-weight: bold">{{ ($user->isSuperUser()) ? 'superadmin' : 'admin'}}</div>
@endif
</span>
</span>
</div>
</div>
<div class="col-md-12 text-center">
<img src="{{ $user->present()->gravatar() }}" class=" img-thumbnail hidden-print" style="margin-bottom: 20px;" alt="{{ $user->present()->fullName() }}">
</div>