From 3e111fca6e169048e58a5e1aeef29d8b1472d881 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Wed, 15 Feb 2023 17:13:40 -0800
Subject: [PATCH 1/4] Cleanup some small UI bugaboos (padding, etc)

Signed-off-by: snipe <snipe@snipe.net>
---
 resources/views/layouts/edit-form.blade.php    | 18 ++++++++++--------
 .../views/partials/forms/edit/submit.blade.php |  4 ++--
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/resources/views/layouts/edit-form.blade.php b/resources/views/layouts/edit-form.blade.php
index cb1793103..a4dcabb4b 100644
--- a/resources/views/layouts/edit-form.blade.php
+++ b/resources/views/layouts/edit-form.blade.php
@@ -31,35 +31,36 @@
         <!-- box -->
         <div class="box box-default">
             <!-- box-header -->
-            <div class="box-header with-border text-right">
+            <div class="box-header with-border">
 
-                <div class="col-md-12 box-title text-right" style="padding: 0px; margin: 0px;">
+                @if ((isset($topSubmit) && ($topSubmit=='true')) || (isset($item->id)))
 
-                    <div class="col-md-12" style="padding: 0px; margin: 0px;">
+                <div class="col-md-12 box-title text-right">
+                    <div class="col-md-12">
                         <div class="col-md-9 text-left">
                             @if ($item->id)
                                 <h2 class="box-title text-left" style="padding-top: 8px;">
                                     {{ $item->display_name }}
-                                </h2>
+                                </h2> ;
                             @endif
                         </div>
+                        @if (isset($topSubmit) && ($topSubmit=='true'))
                         <div class="col-md-3 text-right" style="padding-right: 10px;">
-                            <a class="btn btn-link text-left" href="{{ URL::previous() }}">
-                                {{ trans('button.cancel') }}
-                            </a>
                             <button type="submit" class="btn btn-primary">
                                 <i class="fas fa-check icon-white" aria-hidden="true"></i>
                                 {{ trans('general.save') }}
                             </button>
                         </div>
+                        @endif
                     </div>
                 </div>
-
             </div><!-- /.box-header -->
+            @endif
 
             <!-- box-body -->
             <div class="box-body">
 
+                <div style="padding-top: 30px;">
                     @if ($item->id)
                     {{ method_field('PUT') }}
                     @endif
@@ -68,6 +69,7 @@
                     {{ csrf_field() }}
                     @yield('inputFields')
                     @include('partials.forms.edit.submit')
+                </div>
 
             </div> <!-- ./box-body -->
         </div> <!-- box -->
diff --git a/resources/views/partials/forms/edit/submit.blade.php b/resources/views/partials/forms/edit/submit.blade.php
index 54f17e854..4c87c7bb2 100644
--- a/resources/views/partials/forms/edit/submit.blade.php
+++ b/resources/views/partials/forms/edit/submit.blade.php
@@ -1,7 +1,7 @@
 <!-- partials/forms/edit/submit.blade.php -->
 
-<div class="box-footer text-right">
-    <a class="btn btn-link text-left" href="{{ URL::previous() }}">{{ trans('button.cancel') }}</a>
+<div class="box-footer text-right" style="padding-bottom: 0px;">
+    <a class="btn btn-link pull-left" href="{{ URL::previous() }}">{{ trans('button.cancel') }}</a>
     <button type="submit" accesskey="s" class="btn btn-primary"><i class="fas fa-check icon-white" aria-hidden="true"></i> {{ trans('general.save') }}</button>
 </div>
 <!-- / partials/forms/edit/submit.blade.php -->

From e451ca1a5ccf80c4f9a127d8fde5fe93f5afa2d5 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Wed, 15 Feb 2023 17:37:53 -0800
Subject: [PATCH 2/4] Stray semicolon

Signed-off-by: snipe <snipe@snipe.net>
---
 resources/views/layouts/edit-form.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/layouts/edit-form.blade.php b/resources/views/layouts/edit-form.blade.php
index a4dcabb4b..c4a7303c8 100644
--- a/resources/views/layouts/edit-form.blade.php
+++ b/resources/views/layouts/edit-form.blade.php
@@ -41,7 +41,7 @@
                             @if ($item->id)
                                 <h2 class="box-title text-left" style="padding-top: 8px;">
                                     {{ $item->display_name }}
-                                </h2> ;
+                                </h2>
                             @endif
                         </div>
                         @if (isset($topSubmit) && ($topSubmit=='true'))

From f124249e1c9bf056cee7dcc0786e18d876dd077d Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Wed, 15 Feb 2023 18:08:11 -0800
Subject: [PATCH 3/4] More padding twiddles

Signed-off-by: snipe <snipe@snipe.net>
---
 resources/views/layouts/edit-form.blade.php | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/resources/views/layouts/edit-form.blade.php b/resources/views/layouts/edit-form.blade.php
index c4a7303c8..d6cf292ab 100644
--- a/resources/views/layouts/edit-form.blade.php
+++ b/resources/views/layouts/edit-form.blade.php
@@ -35,24 +35,22 @@
 
                 @if ((isset($topSubmit) && ($topSubmit=='true')) || (isset($item->id)))
 
-                <div class="col-md-12 box-title text-right">
-                    <div class="col-md-12">
+                <div class="col-md-12 box-title text-right" style="padding: 0px; margin: 0px;">
                         <div class="col-md-9 text-left">
                             @if ($item->id)
-                                <h2 class="box-title text-left" style="padding-top: 8px;">
+                                <h2 class="box-title" style="padding-top: 8px; padding-bottom: 7px;">
                                     {{ $item->display_name }}
                                 </h2>
                             @endif
                         </div>
                         @if (isset($topSubmit) && ($topSubmit=='true'))
-                        <div class="col-md-3 text-right" style="padding-right: 10px;">
-                            <button type="submit" class="btn btn-primary">
+                        <div class="col-md-3 text-right" style="padding-right: 0px;">
+                            <button type="submit" class="btn btn-primary pull-right">
                                 <i class="fas fa-check icon-white" aria-hidden="true"></i>
                                 {{ trans('general.save') }}
                             </button>
                         </div>
                         @endif
-                    </div>
                 </div>
             </div><!-- /.box-header -->
             @endif

From 71334b5eae3b5f418e708e009de5ac45f8d45d16 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Wed, 15 Feb 2023 18:13:38 -0800
Subject: [PATCH 4/4] More tweaking for top button alignment

Signed-off-by: snipe <snipe@snipe.net>
---
 resources/views/layouts/edit-form.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/layouts/edit-form.blade.php b/resources/views/layouts/edit-form.blade.php
index d6cf292ab..791590141 100644
--- a/resources/views/layouts/edit-form.blade.php
+++ b/resources/views/layouts/edit-form.blade.php
@@ -44,7 +44,7 @@
                             @endif
                         </div>
                         @if (isset($topSubmit) && ($topSubmit=='true'))
-                        <div class="col-md-3 text-right" style="padding-right: 0px;">
+                        <div class="col-md-3 text-right" style="padding-right: 10px;">
                             <button type="submit" class="btn btn-primary pull-right">
                                 <i class="fas fa-check icon-white" aria-hidden="true"></i>
                                 {{ trans('general.save') }}