Browse Source

Style updates

David Peter 2 years ago
parent
commit
aa0083d884
4 changed files with 83 additions and 50 deletions
  1. 3 3
      numbat-wasm/www/index.html
  2. 7 8
      numbat-wasm/www/index.js
  3. 73 39
      numbat-wasm/www/main.css
  4. BIN
      numbat-wasm/www/numbat.png

+ 3 - 3
numbat-wasm/www/index.html

@@ -34,12 +34,12 @@
   </head>
   <body>
     <div id="content">
-      <div align="center">
-      <img src="numbat.png">
+      <div align="center" id="container">
+      <img src="numbat.png" width="205" id="logo">
       <p class="desc">high precision scientific calculator with full support for physical units.</p>
       </div>
       <div id="terminal"></div>
-      <p class="links"><a href="https://numbat.dev/doc/">Documentation</a> &middot; <a href="https://github.com/sharkdp/numbat">Source code</a></p>
+      <p class="links"><a href="https://numbat.dev/doc/">Documentation</a> &bull; <a href="https://github.com/sharkdp/numbat">Source code</a></p>
     </div>
     <a href="https://github.com/sharkdp/numbat" class="github-corner" aria-label="View source on Github">
       <svg width="80" height="80" viewBox="0 0 250 250" style="position: absolute; top: 0; border: 0; right: 0;" aria-hidden="true"><path d="M0,0 L115,115 L130,115 L142,142 L250,250 L250,0 Z"></path><path d="M128.3,109.0 C113.8,99.7 119.0,89.6 119.0,89.6 C122.0,82.7 120.5,78.6 120.5,78.6 C119.2,72.0 123.4,76.3 123.4,76.3 C127.3,80.9 125.5,87.3 125.5,87.3 C122.9,97.6 130.6,101.9 134.4,103.2" fill="currentColor" style="transform-origin: 130px 106px;" class="octo-arm"></path><path d="M115.0,115.0 C114.9,115.1 118.7,116.5 119.8,115.4 L133.7,101.6 C136.9,99.2 139.9,98.4 142.2,98.6 C133.8,88.0 127.5,74.4 143.8,58.0 C148.5,53.4 154.0,51.2 159.7,51.0 C160.3,49.4 163.2,43.6 171.4,40.1 C171.4,40.1 176.1,42.5 178.8,56.2 C183.1,58.6 187.2,61.8 190.9,65.4 C194.5,69.0 197.7,73.2 200.1,77.6 C213.8,80.2 216.3,84.9 216.3,84.9 C212.7,93.1 206.9,96.0 205.4,96.6 C205.1,102.4 203.0,107.8 198.3,112.5 C181.9,128.9 168.3,122.5 157.7,114.1 C157.9,116.9 156.7,120.9 152.7,124.9 L141.0,136.5 C139.8,137.7 141.6,141.9 141.8,141.8 Z" fill="currentColor" class="octo-body"></path></svg>

+ 7 - 8
numbat-wasm/www/index.js

@@ -18,22 +18,21 @@ function updateUrlQuery(query) {
   history.replaceState(null, null, url);
 }
 
