From 686130b424b22273b4ea50b909eaf2567f462d50 Mon Sep 17 00:00:00 2001
From: Skylar Ittner <skylar@netsyms.com>
Date: Fri, 2 Jul 2021 00:38:28 -0600
Subject: [PATCH] UX++

---
 css/main.css | 12 +++++++-----
 index.html   | 50 +++++++++++++++++++++-----------------------------
 js/pdf.js    |  2 +-
 3 files changed, 29 insertions(+), 35 deletions(-)

diff --git a/css/main.css b/css/main.css
index 9aeb356..aaf44c8 100644
--- a/css/main.css
+++ b/css/main.css
@@ -12,13 +12,15 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/.
 html, body {
     height: 100%;
     width: 100%;
+    margin: 0;
+    padding: 0;
 }
 
 #page-canvas-container {
-    height: 90vh;
-    max-height: 90vh;
-    max-width: 80vw;
-    overflow: scroll;
+    height: 85vh;
+    max-height: 85vh;
+    max-width: 100vw;
+    overflow: auto;
 }
 
 #page-canvas-container .page-canvas {
@@ -39,7 +41,7 @@ html, body {
     opacity: 0.5;
     position: absolute;
     float: left;
-    margin-top: -40px;
+    /* margin-top: -40px; */
     padding: 0;
 }
 
diff --git a/index.html b/index.html
index 8381d27..dc4c093 100644
--- a/index.html
+++ b/index.html
@@ -13,7 +13,7 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/.
 <link rel="stylesheet" href="css/main.css" />
 
 <div class="modal fade" id="settingsModal" tabindex="-1" aria-labelledby="settingsModalLabel" aria-hidden="true">
-    <div class="modal-dialog modal-lg">
+    <div class="modal-dialog modal-xl">
         <div class="modal-content">
             <div class="modal-header">
                 <h5 class="modal-title" id="settingsModalLabel">Settings</h5>
@@ -82,7 +82,7 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/.
             </div>
             <div class="modal-body">
                 <div class="btn btn-warning d-inline-block" onclick="resizeSignaturePadCanvas();signaturePad.clear();"><i class="fas fa-eraser"></i> Erase</div>
-                <div class="btn btn-primary d-inline-block" onclick="signaturePadUndo();"><i class="fas fa-undo"></i> Undo</div>
+                <div class="btn btn-primary" onclick="signaturePadUndo();"><i class="fas fa-undo"></i> Undo</div>
             </div>
             <div class="modal-body">
                 <div class="signature-wrapper">
@@ -98,44 +98,36 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/.
     </div>
 </div>
 
-
-<ul class="nav nav-pills">
-    <li class="nav-item">
-        <a class="nav-link" href="#" onclick="addPDF()"><i class="fas fa-file-pdf"></i> Add PDF</a>
-    </li>
-    <li class="nav-item">
-        <a class="nav-link" href="#" onclick="savePDF()"><i class="fas fa-save"></i> Save Signed PDF</a>
-    </li>
-    <li class="nav-item">
-        <a class="nav-link" href="#" onclick="openSettingsModal()"><i class="fas fa-cog"></i> Settings</a>
-    </li>
-</ul>
 <div class="card">
     <div class="card-body">
         <div class="btn-toolbar" role="toolbar">
-            <div class="btn-group me-2" role="group" aria-label="First group">
-                <div class="btn btn-primary d-inline-block" onclick="pdfZoom('fitheight');"><i class="fas fa-arrows-alt-v"></i> Fit Height</div>
-                <div class="btn btn-primary d-inline-block" onclick="pdfZoom('fitwidth');"><i class="fas fa-arrows-alt-h"></i> Fit Width</div>
-                <div class="btn btn-primary d-inline-block" onclick="pdfZoom('out');"><i class="fas fa-search-minus"></i> Zoom Out</div>
-                <div class="btn btn-primary d-inline-block" onclick="pdfZoom('in');"><i class="fas fa-search-plus"></i> Zoom In</div>
+            <div class="btn-group me-2 mb-2" role="group" aria-label="First group">
+                <div class="btn btn-primary" onclick="addPDF();"><i class="fas fa-file-pdf"></i> Add PDF</div>
+                <div class="btn btn-primary" onclick="savePDF();"><i class="fas fa-save"></i> Save Signed PDF</div>
+                <div class="btn btn-primary" onclick="openSettingsModal();"><i class="fas fa-cog"></i> Settings</div>
             </div>
-            <div class="btn-group me-2" role="group" aria-label="Second group">
-                <div class="btn btn-primary d-inline-block ms-4" onclick="activateStampDrawTool()"><i class="fas fa-stamp"></i> Stamp/Seal</div>
-                <div class="btn btn-primary d-inline-block" onclick="activateClientSignaturePad()"><i class="fas fa-file-signature"></i> Sign (Client)</div>
-                <div class="btn btn-primary d-inline-block" onclick="activateNotarySignatureTool()"><i class="fas fa-signature"></i> Sign (Notary)</div>
-                <div class="btn btn-primary d-inline-block" onclick="disableGuideBox()">Cancel</div>
+        </div>
+        <div class="btn-toolbar" role="toolbar">
+            <div class="btn-group me-2 mb-2" role="group" aria-label="First group">
+                <div class="btn btn-primary" onclick="pdfZoom('fitheight');"><i class="fas fa-arrows-alt-v"></i> Fit Height</div>
+                <div class="btn btn-primary" onclick="pdfZoom('fitwidth');"><i class="fas fa-arrows-alt-h"></i> Fit Width</div>
+                <div class="btn btn-primary" onclick="pdfZoom('out');"><i class="fas fa-search-minus"></i> Zoom Out</div>
+                <div class="btn btn-primary" onclick="pdfZoom('in');"><i class="fas fa-search-plus"></i> Zoom In</div>
             </div>
-            <div class="btn-group" role="group" aria-label="Third group">
-                <div class="btn btn-primary d-inline-block ms-4" onclick="addPage()"><i class="fas fa-plus"></i> Append Blank Page</div>
+            <div class="btn-group me-2 mb-2" role="group" aria-label="Second group">
+                <div class="btn btn-primary" onclick="activateStampDrawTool()"><i class="fas fa-stamp"></i> Stamp/Seal</div>
+                <div class="btn btn-primary" onclick="activateClientSignaturePad()"><i class="fas fa-file-signature"></i> Sign (Client)</div>
+                <div class="btn btn-primary" onclick="activateNotarySignatureTool()"><i class="fas fa-signature"></i> Sign (Notary)</div>
+                <div class="btn btn-primary" onclick="disableGuideBox()">Cancel</div>
+            </div>
+            <div class="btn-group mb-2" role="group" aria-label="Third group">
+                <div class="btn btn-primary" onclick="addPage()"><i class="fas fa-plus"></i> Append Blank Page</div>
             </div>
         </div>
     </div>
     <div class="card-body" id="page-canvas-container">
         <canvas id="placementguidebox" width="1000" height="1000"></canvas>
     </div>
-    <div class="card-body">
-        Page count: <span id="page_count"></span>
-    </div>
 </div>
 
 <div id="svgtrimbox"></div>
diff --git a/js/pdf.js b/js/pdf.js
index 79eae52..1540ae5 100644
--- a/js/pdf.js
+++ b/js/pdf.js
@@ -160,5 +160,5 @@ function renderAllPages() {
         });
     }
     pageNumber = pageNumber + thisDocPageCount;
-    document.getElementById('page_count').textContent = pageNumber;
+    //document.getElementById('page_count').textContent = pageNumber;
 }
\ No newline at end of file