Skip to content

Commit

Permalink
Merge pull request #8162 from Godmartinz/godfreymartinez-ghi-font-siz…
Browse files Browse the repository at this point in the history
…e-of-qr_text

Fixed #8161 and #8114 - font-size for labels used static values in blade instead of using values from settings
  • Loading branch information
snipe authored Jun 23, 2020
2 parents af06e42 + b10076b commit de4934f
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions resources/views/hardware/labels.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,11 @@
width: 100%;
}
.qr_text {
width: 100%;
height: auto;
width: {{ $settings->labels_width }}in;
height: {{ $settings->labels_height }}in;
padding-top: {{$settings->labels_display_bgutter}}in;
font-family: arial, helvetica, sans-serif;
font-size: x-small;
font-size: {{$settings->labels_fontsize}};
padding-right: .01in;
overflow: hidden !important;
display: inline;
Expand Down

0 comments on commit de4934f

Please sign in to comment.