From 127cee2dc0a3a49c814476a708e2586f4db01758 Mon Sep 17 00:00:00 2001
From: Will Scullin <scullin@scullinsteel.com>
Date: Wed, 13 Mar 2019 19:27:55 -0700
Subject: [PATCH] Tweak a bunch of sizes.

---
 apple2js.html    | 20 +++++++++-----------
 apple2jse.html   | 14 +++++---------
 css/apple2.css   | 29 ++++++++++++++++++++---------
 js/main2e.js     |  4 ++--
 js/ui/printer.js |  3 ++-
 5 files changed, 38 insertions(+), 32 deletions(-)

diff --git a/apple2js.html b/apple2js.html
index 92f7a4d..8bf39c7 100644
--- a/apple2js.html
+++ b/apple2js.html
@@ -139,7 +139,7 @@
     <div class="modal__overlay" tabindex="-1" data-micromodal-close>
       <div class="modal__container" role="dialog" aria-modal="true" aria-labelledby="Loading" >
         <header class="modal__header">
-          <span id="loading-modal-title">
+          <span class="modal__title" id="loading-modal-title">
             Loading...
           </span>
         </header>
@@ -151,7 +151,7 @@
     <div class="modal__overlay" tabindex="-1" data-micromodal-close>
       <div class="modal__container" role="dialog" aria-modal="true" aria-labelledby="Options">
         <header class="modal__header">
-          <span id="options-modal-title">
+          <span class="modal__title" id="options-modal-title">
             Options
           </span>
           <button class="modal__close" aria-label="Close modal" data-micromodal-close>
@@ -237,7 +237,7 @@
               <input type="checkbox" id="enable_sound"
                     onclick="updateSound()" checked="checked" />
               <label for="enable_sound">
-                Enable (Experimental)
+                Enable
               </label>
             </li>
           </ul>
@@ -253,7 +253,7 @@
     <div class="modal__overlay" tabindex="-1" data-micromodal-close>
       <div class="modal__container" role="dialog" aria-modal="true" aria-labelledby="Save Disk">
         <header class="modal__header">
-          <span id="save-modal-title">
+          <span class="modal__title" id="save-modal-title">
             Save Disk
           </span>
           <button class="modal__close" aria-label="Close modal" data-micromodal-close>
@@ -261,15 +261,13 @@
         </header>
         <main class="modal__content" id="save-modal-content">
           <form action="#" onsubmit="return false;">
-            <b>Save to Browser</b>
-            <br /><br />
+            <h3>Save to Browser</h3>
             Save Name: <input type="text" name="name" id="save_name"
                         style="width: 200px" />
           </form>
           <hr />
           <div>
-            <b>Download to Local Disk</b>
-            <br /><br />
+            <h3>Download to Local Disk</h3>
             <a id="local_save_link" class="button">Download</a>
           </div>
         </main>
@@ -336,13 +334,11 @@
             <tr>
               <td>
                 <select id="category_select" multiple="multiple"
-                        class="ui-widget ui-state-default"
                         onchange="selectCategory(event)" >
                 </select>
               </td>
               <td>
                 <select id="disk_select" multiple="multiple"
-                        class="ui-widget ui-state-default"
                         onchange="selectDisk(event)"
                         ondblclick="clickDisk(event)">
                 </select>
@@ -372,7 +368,9 @@
           </button>
         </header>
         <main class="modal__content" id="printer-modal-content">
-          <div class="paper"></div>
+          <div class="feed">
+            <div class="paper"></div>
+          </div>
         </main>
         <footer class="modal__footer">
           <button class="modal__btn" data-micromodal-close aria-label="Close this dialog window">Close</button>
diff --git a/apple2jse.html b/apple2jse.html
index f12a1c7..fa877c3 100644
--- a/apple2jse.html
+++ b/apple2jse.html
@@ -118,7 +118,7 @@
     <div class="modal__overlay" tabindex="-1" data-micromodal-close>
       <div class="modal__container" role="dialog" aria-modal="true" aria-labelledby="Loading" >
         <header class="modal__header">
-          <span id="loading-modal-title">
+          <span class="modal__title" id="loading-modal-title">
             Loading...
           </span>
         </header>
@@ -130,7 +130,7 @@
     <div class="modal__overlay" tabindex="-1" data-micromodal-close>
       <div class="modal__container" role="dialog" aria-modal="true" aria-labelledby="Options">
         <header class="modal__header">
-          <span id="options-modal-title">
+          <span class="modal__title" id="options-modal-title">
             Options
           </span>
           <button class="modal__close" aria-label="Close modal" data-micromodal-close>
@@ -213,7 +213,7 @@
               <input type="checkbox" id="enable_sound"
                     onclick="updateSound()" checked="checked" />
               <label for="enable_sound">
