diff --git a/main.css b/main.css index 54482b11..235f02b7 100644 --- a/main.css +++ b/main.css @@ -18,6 +18,7 @@ body { background-color:#3d3f3e; margin:0px; padding:0px; + overflow: hidden; } a { @@ -108,7 +109,12 @@ input[type="number"]::-webkit-inner-spin-button { #main-wrapper { padding: 0px 0px 0 0px; /* padding: 5px 5px 0 5px; */ height: calc(100% - 7px); - +} +.margin-top { + margin-top: 20px; +} +.margin-bottom { + margin-bottom: 20px; } .headerbar { @@ -990,6 +996,61 @@ dialog { padding-bottom:15px; } +.content_wrapper { + /* leave 20px side padding always */ + /*padding: 0 20px 0 20px; + for testing: */ + padding: 20px; +} + +.content_toolbar { + /* content toolbar panel */ + width: 100%; + height: 30px; + background: silver; + padding: 10px 0; + overflow: hidden; +} + +.content_toolbar .btn { + /* common styles for content toolbar buttons */ + display: block; + float: right; + margin-right: 10px; + height: 28px; + line-height: 28px; + padding: 0 15px 0 15px; + text-align: center; + font-weight: bold; + border: 1px solid silver; + background-color: #ececec; +} + +.toolbar_scroll_bottom .content_wrapper { + /* content wrapper in view with toolbar in scroll bottom + leave 50px space for the toolbar + */ + height: 100%; + margin: 0 0 -50px; +} + +.toolbar_fixed_bottom .content_wrapper { + /* content wrapper in view with toolbar fixed over bottom edge + leave 50px space for the toolbar + */ + height: calc(100% - 50px); + overflow-y: auto; +} + +.toolbar_fixed_bottom .content_toolbar { + position: absolute; + bottom: 0; +} + + + + + /* Colums START> */ .cf_column { @@ -1394,12 +1455,9 @@ dialog { /* fixing padding for all Tabs*/ .tab-setup, .tab-landing, .tab-adjustments, .tab-auxiliary, .tab-cli, .tab-configuration, .tab-dataflash, .tab-firmware_flasher, .tab-gps, .tab-help, .tab-led-strip, .tab-logging, .tab-modes, .tab-motors, .tab-pid_tuning, .tab-ports, .tab-receiver, .tab-sensors, .tab-servos { - padding:20px; - float:left; - width:calc(100% - 40px); - height:calc(100% - 40px) !important; - position:absolute !important; - } + height: 100%; + position: relative; +} /* fixing logging tab*/ @@ -1443,18 +1501,17 @@ dialog { color:#fff; font-size: 10px; } - - + + @media only screen and (max-width: 1055px), only screen and (max-device-width: 1055px) { - + .tab_title { font-size:16px; line-height:18px; - height:24px; font-family: 'open_sanslight', Arial; margin-bottom:10px; - display:; + margin-top: 20px; } .cf_doc_version_bt a { @@ -1463,7 +1520,7 @@ dialog { font-size:9px; line-height:15px; } - + #content { height:calc(100% - 151px); /* (port picker 105px, log CLOSED 25px, status bar: 20px + padding) - was: calc(100% - 171px)*/ } @@ -1475,13 +1532,8 @@ body { } .tab-setup, .tab-landing, .tab-adjustments, .tab-auxiliary, .tab-cli, .tab-configuration, .tab-dataflash, .tab-firmware_flasher, .tab-gps, .tab-help, .tab-led-strip, .tab-logging, .tab-modes, .tab-motors, .tab-pid_tuning, .tab-ports, .tab-receiver, .tab-sensors, .tab-servos { - padding:10px; - float:left; - width:calc(100% - 20px); - height:calc(100% - 20px) !important; - position:absolute !important; } - + .cf_table td { padding-top:2px; padding-bottom:2px; @@ -1494,7 +1546,7 @@ body { .default_btn a { font-size:12px; } - + #tabs li a { font-family: 'open_sansregular', Arial; font-size:12px; @@ -1521,7 +1573,7 @@ body { padding-bottom:0px; margin-bottom:5px; } - + .spacer_box_title { padding-left: 10px; padding-right: 10px; @@ -1529,7 +1581,7 @@ body { margin-bottom: 0px; } - + input { font-size:11px !important; } @@ -1545,4 +1597,4 @@ input { } - } \ No newline at end of file + } diff --git a/tabs/adjustments.html b/tabs/adjustments.html index 1cdf3436..54517ce0 100644 --- a/tabs/adjustments.html +++ b/tabs/adjustments.html @@ -1,4 +1,5 @@ -
+
+

@@ -27,10 +28,10 @@ - -
- -
+
+
+
+
diff --git a/tabs/auxiliary.html b/tabs/auxiliary.html index 498dfeb2..8da9b2b1 100644 --- a/tabs/auxiliary.html +++ b/tabs/auxiliary.html @@ -1,4 +1,5 @@ -
+
+

@@ -6,9 +7,10 @@ -
- -
+
+
+
+
diff --git a/tabs/configuration.html b/tabs/configuration.html index 53a7d82a..47b21800 100644 --- a/tabs/configuration.html +++ b/tabs/configuration.html @@ -1,4 +1,5 @@ -
+
+
Configuration
@@ -425,7 +426,8 @@
-
-
-
-
\ No newline at end of file +
+
+
+
+
diff --git a/tabs/dataflash.html b/tabs/dataflash.html index 7948e8f8..706478ca 100644 --- a/tabs/dataflash.html +++ b/tabs/dataflash.html @@ -1,34 +1,35 @@
-
+
+
- +

- +

Erase in progress, please wait...

- +
- +

- + - +
@@ -36,13 +37,13 @@
- +
- +

Dataflash contents

  • @@ -56,12 +57,12 @@
- -
- - -
-
\ No newline at end of file +
+
+
+
+
+
diff --git a/tabs/firmware_flasher.html b/tabs/firmware_flasher.html index 4fa8551d..8e8fd1da 100755 --- a/tabs/firmware_flasher.html +++ b/tabs/firmware_flasher.html @@ -1,4 +1,5 @@ -
+
+