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

Merge pull request #8162 from Godmartinz/godfreymartinez-ghi-font-size-of-qr_text

Browse source 
Fixed #8161 and #8114 - font-size for labels used static values in blade instead of using values from settings
This commit is contained in:
snipe 2020-06-22 17:28:38 -07:00 committed by GitHub
parent af06e42056 b10076b015
commit de4934f21d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -57,11 +57,11 @@ $qr_size = ($settings->alt_barcode_enabled=='1') && ($settings->alt_barcode!='')
width: 100%; width: 100%;
} }
.qr_text { .qr_text {
width: 100%; width: {{ $settings->labels_width }}in;
height: auto; height: {{ $settings->labels_height }}in;
padding-top: {{$settings->labels_display_bgutter}}in; padding-top: {{$settings->labels_display_bgutter}}in;
font-family: arial, helvetica, sans-serif; font-family: arial, helvetica, sans-serif;
font-size: x-small; font-size: {{$settings->labels_fontsize}};
padding-right: .01in; padding-right: .01in;
overflow: hidden !important; overflow: hidden !important;
display: inline; display: inline;