From a5f60b6dfb263d2bb7a2ce33bd04cbeb7d95a303 Mon Sep 17 00:00:00 2001 From: skaman82 Date: Fri, 23 Oct 2015 07:03:02 +0200 Subject: [PATCH] Some work on configuration tab --- main.css | 48 +++++++++++++++++--------------- main.html | 2 +- tabs/setup.css | 74 +++++++++++++++++++++++-------------------------- tabs/setup.html | 48 ++++++++++++++------------------ 4 files changed, 81 insertions(+), 91 deletions(-) diff --git a/main.css b/main.css index 030d12bf..5273a73d 100755 --- a/main.css +++ b/main.css @@ -21,6 +21,30 @@ body { +/* Help-Icon */ + +.helpicon { + float:right; + margin-top:-18px; + margin-right:7px; + display:block; + height:14px; + width:14px; + opacity: 0.2; + background-image:url(images/icons/cf_icon_info_grey.svg); + background-size:contain; + background-position:center; + +} + + +.helpicon:hover { + opacity: 1.0; + background-image:url(images/icons/cf_icon_info_green.svg); +} + + + /* Change here the content of the documentation button in all tabs!!! */ .cf_doc_version_bt a:before { @@ -739,29 +763,7 @@ dialog { } - /* Help Icon */ - - -.helpicon { - float:right; - margin-top:-14px; - margin-right:7px; - display:block; - height:14px; - width:14px; - opacity: 0.2; - background-image:url(rescources/icons/cf_icon_info_grey.svg); - background-size:contain; - background-position:center; - -} - - - - -.helpicon:hover { - background-image:url(rescources/icons/cf_icon_info_green.svg); - opacity: 1.0;} + /* Table styling */ diff --git a/main.html b/main.html index 2fd57961..fe52f0a5 100755 --- a/main.html +++ b/main.html @@ -10,7 +10,7 @@ - + diff --git a/tabs/setup.css b/tabs/setup.css index ddaf0cc4..ba0ef446 100644 --- a/tabs/setup.css +++ b/tabs/setup.css @@ -1,36 +1,28 @@ .tab-setup .model-and-info { - height: calc(100% - 138px); + height: calc(100% - 155px); } - .tab-setup { height: 100%; - background-color:#ccc; } -.cell_setup { -min-height:20px; -border-bottom: solid 1px #ddd; -margin-bottom:13px; -float:left;} -.tab-setup #interactive_block { - float: left; - position: relative; +#interactive_block { + position: absolute; + width:calc(71% + 8px); + height:100%; + max-height:417px; + background-color:#f5f5f5; + border-radius: 5px; + border:1px solid #e4e4e4; - height: 100%; - width: calc(100% - 0px); - - border: 1px solid silver; - background-color: white; } -.tab-setup #interactive_block .heading { - float: right; - height: 15px; - - margin: 10px 10px 0 0; +.heading_info { + position:absolute; + height: 25px; + margin: 10px 0px 10px 10px; font-weight: bold; } -.tab-setup #interactive_block a.reset { +#interactive_block a.reset { position: absolute; display: block; @@ -47,25 +39,25 @@ float:left;} border: 1px solid silver; background-color: #ececec; + border-radius: 3px: z-index: 100; } -.tab-setup #interactive_block a.reset:hover { +#interactive_block a.reset:hover { background-color: #dedcdc; } -.tab-setup #canvas_wrapper { +#canvas_wrapper { position: absolute; - width: 100%; height: 100%; top: 0; left: 0; } -.tab-setup .block_wrapper { +.block_wrapper { font-size: 0; } -.tab-setup .block { +.block { float: left; display: block; @@ -73,7 +65,7 @@ float:left;} border: 1px solid silver; } -.tab-setup .block .head { +.block .head { display: block; text-align: center; @@ -83,7 +75,7 @@ float:left;} border-bottom: 1px solid silver; background-color: #ececec; } -.tab-setup .block.info { +.block.info { display: inline-block; margin-bottom: 10px; @@ -126,24 +118,20 @@ float:left;} line-height: 20px; } -.tab-setup .block.gps dd { - height: 20px; - margin-left: 85px; - margin-bottom: 2px; - - line-height: 20px; +.block.instruments { + width: 285px; + align-content:center; + text-align:center; + ma } -.tab-setup .block.instruments { - width: 185px; -} -.tab-setup .buttons { +.buttons { width: calc(100% - 20px); position: absolute; bottom: 10px; } -.tab-setup .update { +.update { display: block; float: right; @@ -161,3 +149,9 @@ float:left;} .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 index 290b1327..aab2952f 100644 --- a/tabs/setup.html +++ b/tabs/setup.html @@ -23,31 +23,28 @@ -
-
-
-
-
-
+
+
+
+
+
+
-
+
-
- -
+
-
+
- +
-
@@ -107,7 +104,7 @@
-
+
@@ -117,19 +114,16 @@ - - - - - - - - - - - - -
+ + + + + + + + + +