Bug fix. modals display appromately correctly now.

lautr3k · Apr 7, 2019 · d19c2e661b5e9f46e3c214a644d4bd554991dab3 · d19c2e6
1 parent afc3eb3
commit d19c2e661b5e9f46e3c214a644d4bd554991dab3
Unified Split

Showing with 34 additions and 24 deletions.

+3 −4 css/m3rlin.css

+22 −19 index.html

+9 −1 js/m3rlin.js
diff --git a/css/m3rlin.css b/css/m3rlin.css
@@ -24,13 +24,13 @@
 }
 .modal-body {
   background-image: url('../images/brijan-pale.gif');
-  display: flex;
-  /* display: none; */
+  /* display: flex; */
+  display: none;
   align-content: center;
   justify-content: center;
 }
 .m3rlin-options,
-.m3rlin-main-menu-btns {
+m34 {
   /* display: none; */
   background-image: url('../images/brijan-pale.gif');
   display: flex;
@@ -53,7 +53,6 @@
 }
 .modal-footer {
   display: none;
-  background-image: url('../images/brijan-pale.gif');
 }
 #m3rlin-continue {
   background: rgb(171, 250, 171);

diff --git a/index.html b/index.html
@@ -691,32 +691,35 @@ <h4>
             </button> -->
           </div>
           <div class="modal-body">
-            <div id="quick-confirm">
-              <div class="col">
-                <div class="row">
-                  <h2 class="centered">
-                    Quick Start
-                  </h2>
-                </div>
-                <div class="row">
-                  <h4 class="padded centered">
-                    To print test image using default settings:
-                  </h4>
-                  <h4 class="centered">
-                    Please ensure printer is connected and ready to print; then press Continue.
-                  </h4>
-
-                </div>
-            </div>
-          </div>
+
         </div>
             <div class="m3rlin-options">
+
+                    <div id="quick-confirm">
+                            <div class="col">
+                              <div class="row">
+                                <h2 class="centered">
+                                  Quick Start
+                                </h2>
+                              </div>
+                              <div class="row">
+                                <h4 class="padded centered">
+                                  To print test image using default settings:
+                                </h4>
+                                <h4 class="centered">
+                                  Please ensure printer is connected and ready to receive
+                                  printer data, then press Continue.
+                                </h4>
+
+                              </div>
+                          </div>
+                        </div>
                 <div class="m3rlin-main-menu-btns">
               <button class="m3rlin-btn" id="quick">Quick Start</button>
               <button class="m3rlin-btn" id="settings">Settings</button>
               <button class="m3rlin-btn">About</button>
             </div>
-        </div>
+            </div>
             <div class="modal-footer">
 
                     <div class="row">

diff --git a/js/m3rlin.js b/js/m3rlin.js
@@ -13,7 +13,15 @@ $(document).ready(function() {
 
   $('#quick').click(function() {
     $('#quick-confirm').fadeIn('slow');
-    $('.modal-footer').fadeIn('slow');
+    $('.m3rlin-greeter').css({ display: 'none' });
     $('.m3rlin-main-menu-btns').css({ display: 'none' });
+    $('.m3rlin-quickstart-btns').fadeIn('slow');
+    $('.modal-footer').fadeIn('slow');
+  });
+
+  $('#m3rlin-back').click(function() {
+    $('#quick-confirm').css({ display: 'none' });
+    $('.modal-footer').css({ display: 'none' });
+    $('.m3rlin-main-menu-btns').fadeIn('slow');
   });
 });