Style Adjustments

betaflight · Jul 9, 2016 · 6cd8d6b · 6cd8d6b
1 parent 6ce4f72
commit 6cd8d6b
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 21 deletions.
diff --git a/css/main.css b/css/main.css
@@ -541,8 +541,8 @@ html.has-log .video-top-controls {
 	z-index:10;
 	background-color:white;
 	padding-bottom:10px;
-	width:100%;
-	min-width:1090px;
+	width: 100%;
+	min-width: 1390px;
 }
 
 html.has-video .log-graph,

diff --git a/css/user_settings_dialog.css b/css/user_settings_dialog.css
@@ -72,17 +72,17 @@
 }
 
 
-.user-settings-dialog p,
-.user-settings-dialog span
+.user-settings-dialog p, .user-settings-dialog span
  {
     font-style: normal;
     font-family: 'open_sansregular', Arial;
     line-height: 19px;
     color: #7d7d7d;
     font-size: 11px;
+    display: inline;
+    margin-left: 2px;
 }
 
-
 /* Normal Track Override positioning*/
 .user-settings-dialog input[type="checkbox"].ios-switch + div {
 	position: absolute;

diff --git a/index.html b/index.html
@@ -269,9 +269,7 @@ <h4>Log sync</h4>
                 </div>
             </li>
         </ul>
-
         <div class="craft"></div>
-
         <div class="graph-row">
             <div class="log-graph">
                 <video></video>
@@ -289,11 +287,9 @@ <h2>Legend <span class="log-close-legend-dialog glyphicon glyphicon-remove"></sp
                 <button type="button" class="btn btn-default btn-block open-graph-configuration-dialog">Graph setup</button>
             </div>
         </div>
-
         <div class="log-seek-bar">
             <canvas width="200" height="100"></canvas>
         </div>
-
         <div class="log-field-values" id="log-field-values">
             <a href="#log-field-values"><h4>Field values</h4></a>
             <table class="table table-condensed">
@@ -307,11 +303,9 @@ <h2>Legend <span class="log-close-legend-dialog glyphicon glyphicon-remove"></sp
                 </tr>
             </table>
         </div>
-
         <div class="configuration-file" id="configuration-file">
 			<!-- auto filled bu configuration function -->
         </div>
-
     </div>
     <!-- Status Bar -->
     <div id="status-bar">
@@ -1113,13 +1107,13 @@ <h4 class="modal-title">Advanced User Settings</h4>
 													<label>Position</label>
 												</td>
 												<td class="position">
-													<label>Top</label><input name="stick-top" type="number" step="1" min="0" max="100"/><span>%</span>
+													<label>Top</label><input name="stick-top" type="number" step="1" min="0" max="100"/><p>%</p>
 												</td>
 												<td class="position">
-													<label>Left</label><input  name="stick-left" type="number" step="1" min="0" max="100"/><span>%</span>
+													<label>Left</label><input  name="stick-left" type="number" step="1" min="0" max="100"/><p>%</p>
 												</td>
 												<td class="position">
-													<label>Size</label><input name="stick-size" type="number" step="1" min="0" max="100"/><span>%</span>
+													<label>Size</label><input name="stick-size" type="number" step="1" min="0" max="100"/><p>%</p>
 												</td>
 											</tr>
 										</table>
@@ -1141,13 +1135,13 @@ <h4 class="modal-title">Advanced User Settings</h4>
 												<label>Position</label>
 											</td>
 											<td class="position">
-												<label>Top</label><input name="craft-top" type="number" step="1" min="0" max="100"/><span>%</span>
+												<label>Top</label><input name="craft-top" type="number" step="1" min="0" max="100"/><p>%</p>
 											</td>
 											<td class="position">
-												<label>Left</label><input name="craft-left" type="number" step="1" min="0" max="100"/><span>%</span>
+												<label>Left</label><input name="craft-left" type="number" step="1" min="0" max="100"/><p>%</p>
 											</td>
 											<td class="position">
-												<label>Size</label><input name="craft-size" type="number" step="1" min="0" max="100"/><span>%</span>
+												<label>Size</label><input name="craft-size" type="number" step="1" min="0" max="100"/><p>%</p>
 											</td>
 										</tr>
 									</table>
@@ -1164,13 +1158,13 @@ <h4 class="modal-title">Advanced User Settings</h4>
 												<label>Position</label>
 											</td>
 											<td class="position">
-												<label>Top</label><input name="analyser-top" type="number" step="1" min="0" max="100"/><span>%</span>
+												<label>Top</label><input name="analyser-top" type="number" step="1" min="0" max="100"/><p>%</p>
 											</td>
 											<td class="position">
-												<label>Left</label><input name="analyser-left" type="number" step="1" min="0" max="100"/><span>%</span>
+												<label>Left</label><input name="analyser-left" type="number" step="1" min="0" max="100"/><p>%</p>
 											</td>
 											<td class="position">
-												<label>Size</label><input name="analyser-size" type="number" step="1" min="0" max="100"/><span>%</span>
+												<label>Size</label><input name="analyser-size" type="number" step="1" min="0" max="100"/><p>%</p>
 											</td>
 										</tr>
 									</table>

diff --git a/js/grapher.js b/js/grapher.js
@@ -718,7 +718,7 @@ function FlightLogGrapher(flightLog, graphConfig, canvas, craftCanvas, analyserC
                 var markerFrequency = ((windowCenterTime-markerEvent.time).toFixed(0)!=0)?((1000000/(windowCenterTime-markerEvent.time)).toFixed(0) + "Hz") : '';
                 drawEvent(
                     {
-                    event:FlightLogEvent.CUSTOM_BLANK,
+                    event:FlightLogEvent.CUSTOM_BLANK, // Blank doesnt show a vertical line
                     time:windowCenterTime,
                     label: formatTime((windowCenterTime-markerEvent.time)/1000, true) + 'ms ' + markerFrequency,
                     align:(markerEvent.time<windowCenterTime)?'right':'left',