-                Enable (Experimental)
+                Enable
               </label>
             </li>
           </ul>
@@ -237,15 +237,13 @@
         </header>
         <main class="modal__content" id="save-modal-content">
           <form action="#" onsubmit="return false;">
-            <b>Save to Browser</b>
-            <br /><br />
+            <h3>Save to Browser</h3>
             Save Name: <input type="text" name="name" id="save_name"
                         style="width: 200px" />
           </form>
           <hr />
           <div>
-            <b>Download to Local Disk</b>
-            <br /><br />
+            <h3>Download to Local Disk</h3>
             <a id="local_save_link" class="button">Download</a>
           </div>
         </main>
@@ -312,13 +310,11 @@
             <tr>
               <td>
                 <select id="category_select" multiple="multiple"
-                        class="ui-widget ui-state-default"
                         onchange="selectCategory(event)" >
                 </select>
               </td>
               <td>
                 <select id="disk_select" multiple="multiple"
-                        class="ui-widget ui-state-default"
                         onchange="selectDisk(event)"
                         ondblclick="clickDisk(event)">
                 </select>
diff --git a/css/apple2.css b/css/apple2.css
index b6ec873..866a263 100644
--- a/css/apple2.css
+++ b/css/apple2.css
@@ -52,7 +52,7 @@ input[type="text"] {
 
 body {
     margin: 16px 0;
-    font-size: 10px;
+    font-size: 14px;
     background-color: #c4c1a0; /* Pantone 453 */
     font-family: sans-serif;
 }
@@ -62,10 +62,6 @@ body {
     width: 620px;
 }
 
-label {
-    font-weight: bold;
-}
-
 #display {
     margin: 5px auto;
 }
@@ -134,7 +130,6 @@ label {
 }
 
 .disklabel {
-    font-size: 11px;
     font-family: sans-serif;
 }
 
@@ -167,6 +162,10 @@ th {
     margin: 10px 0;
 }
 
+.inset button {
+    min-width: 36px;
+}
+
 #khz {
     margin-right: 4px;
     overflow: hidden;
@@ -219,6 +218,12 @@ canvas {
 #load-modal select {
     width: 250px;
     height: 300px;
+    font-size: 14px;
+}
+
+#load-modal input {
+    font-size: 14px;
+    line-height: 14px;
 }
 
 .modal {
@@ -295,9 +300,10 @@ canvas {
 button {
     background: #44372C;
     color: #fff;
-    padding: 5px 11px;
+    padding: 2px 8px;
     border: 1px outset #66594E;
     border-radius: 3px;
+    font-size: 15px;
 }
 
 button:hover {
@@ -321,6 +327,7 @@ button:focus {
     -moz-user-select: none;
     -ms-user-select: none;
     user-select: none;
+    font-size: 10px;
 }
 
 #keyboard .row {
@@ -575,7 +582,6 @@ button:focus {
 
 #options-modal {
     width: 300px;
-    font-size: 11px;
     line-height: 1.75em;
 }
 
@@ -587,10 +593,15 @@ button:focus {
     list-style-type: none;
 }
 
-.paper {
+#printer-modal .feed {
     width: 640px;
     height: 480px;
     overflow: auto;
+}
+
+#printer-modal .paper {
+    min-width: 640px;
+    min-height: 480px;
     background-color: white;
     color: black;
     font-family: monospace;
diff --git a/js/main2e.js b/js/main2e.js
index a7d4193..4af9f3c 100644
--- a/js/main2e.js
+++ b/js/main2e.js
@@ -762,7 +762,7 @@ function _keydown(evt) {
     } else if (evt.keyCode == 91 || evt.keyCode == 93) { // Command
         keyboard.commandKey(true);
     } else if (evt.keyCode == 18) { // Alt
-        if (evt.originalEvent.location == 1) {
+        if (evt.location == 1) {
             keyboard.commandKey(true);
         } else {
             keyboard.optionKey(true);
@@ -781,7 +781,7 @@ function _keyup(evt) {
     } else if (evt.keyCode == 91 || evt.keyCode == 93) { // Command
         keyboard.commandKey(false);
     } else if (evt.keyCode == 18) { // Alt
-        if (evt.originalEvent.location == 1) {
+        if (evt.location == 1) {
             keyboard.commandKey(false);
         } else {
             keyboard.optionKey(false);
diff --git a/js/ui/printer.js b/js/ui/printer.js
index e7c890c..908d81b 100644
--- a/js/ui/printer.js
+++ b/js/ui/printer.js
@@ -32,7 +32,8 @@ export default function Printer(el) {
 
             if (c == '\r') {
                 newLine();
-                _lineBuffer = '';
+            } else if (c == '\n') {
+                // eat for now
             } else if (c == '\t') {
                 _lineBuffer += '        ';
             } else if (c == 0x04) {