From 62199f62555c408e9cb306606a1733b16fe6c5ac Mon Sep 17 00:00:00 2001 From: Brady Wetherington Date: Fri, 7 May 2021 17:01:32 -0700 Subject: [PATCH] Manually re-add support for Label Logos in Labels (#9552) --- resources/views/hardware/labels.blade.php | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/resources/views/hardware/labels.blade.php b/resources/views/hardware/labels.blade.php index 52c06aad9a..beef718472 100644 --- a/resources/views/hardware/labels.blade.php +++ b/resources/views/hardware/labels.blade.php @@ -56,6 +56,13 @@ $qr_size = ($settings->alt_barcode_enabled=='1') && ($settings->alt_barcode!='') padding-top: .11in; width: 100%; } + div.label-logo { + float: right; + display: inline-block; + } + img.label-logo { + height: 0.5in; + } .qr_text { width: {{ $settings->labels_width }}in; height: {{ $settings->labels_height }}in; @@ -111,6 +118,11 @@ $qr_size = ($settings->alt_barcode_enabled=='1') && ($settings->alt_barcode!='') @endif
+ @if ($settings->label_logo) + + @endif @if ($settings->qr_text!='')
{{ $settings->qr_text }}