From c9d6857c735ef61689a26b6969fc1babeee98271 Mon Sep 17 00:00:00 2001
From: Drew Wilkinson <drew.t.wilkinson@gmail.com>
Date: Tue, 7 Jun 2016 12:39:53 -0400
Subject: [PATCH 1/2] Swap bgutter and sgutter as they seem to be reversed. I
 assume s=side=horizontal and b=bottom=vertical...

---
 resources/views/settings/edit.blade.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/views/settings/edit.blade.php b/resources/views/settings/edit.blade.php
index 91bc702e74..2f6dc85b88 100755
--- a/resources/views/settings/edit.blade.php
+++ b/resources/views/settings/edit.blade.php
@@ -470,19 +470,19 @@
                     </div>
                     <div class="col-md-3 form-group">
                       <div class="input-group">
-                        {{ Form::text('labels_display_bgutter', Input::old('labels_display_bgutter', $setting->labels_display_bgutter), array('class' => 'form-control')) }}
+                        {{ Form::text('labels_display_sgutter', Input::old('labels_display_sgutter', $setting->labels_display_sgutter), array('class' => 'form-control')) }}
                         <div class="input-group-addon">{{ trans('admin/settings/general.horizontal') }}</div>
                       </div>
                     </div>
                     <div class="col-md-3 form-group" style="margin-left: 10px">
                       <div class="input-group">
-                        {{ Form::text('labels_display_sgutter', Input::old('labels_display_sgutter', $setting->labels_display_sgutter), array('class' => 'form-control')) }}
+                        {{ Form::text('labels_display_bgutter', Input::old('labels_display_bgutter', $setting->labels_display_bgutter), array('class' => 'form-control')) }}
                         <div class="input-group-addon">{{ trans('admin/settings/general.vertical') }}</div>
                       </div>
                     </div>
                     <div class="col-md-9 col-md-offset-3">
-                      {!! $errors->first('labels_display_bgutter', '<span class="alert-msg">:message</span>') !!}
                       {!! $errors->first('labels_display_sgutter', '<span class="alert-msg">:message</span>') !!}
+                      {!! $errors->first('labels_display_bgutter', '<span class="alert-msg">:message</span>') !!}
                     </div>
                   </div>
 

From 7f22d3f4865522ab4fc3decfec57210f0f672f3f Mon Sep 17 00:00:00 2001
From: Drew Wilkinson <drew.t.wilkinson@gmail.com>
Date: Tue, 7 Jun 2016 13:03:21 -0400
Subject: [PATCH 2/2] Fix margin for bottom to not be equal to side gutter,
 looks like a typo

---
 resources/views/hardware/labels.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/hardware/labels.blade.php b/resources/views/hardware/labels.blade.php
index d810ae2887..de170a7684 100644
--- a/resources/views/hardware/labels.blade.php
+++ b/resources/views/hardware/labels.blade.php
@@ -9,7 +9,7 @@
 
   <?php
     $settings->labels_width = $settings->labels_width - $settings->labels_display_sgutter;
-    $settings->labels_height = $settings->labels_height - $settings->labels_display_sgutter;
+    $settings->labels_height = $settings->labels_height - $settings->labels_display_bgutter;
     $qr_size = ($settings->labels_height - .25);
     $qr_txt_size = $settings->labels_width - $qr_size - $settings->labels_display_sgutter - .1;
     ?>