瀏覽代碼

Basic main styles

Andrew Chalkley 9 年之前
父節點
當前提交
f5bcb2c420
共有 4 個文件被更改,包括 46 次插入27 次删除
  1. 22 8
      front-end/css/style.css
  2. 1 1
      front-end/images/logo.svg
  3. 21 16
      front-end/index.html
  4. 2 2
      front-end/js/app.js

+ 22 - 8
front-end/css/style.css

@@ -8,7 +8,6 @@ html {
 }
 
 body {
-	padding: 50px;
 	font: 14px "Lucida Grande", Helvetica, Arial, sans-serif;
 	font-family: HelveticaNeue;
 	color: #010101;
@@ -51,11 +50,26 @@ footer {
 	border-top: 1px solid #EDEAE8;
 }
 
-img {
-	width: 180px;
-	display: inline-block;
+#app {
+	margin:37px auto;
+	display: flex;
+	background: white;
+	width: 500px;
 }
-#form {
-	display: inline-block;
-	width: 300px;
-}
+
+#logo img {
+	width:180px;
+}
+
+#form .field {
+	margin-top:20px;
+	line-height: 1.5;
+}
+
+#form .button {
+	margin-top: 10px;
+	text-align: right;
+}
+
+
+

+ 1 - 1
front-end/images/logo.svg

@@ -16,7 +16,7 @@
 	</linearGradient>
 	<polyline class="st0" points="52.1,27.5 62.6,27.5 51,92.5 56.5,92.5 72.3,4 77.8,4 62.1,92.5 67.6,92.5 78.4,37.7 83.9,37.7 
 		73.1,92.5 78.7,92.5 85.9,55.4 91.4,55.4 69.3,176 74.8,176 91.4,87.5 96.9,87.5 84.5,153.9 90,153.9 102.4,87.5 108,87.5 
-		99.7,136.2 105.2,136.2 113.5,87.5 119,87.5 116.8,99.4 127.9,99.4 	"/>
+		99.7,136.2 105.2,136.2 113.5,87.5 119,87.5 116.8,99.4 127.9,99.4"/>
 	<circle class="st1" cx="48.8" cy="27.5" r="3.3"/>
 	<circle class="st2" cx="131.2" cy="99.7" r="3.3"/>
 </g>

+ 21 - 16
front-end/index.html

@@ -6,26 +6,31 @@
     <link rel="stylesheet" href="css/style.css">
 </head>
 <body>
-    <img src="images/logo.svg" width="180" height="180">
-    <div id="form">
-        <div>
-            <label for="ports">Select Port:</label><br>
-            <select title="Select a Serial/COM Port" id="ports" name="ports" disabled>
-
-            </select>
+    <div id="app">
+        <div id="logo">
+            <img src="images/logo.svg">
         </div>
-        <div>
-            <label for="manifests">Select Binaries to Flash:</label><br>
-            <select title="Select Binaries to Flash" id="manifests" name="manifests" disabled>
+        <div id="form">
+            <div class="field">
+                <label for="ports">Select Port:</label><br>
+                <select title="Select a Serial/COM Port" id="ports" name="ports" disabled>
 
-            </select>
-        </div>
-        <div>
-            <button id="flash-button" disabled>
-                Flash!
-            </button>
+                </select>
+            </div>
+            <div class="field">
+                <label for="manifests">Select Binaries to Flash:</label><br>
+                <select title="Select Binaries to Flash" id="manifests" name="manifests" disabled>
+
+                </select>
+            </div>
+            <div class="button">
+                <button id="flash-button" disabled>
+                    Flash!
+                </button>
+            </div>
         </div>
     </div>
+
     <div id="progressBar" class="meter animate">
         <span id="progress"><span></span></span>
     </div>

+ 2 - 2
front-end/js/app.js

@@ -103,7 +103,7 @@ serialScanner.on("error", onError);
 function readyToFlash() {
     updateProgressBar(0);
     progressHolder.style.display = "none";
-    form.style.display = "block";
+    //form.style.display = "block";
     appStatus.textContent = "Ready";
     enableInputs();
 }
@@ -161,7 +161,7 @@ function getManifests() {
 
 function flashWithManifest(manifest) {
     form.style.display = "none";
-    progressHolder.style.display = "block";
+   // progressHolder.style.display = "block";
     appStatus.textContent = `Flashing ${portsSelect.value}`;
     const numberOfSteps = manifest.flash.length * 2;
     let correctStepNumber = 1;