diff --git a/main.css b/main.css index f11cce3e..8a807319 100755 --- a/main.css +++ b/main.css @@ -19,7 +19,18 @@ body { padding:0px; } +a { + text-decoration:none; + color:#000; + font-family: 'open_sanssemibold', Arial; + } +a:hover { + text-decoration: none; + + + } + /* Help-Icon */ @@ -79,19 +90,7 @@ body { /* documentation button end */ -a { - text-decoration:none; - color:#59aa29; - font-family: 'open_sanssemibold', Arial; - } -a:hover { - text-decoration: none; - transition: all ease 0.2s; - - - } - input[type="number"]::-webkit-inner-spin-button { opacity: 1; /* required for chromium 33+ beta */ @@ -108,7 +107,8 @@ input[type="number"]::-webkit-inner-spin-button { } #main-wrapper { padding: 0px 0px 0 0px; /* padding: 5px 5px 0 5px; */ - height: calc(100% - 5px); + height: calc(100% - 7px); + } .headerbar { @@ -291,6 +291,11 @@ input[type="number"]::-webkit-inner-spin-button { margin-top: 3px; margin-right: 5px; } + + +/* Log setup*/ + + #log { margin-bottom: 0px; border: 0px solid silver; /* was 1px*/ @@ -357,6 +362,24 @@ margin-right:20px; text-decoration: underline; } + /* Log switch */ + + + .logswitch { + position:fixed; + right: 7px; + margin-top:-1px; + float:right; + padding:5px; + z-index:10; + } + .logswitch a { + color:#656565; + + } + + + .tab_container { float:left; height:100%; @@ -451,9 +474,6 @@ transition: none; color: #fff; background-image:url(images/icons/cf_icon_info_grey.svg); transition: none; - - - } @@ -463,8 +483,8 @@ transition: none; } #content { margin-top: 0px; /* 31 */ - padding: 0px; /* 10 */ - height:calc(100% - 150px); /* (port picker 105px, log 25px, tab 0px, status bar: 20px) - was: calc(100% - 171px)*/ + padding: 10px; /* 10 */ + height:calc(100% - 170px); /* (port picker 105px, log 25px, tab 0px, status bar: 20px) - was: calc(100% - 171px)*/ background-color: white; overflow-x: hidden; @@ -558,62 +578,7 @@ dialog { } -/* Colums START> */ -.cf_column { - margin-bottom:20px; - - } - - -.full { - float:left; - width:100%; - } - -.half { - float:left; - width:50%; - } - - - -.third_left { - float:left; - width:33%; - } - -.third_center { - display: inline-block; - width:34%; - } - -.third_right { - float:right; - width:33%; - } - - -.fourth { - float:left; - width:25%; - } - - -.threefourth_right { - float:right; - width:75%; - } - -.threefourth_left { - float:left; - width:75%; - } - -.twothird { - float:left; - width:67%; - } .tab_wrapper { padding-left:20px; @@ -879,7 +844,7 @@ dialog { margin-left:3px; } -/* note */ +/* connect button */ .connect_contols { @@ -945,15 +910,25 @@ background-color:#e60000; } - .logswitch { - position:fixed; - right: 7px; - margin-top:-1px; - float:right; - padding:5px; - z-index:10; - } - .logswitch a { - color:#656565; +/* 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:; + } + + + +.properties { + width:800px; + } + + + .properties dl { + width:200px; + } + + + .properties dd { + width:400px; + height:auto !important; + } \ No newline at end of file diff --git a/main.html b/main.html index 4512814c..912b27b5 100755 --- a/main.html +++ b/main.html @@ -235,20 +235,7 @@

Waiting for data ...

- + + diff --git a/tabs/logging.css b/tabs/logging.css old mode 100644 new mode 100755 diff --git a/tabs/logging.html b/tabs/logging.html old mode 100644 new mode 100755 diff --git a/tabs/setup.css b/tabs/setup.css old mode 100644 new mode 100755 index ba0ef446..81a7fbfc --- a/tabs/setup.css +++ b/tabs/setup.css @@ -1,28 +1,92 @@ .tab-setup .model-and-info { - height: calc(100% - 155px); + height: calc(100% - 138px); } .tab-setup { height: 100%; } - - -#interactive_block { - position: absolute; - width:calc(71% + 8px); - height:100%; - max-height:417px; - background-color:#f5f5f5; - border-radius: 5px; - border:1px solid #e4e4e4; - +.tab-setup .section { + clear: both; + padding-bottom: 8px; } -.heading_info { - position:absolute; - height: 25px; - margin: 10px 0px 10px 10px; +.tab-setup .section a { + display: block; + + float: left; + + width: 190px; + height: 24px; + line-height: 24px; + + text-align: center; font-weight: bold; + + border: 1px solid silver; + background-color: #ececec; + + white-space: nowrap; } -#interactive_block a.reset { +.tab-setup .section a:hover { + background-color: #dedcdc; +} +.tab-setup .section a.calibrating { + background-color: #c1c1c1; +} +.tab-setup .section a.calibrating:hover { + cursor: default; + background-color: #c1c1c1; +} +.tab-setup .section a.disabled { + background-color: #c1c1c1; +} +.tab-setup .section a.disabled:hover { + cursor: default; +} +.tab-setup .section a.backup { + width: 90px; + margin-right: 8px; +} +.tab-setup .section a.restore { + width: 90px; +} +.tab-setup .section p { + margin-left: 200px; + + padding: 0 0 0 5px; + + height: 25px; + line-height: 25px; + + border-bottom: 1px solid #e5e5e5; +} +.tab-setup #interactive_block { + float: left; + position: relative; + + height: 100%; + width: calc(100% - 199px); + + border: 1px solid silver; + background-color: white; +} +.tab-setup #interactive_block .attitude { + float: right; + margin: 10px 10px 0px 0px +} + +.tab-setup #interactive_block .attitude dt { + float: left; + width: 64px; + font-weight: 700; + text-align: right +} + +.tab-setup #interactive_block .attitude dd { + display: block; + margin-left: 64px; + width: 64px; + text-align: right +} +.tab-setup #interactive_block a.reset { position: absolute; display: block; @@ -39,25 +103,25 @@ border: 1px solid silver; background-color: #ececec; - border-radius: 3px: z-index: 100; } -#interactive_block a.reset:hover { +.tab-setup #interactive_block a.reset:hover { background-color: #dedcdc; } -#canvas_wrapper { +.tab-setup #canvas_wrapper { position: absolute; + width: 100%; height: 100%; top: 0; left: 0; } -.block_wrapper { +.tab-setup .block_wrapper { font-size: 0; } -.block { +.tab-setup .block { float: left; display: block; @@ -65,7 +129,7 @@ border: 1px solid silver; } -.block .head { +.tab-setup .block .head { display: block; text-align: center; @@ -75,7 +139,7 @@ border-bottom: 1px solid silver; background-color: #ececec; } -.block.info { +.tab-setup .block.info { display: inline-block; margin-bottom: 10px; @@ -118,20 +182,24 @@ line-height: 20px; } +.tab-setup .block.gps dd { + height: 20px; -.block.instruments { - width: 285px; - align-content:center; - text-align:center; - ma + margin-left: 85px; + margin-bottom: 2px; + + line-height: 20px; } -.buttons { +.tab-setup .block.instruments { + width: 185px; +} +.tab-setup .buttons { width: calc(100% - 20px); position: absolute; bottom: 10px; } -.update { +.tab-setup .update { display: block; float: right; @@ -149,9 +217,3 @@ .tab-setup .update:hover { background-color: #dedcdc; } - -.cell_setup { - border-bottom: solid 1px #ddd; - padding-bottom:8px; - padding-top:7px; - } \ No newline at end of file diff --git a/tabs/setup.html b/tabs/setup.html old mode 100644 new mode 100755 index 15847c9a..837a7859 --- a/tabs/setup.html +++ b/tabs/setup.html @@ -1,141 +1,65 @@ - -
-
- -
-
Setup -
-
- -
- -
-
-
-
-
- -
-
-
-
-
-
- -
- -
-
-
-
-
-
- -
- - - -
- -
- -
+
+
+ +

+

+
+
+ +

+

+
+
+ +

+

+
+
+ + +

+

+
+
-
+
- - -
Heading:
 
Pitch:
 
Roll:
 
-
- - +
- - -
- -
- -
-
-
- - - - - - - - - - - - - - - - - - - -
0 V
0 mAh
0.00 A
0 %
- - - -
-
-
- - - - - - - - - - - - - - - - - - - -
- - -
-
-
+
+
+ +
+
+
0 V
+
0 mAh
+
0 A
+
0 %
+
+
+
+
+ +
+
+
+
+
+
+
+
+
+
+ - - - -
- - - - -
- - - - - - - - - - +
+
diff --git a/tabs/setup_new.css b/tabs/setup_new.css new file mode 100644 index 00000000..68b291ed --- /dev/null +++ b/tabs/setup_new.css @@ -0,0 +1,222 @@ +.tab-setup .model-and-info { + height: calc(100% - 155px); +} +.tab-setup { + height: 100%; +} + + +#interactive_block { + position: absolute; + width:calc(71% + 8px); + height:100%; + max-height:417px; + background-color:#f5f5f5; + border-radius: 5px; + border:1px solid #e4e4e4; + +} +.heading_info { + position:absolute; + height: 25px; + margin: 10px 0px 10px 10px; + font-weight: bold; +} +#interactive_block a.reset { + position: absolute; + display: block; + + bottom: 10px; + 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; + border-radius: 3px: + + z-index: 100; +} +#interactive_block a.reset:hover { + background-color: #dedcdc; +} +#canvas_wrapper { + position: absolute; + width: 100%; + height: 100%; + + top: 0; + left: 0; +} +.block_wrapper { + font-size: 0; +} +.block { + float: left; + display: block; + + margin-left: 10px; + + border: 1px solid silver; +} +.block .head { + display: block; + + text-align: center; + line-height: 20px; + font-weight: bold; + + border-bottom: 1px solid silver; + background-color: #ececec; +} +.block.info { + display: inline-block; + margin-bottom: 10px; + + vertical-align: top; + font-size: 12px; + + border: 1px solid silver; +} +.tab-setup .block.info .fields { + padding: 5px 5px 3px 5px; +} +.tab-setup .block.info dt { + float: left; + + width: 99px; + height: 20px; + line-height: 20px; +} +.tab-setup .block.info dd { + width: 76px; + height: 20px; + line-height: 20px; + + margin-left: 99px; +} +.tab-setup .block.gps { + width: 185px; + margin-bottom: 10px; +} +.tab-setup .block.gps .fields { + padding: 5px 5px 3px 5px; +} +.tab-setup .block.gps dt { + float: left; + + width: 85px; + height: 20px; + + margin-bottom: 2px; + + line-height: 20px; +} + +.block.instruments { + width: 285px; + align-content:center; + text-align:center; + ma +} +.buttons { + width: calc(100% - 20px); + + position: absolute; + bottom: 10px; +} +.update { + display: block; + float: right; + + height: 28px; + line-height: 28px; + + padding: 0 15px 0 15px; + + text-align: center; + font-weight: bold; + + border: 1px solid silver; + background-color: #ececec; +} +.tab-setup .update:hover { + background-color: #dedcdc; +} + +.cell_setup { + border-bottom: solid 1px #ddd; + padding-bottom:8px; + padding-top:7px; + } + + + + + + + + /* Colums START> */ + +.cf_column { + margin-bottom:20px; + + } + + +.full { + float:left; + width:100%; + } + +.half { + float:left; + width:50%; + } + + + +.third_left { + float:left; + width:33%; + } + +.third_center { + display: inline-block; + width:34%; + } + +.third_right { + float:right; + width:33%; + } + + +.fourth { + float:left; + width:25%; + } + + +.threefourth_right { + float:right; + width:75%; + } + +.threefourth_left { + float:left; + width:75%; + } + +.twothird { + float:left; + width:67%; + } + + \ No newline at end of file diff --git a/tabs/setup_new.html b/tabs/setup_new.html new file mode 100644 index 00000000..15847c9a --- /dev/null +++ b/tabs/setup_new.html @@ -0,0 +1,141 @@ + +
+
+ +
+
Setup +
+
+ +
+ +
+
+
+
+
+ +
+
+
+
+
+
+ +
+ +
+
+
+
+
+
+ +
+ + + +
+ +
+ +
+
+
+ +
+ + + +
+
+
Heading:
 
+
Pitch:
 
+
Roll:
 
+
+
+ + + + + +
+ +
+ +
+
+
+ + + + + + + + + + + + + + + + + + + +
0 V
0 mAh
0.00 A
0 %
+ + + +
+
+
+ + + + + + + + + + + + + + + + + + + +
+ + +
+
+
+ + + + + +
+ + + + +
+ + + + + + + + + + +