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

Merge remote-tracking branch 'origin/develop'

Browse source
This commit is contained in:
snipe 2022-12-08 14:37:35 -08:00
parent 743264fd0e 9b3df40ed6
commit 163b3f6c0b
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app.json
View file

@ -148,7 +148,7 @@
"image": "heroku/php", "image": "heroku/php",
"addons": [ "addons": [
"cleardb:ignite", "cleardb:ignite",
"heroku-redis:hobby-dev", "heroku-redis:mini",
"papertrail:choklad" "papertrail:choklad"
] ]
} }

3
resources/views/hardware/labels.blade.php
View file

@ -52,8 +52,7 @@ $qr_size = ($settings->alt_barcode_enabled=='1') && ($settings->alt_barcode!='')
} }
img.barcode { img.barcode {
display:block; display:block;
margin-top:-7px;
padding-top: .11in;
width: 100%; width: 100%;
} }
div.label-logo { div.label-logo {