From 6cd8d6b3f30e684f1e51557bfd58c71844edb754 Mon Sep 17 00:00:00 2001 From: Gary Keeble Date: Sat, 9 Jul 2016 07:42:20 +0100 Subject: [PATCH] Style Adjustments --- css/main.css | 4 ++-- css/user_settings_dialog.css | 6 +++--- index.html | 24 +++++++++--------------- js/grapher.js | 2 +- 4 files changed, 15 insertions(+), 21 deletions(-) diff --git a/css/main.css b/css/main.css index b1ab206c..395d36e6 100644 --- 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 index 9200b70f..a0f70b1f 100644 --- 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 index 5b75de04..acf820cb 100755 --- a/index.html +++ b/index.html @@ -269,9 +269,7 @@

Log sync

-
-
@@ -289,11 +287,9 @@

Legend Graph setup

-
-

Field values

@@ -307,11 +303,9 @@

Legend

-
-
@@ -1113,13 +1107,13 @@ - % +

%

- % +

%

- % +

%

@@ -1141,13 +1135,13 @@ - % +

%

- % +

%

- % +

%

@@ -1164,13 +1158,13 @@ - % +

%

- % +

%

- % +

%

diff --git a/js/grapher.js b/js/grapher.js index ceef38ca..762fdefd 100755 --- 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