-function interpret(line) {
-  // Skip empty lines or line comments
-  var lineTrimmed = line.trim();
-  if (lineTrimmed === "" || lineTrimmed[0] === "#") {
+function interpret(input) {
+  // Skip empty lines or comments
+  var input_trimmed = input.trim();
+  if (input_trimmed === "" || (input_trimmed[0] === "#" && input_trimmed.indexOf("\n") == -1)) {
     return;
   }
 
-  if (lineTrimmed == "clear") {
+  if (input_trimmed == "clear") {
     this.clear();
     var output = "";
   } else {
-    var output = numbat.interpret(line);
+    var output = numbat.interpret(input);
+    updateUrlQuery(input);
   }
 
-  updateUrlQuery(line);
-
   return output;
 }
 

+ 73 - 39
numbat-wasm/www/main.css

@@ -1,6 +1,6 @@
 html {
     font-family: 'Exo 2', sans-serif;
-    background-color: #ecebe5;
+    background-color: #f2f2f2;
 }
 
 .github-corner svg {
@@ -16,20 +16,12 @@ body {
 
 #content {
     max-width: 90%;
-    width: 850px;
+    width: 900px;
     padding-left: 20px;
     padding-right: 20px;
     margin: 0 auto;
 }
 
-h1 {
-    font-weight: 400;
-    font-size: 3em;
-    line-height: 100%;
-    margin-bottom: 0;
-    padding: 0;
-}
-
 p.desc {
     margin-top: 0.6em;
     margin-bottom: 1.8em;
@@ -41,7 +33,7 @@ p.links {
 }
 
 p.links a {
-    color: #aaa;
+    color: #666;
 }
 
 #terminal {
@@ -52,10 +44,10 @@ p.links a {
 /* jQuery Terminal */
 
 .terminal {
-    --color: #F8F8F2;
-    --background: #272822;
+    --color: #f1f1f0;
+    --background: #282a36;
     --size: 1.6;
-    --link-color: #F8F8F2;
+    --link-color: #59f78d;
     font-family: 'Fira Mono', monospace;
 }
 
@@ -83,37 +75,42 @@ p.links a {
     padding-bottom: 0em;
 }
 
+.terminal {
+    --size: 1.4;
+}
+
 .prompt {
     font-weight: bold;
 }
 
 /* syntax highlighting */
+/* snazzy color scheme (https://github.com/sindresorhus/hyper-snazzy) */
 
 .hl-dimmed {
-    color: #606060 !important;
+    color: #888 !important;
 }
 
 .hl-string {
-    color: #1f9829 !important;
+    color: #59f78d !important;
 }
 
 .hl-keyword {
     font-weight: 700 !important;
-    color: #f03495 !important;
+    color: #ff69c0 !important;
 }
 
 .hl-value {
-    color: #dba717 !important;
+    color: #f3f99d !important;
 }
 
 .hl-unit {
-    color: #1d9ecd !important;
+    color: #99ecfe !important;
 }
 
 .hl-identifier {}
 
 .hl-type-identifier {
-    color: #5179ce !important;
+    color: #57c7ff !important;
     font-style: italic !important;
 }
 
@@ -122,15 +119,15 @@ p.links a {
 }
 
 .hl-decorator {
-    color: #A6E22E !important;
+    color: #59f78d !important;
 }
 
 .hl-diagnostic-red {
-    color: #d4122c !important;
+    color: #ff5b56 !important;
 }
 
 .hl-diagnostic-blue {
-    color: #5179ce !important;
+    color: #56c7ff !important;
 }
 
 .hl-diagnostic-bold {
@@ -161,37 +158,74 @@ p.links a {
     }
 }
 
-@media (max-width:500px) {
-    .github-corner:hover .octo-arm {
-        animation: none
+@media (max-width:600px) {
+    html {
+        height: 100%;
+    }
+    body {
+        margin: 0px;
+        height: 100%;
+    }
+
+    .github-corner {
+        display: none;
+    }
+
+    #logo {
+        display: none;
+    }
+
+    .desc {
+        display: none;
+    }
+
+    .links {
+        display: none;
+    }
+
+    #container {
+        display: none;
+    }
+
+    #content {
+        max-width: 100%;
+        height: 100%;
+        padding-top: 0px;
+        padding-left: 0px;
+        padding-right: 0px;
+        margin: 0 auto;
+    }
+
+    .terminal,
+    .terminal .terminal-fill {
+        padding: 0.2em;
+        margin-bottom: 2em;
     }
 
-    .github-corner .octo-arm {
-        animation: octocat-wave 560ms ease-in-out
+    .terminal {
+        --size: 1.2;
+    }
+
+    #terminal {
+        height: 100% !important;
+        border-radius: 0px;
+        box-shadow: none;
+        margin: 0px;
     }
 }
 
 @media (prefers-color-scheme: dark) {
     html {
-        background: #1A1A1A;
+        background: #121319;
         color: #ECF0F1;
     }
 
     .github-corner svg {
-        fill: #ECF0F1;
+        fill: #3e4153;
         color: #1A1A1A;
     }
 
     #terminal {
         box-shadow: 0px 3px 8px #121212;
     }
-
-    #insect-logo {
-        color: black;
-        filter: drop-shadow(0 0 10px #ECF0F1);
-    }
-
-    #insect-logo>path {
-        display: none;
-    }
 }

BIN
numbat-wasm/www/numbat.png