From 36ccf377f54a4fa5290044ede87f4396ea7222df Mon Sep 17 00:00:00 2001 From: Christian Maierhofer Date: Mon, 12 Oct 2015 08:56:48 +0200 Subject: modify web-config --- id/ConfigWebTool/src/main/webapp/css/index.css | 305 +++++++++++++++++++++---- 1 file changed, 255 insertions(+), 50 deletions(-) (limited to 'id/ConfigWebTool/src/main/webapp/css/index.css') diff --git a/id/ConfigWebTool/src/main/webapp/css/index.css b/id/ConfigWebTool/src/main/webapp/css/index.css index 2c7a880f0..8c0b567f1 100644 --- a/id/ConfigWebTool/src/main/webapp/css/index.css +++ b/id/ConfigWebTool/src/main/webapp/css/index.css @@ -1,29 +1,58 @@ @CHARSET "UTF-8"; +html{ + margin:0; + padding:0; +} + body { - font-size: 1em; + margin:0; + padding:0; + font-size: 1.2em; + font-family: 'Open Sans', sans-serif; + left:0; + width:100%; + position:absolute; + color: #303030; + box-sizing:none; } -#header_area { - padding-bottom: 10px; - background-color: #6FA5D4; - display: block; +.label{ + font-weight:normal; font-size: 1.2em; - /* margin-left: 25px; */ - padding-top: 10px; - padding-left: 25px; - border-radius: 3px; +} + +h2{ + font-size:1.8em; + font-weight: normal; +} +h3{ + font-size:1.5em; + font-weight: normal; +} +h4{ + font-size:1.4em; + font-weight: normal; +} +h5{ + font-size:1.3em; + font-weight: normal; + margin-bottom:1px; + padding-top:10px; } #header_area { + background-color: #EEEEEE; + display: block; font-size: 1.2em; - margin-left: 25px; - padding-top: 8px; + height: 40px; + padding-top:5px; + padding-left:20px; } + #header_area #logoutbutton { float: right; - /*padding-right: 25px;*/ } #passwordlogin { @@ -56,46 +85,54 @@ body { #menu_area { margin-top: 25px; - border-color: black; - border-style: solid; - border-width: 2px; - width: 250px; - margin-left: 15px; + width: 300px; + margin-left: 0px; position: relative; - padding-left: 15px; - padding-top: 10px; + padding-left: 0px ; + padding-top: 3px; float: left; - /* background-color: gray; */ - background-color: #CACACA; - border-radius: 5px; } - .menu_element { - margin-top: 15px; - margin-bottom: 15px; - font-size: 1.2em; + margin-top: 5px; + margin-bottom: 5px; display: block; -/* background-color: red; */ - background-color: #6FA5D4; margin-right: 18px; margin-top: 5px; height: 30px; - border-radius: 10px; + border-radius: 0px; padding-top: 5px; + padding-left:20px; + margin-left:0px; } +.menu_element:HOVER { + background-color: #EEEEEE; +} .menu_element>a { - padding: 5px; - margin-left: 5px; + padding: auto; + text-decoration: none; + color: #303030; + outline:0; + font-size: 1.4em; } + #information_area { float: left; padding-left: 25px; - padding-top: 25px; + padding-top: 16px; + width:auto; +} + +#right_area { + float: right; + padding-bottom: 10px; + padding-left: 10px; + padding-right: 30px; + padding-top: 4px; } -#language_area { +#nameField{ float: right; padding-bottom: 10px; padding-left: 10px; @@ -129,13 +166,48 @@ body { margin-top: 25px; margin-bottom: 50px; clear: both; - padding-left: 70px; + padding-left: 0px; } #button_area input { float: left; - margin-left: 40px; - width: 225px; + margin-left: 0px; + margin-right:20px; + width: 280px; + + background-color:#2dabf9; + border:none; + display:inline-block; + cursor:pointer; + color:#ffffff; + font-family:Arial; + font-size:15px; + padding:5px 0px; + text-decoration:none; +} + +#button_area input:hover { + background-color:#0688fa; +} +#button_area input:active { + position:relative; +} + +#loadOA_formOA_bkuSelectionFileUpload input{ + float: left; + margin-left: 0px; + margin-right:20px; + width: 280px; + + background-color:#2dabf9; + border:none; + display:inline-block; + cursor:pointer; + color:#ffffff; + font-family:Arial; + font-size:15px; + padding:5px 0px; + text-decoration:none; } #button_saml1_hidden { @@ -153,6 +225,7 @@ body { #formcustom_button_show { margin-bottom: 50px; clear: both; + } #formcustom_area { @@ -175,8 +248,8 @@ body { .oa_protocol_area { clear: both; - margin-left: 25px; - padding-top: 20px; + margin-left: 0px; + padding-top: 0px; } .hidden { @@ -186,9 +259,10 @@ body { .floatClass > .wwgrp { clear: none; } +#oa_search_symbol{ + font-size: 2em; + text-decoration:none; -.oa_protocol_area >h4 { - margin-left: 10px; } .oa_protocol_area >h5 { @@ -198,8 +272,12 @@ body { } .oa_config_block { - padding-left: 15px; + /*padding-left: 15px;*/ clear: both; + border-bottom: 1px solid #ddd; + display:block; + overflow:auto; + padding-bottom:10px; } /* .oa_config_block label{ @@ -212,6 +290,7 @@ body { .oa_config_block label.radio{ text-align: left; + padding-left:5px; width: 170px; } @@ -224,6 +303,8 @@ body { .oa_config_block input.radio{ margin-top: 6px; + margin-left:0px; + vertical-align: text-bottom; } @@ -243,12 +324,8 @@ body { .moageneral_protocol_area { clear: both; - margin-left: 25px; } -.moageneral_protocol_area>h4 { - margin-left: 10px; -} #moageneral_active_protocol>.wwgrp { float: left; @@ -260,10 +337,10 @@ body { } .wwlbl { - float: left; + float: left; padding-right: 10px; - padding-top: 3px; - text-align: right; + padding-top: 5px; + text-align: left; width: 300px; } @@ -272,6 +349,7 @@ body { padding-bottom: 5px; padding-top: 1px; text-align: left; + padding-left:50px; } .wwgrp { @@ -321,15 +399,39 @@ div .wwgrp br { width: 80px; float: left; margin-right: 5px; + background: transparent; + overflow: hidden; + border: 1px solid #ccc; + text-decoration:none; } .checkbox{ margin-top: 7px; + margin-left:0px; } .oa_buttons{ float: left; - margin-left: 100px; + margin-right: 20px; + width:280px; + background-color:#2dabf9; + border:none; + display:inline-block; + cursor:pointer; + color:#ffffff; + font-family:Arial; + font-size:15px; + padding:5px 23px; + text-decoration:none; + +} + +.oa_buttons:hover { + background-color:#0688fa; +} +.oa_buttons:active { + position:relative; + top:1px; } #list_area { @@ -403,7 +505,7 @@ div .wwgrp br { } #footer_area { - background-color: #6FA5D4; + clear: both; display: block; /* height: 40px; */ @@ -417,3 +519,106 @@ div .wwgrp br { padding-top: 10px; border-radius: 3px; } + +/*drop down menu */ + + +#drop_down_menu { + position: fixed; + overflow: hidden; + z-index: -1; + opacity: 0; + width: 200px; + height: 150px; + right:20px; + top: 40px; + background: rgba(0,0,0,0.8); + -webkit-transition: all 0.3s ease-in-out; + -moz-transition: all 0.3s ease-in-out; + -o-transition: all 0.3s ease-in-out; + transition: all 0.3s ease-in-out; + color: #fff; +} + +#drop_down_menu ul { + top: 10px; + -webkit-transition: all 0.3s ease-in-out; + -moz-transition: all 0.3s ease-in-out; + -o-transition: all 0.3s ease-in-out; + transition: all 0.3s ease-in-out; + padding-left:10px; +} + +#drop_down_menu li { + display: inline-block; + margin: 2px; +} + +#drop_down_menu:hover { + opacity:1; + z-index:1000; +} + +#drop_down_menu ul li a { + text-decoration: none; + font-size: 1.1em; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} + +#drop_down_menu li a:hover { border-color: #fff; } + +#toggleMenu{ + text-decoration: none; + font-size:1.2em; + color: #303030; +} + +#toggleMenu:hover ~ #drop_down_menu{ + opacity:1; + z-index:1000; +} + +#flag_at{ + position:absolute; + left: 10px; + bottom:20px; +} + +#flag_en{ + position:absolute; + left: 50px; + bottom:20px; +} + +#logout_button{ + position:absolute; + right: 20px; + bottom:20px; +} + +.general_conf_buttons{ + float: left; + margin-right: 10px; + width:100px; + background-color:#2dabf9; + border:none; + display:inline-block; + cursor:pointer; + color:#ffffff; + font-family:Arial; + font-size:15px; + padding:2px 5px; + text-decoration:none; + +} + +.general_conf_buttons:hover { + background-color:#0688fa; +} +.general_conf_buttons:active { + position:relative; + top:1px; +} -- cgit v1.2.3 From 16bb1e9b6d7bcad60335ab5b3ce84c7a950c525b Mon Sep 17 00:00:00 2001 From: Christian Maierhofer Date: Mon, 12 Oct 2015 11:52:44 +0200 Subject: added css and js files to all jsps --- id/ConfigWebTool/src/main/webapp/css/index.css | 81 +++++++++++++++++++++----- 1 file changed, 65 insertions(+), 16 deletions(-) (limited to 'id/ConfigWebTool/src/main/webapp/css/index.css') diff --git a/id/ConfigWebTool/src/main/webapp/css/index.css b/id/ConfigWebTool/src/main/webapp/css/index.css index 8c0b567f1..ae5f2537a 100644 --- a/id/ConfigWebTool/src/main/webapp/css/index.css +++ b/id/ConfigWebTool/src/main/webapp/css/index.css @@ -45,9 +45,10 @@ h5{ background-color: #EEEEEE; display: block; font-size: 1.2em; - height: 40px; + height: 50px; padding-top:5px; padding-left:20px; + padding-top: 10px; } @@ -87,8 +88,8 @@ h5{ margin-top: 25px; width: 300px; margin-left: 0px; - position: relative; - padding-left: 0px ; + position: absolute; + padding-left: 0px; padding-top: 3px; float: left; } @@ -126,12 +127,27 @@ h5{ #right_area { float: right; + width:auto; padding-bottom: 10px; padding-left: 10px; padding-right: 30px; padding-top: 4px; } +#left_area { + float: left; + width:auto; + padding-left: 10px; + padding-right: 30px; + padding-top: 0px; + margin-top:-5px; +} + +#left_area h2{ + padding-top:0px; + margin-top:0px; +} + #nameField{ float: right; padding-bottom: 10px; @@ -173,7 +189,8 @@ h5{ float: left; margin-left: 0px; margin-right:20px; - width: 280px; + margin-bottom:10px; + width: 290px; background-color:#2dabf9; border:none; @@ -197,7 +214,7 @@ h5{ float: left; margin-left: 0px; margin-right:20px; - width: 280px; + width: 290px; background-color:#2dabf9; border:none; @@ -309,7 +326,7 @@ h5{ .oa_config_block h3 { - padding-top: 25px; + padding-top: 10px; } .oa_config_block h4 { @@ -386,7 +403,10 @@ div .wwgrp br { .textfield_long { width: 600px; - +} + +.textfield_300px{ + width: 300px; } .textfield_large{ @@ -413,7 +433,7 @@ div .wwgrp br { .oa_buttons{ float: left; margin-right: 20px; - width:280px; + width:290px; background-color:#2dabf9; border:none; display:inline-block; @@ -445,7 +465,7 @@ div .wwgrp br { padding-top: 5px; padding-right: 10px; border-bottom: 1px; - border-color: red; + border-color: #ddd; border-bottom-style: solid; clear: both; } @@ -454,8 +474,9 @@ div .wwgrp br { cursor: default; border-bottom-style: none; display: table-header-group; - font-weight: bold; - font-size: 1.1em; + font-weight: normal; + font-size: 1.3em; + margin-top: 50px; } .listElInfo { @@ -574,6 +595,7 @@ div .wwgrp br { text-decoration: none; font-size:1.2em; color: #303030; + margin-right: 15px; } #toggleMenu:hover ~ #drop_down_menu{ @@ -595,11 +617,13 @@ div .wwgrp br { #logout_button{ position:absolute; - right: 20px; + right: 10px; bottom:20px; + text-decoration:none; + color:white; } -.general_conf_buttons{ +.button_narrow{ float: left; margin-right: 10px; width:100px; @@ -612,13 +636,38 @@ div .wwgrp br { font-size:15px; padding:2px 5px; text-decoration:none; - + margin-bottom: 3px; } -.general_conf_buttons:hover { +.button_narrow:hover { background-color:#0688fa; } -.general_conf_buttons:active { +.button_narrow:active { position:relative; top:1px; } + +.button_fit{ + + margin-right: 0px; + background-color:#2dabf9; + border:none; + display:inline-block; + cursor:pointer; + color:#ffffff; + font-family:Arial; + font-size:15px; + padding:2px 10px; + text-decoration:none; + margin-bottom: 3px; +} + +.button_fit:hover { + background-color:#0688fa; +} +.button_fit:active { + position:relative; + top:1px; +} + + -- cgit v1.2.3 From b71fe922ed87b24c9f023319c23dc9f17bc3283d Mon Sep 17 00:00:00 2001 From: Christian Maierhofer Date: Wed, 14 Oct 2015 12:51:28 +0200 Subject: modified login page --- id/ConfigWebTool/src/main/webapp/css/index.css | 28 +++++--------------------- 1 file changed, 5 insertions(+), 23 deletions(-) (limited to 'id/ConfigWebTool/src/main/webapp/css/index.css') diff --git a/id/ConfigWebTool/src/main/webapp/css/index.css b/id/ConfigWebTool/src/main/webapp/css/index.css index ae5f2537a..6e07a76ec 100644 --- a/id/ConfigWebTool/src/main/webapp/css/index.css +++ b/id/ConfigWebTool/src/main/webapp/css/index.css @@ -61,27 +61,9 @@ h5{ } #bkulogin { - float: left; - margin-left: 50px; -} - -#bkuloginbutton { - background:-moz-linear-gradient(bottom,#b3b3b3,#f1f1f1); /* Firefox */ - background:-webkit-gradient(linear,left top,left bottom,from(#b3b3b3),to(#f1f1f1)); /* Chrome, Safari */ - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#b3b3b3',endColorstr='#f1f1f1'); - - display: block; - padding-top: 10px; - padding-bottom: 10px; - text-align: center; - width: 200px; - /* background-color: gold; */ - border-radius: 10px; - box-shadow: 8px 8px 8px #666; - border-style: solid; - border-color: black; - border-width: 2px; - + float: right; + margin-left: 0px; + padding-top:5px; } #menu_area { @@ -102,7 +84,7 @@ h5{ height: 30px; border-radius: 0px; padding-top: 5px; - padding-left:20px; + padding-left:30px; margin-left:0px; } @@ -441,7 +423,7 @@ div .wwgrp br { color:#ffffff; font-family:Arial; font-size:15px; - padding:5px 23px; + padding:5px 10px; text-decoration:none; } -- cgit v1.2.3 From 0e55c7882ce4ed4fcb28e60c94dea6b325462ba5 Mon Sep 17 00:00:00 2001 From: Christian Maierhofer Date: Thu, 15 Oct 2015 08:53:08 +0200 Subject: webgui fixing for smaller screens --- id/ConfigWebTool/src/main/webapp/css/index.css | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'id/ConfigWebTool/src/main/webapp/css/index.css') diff --git a/id/ConfigWebTool/src/main/webapp/css/index.css b/id/ConfigWebTool/src/main/webapp/css/index.css index 6e07a76ec..4cbfba19b 100644 --- a/id/ConfigWebTool/src/main/webapp/css/index.css +++ b/id/ConfigWebTool/src/main/webapp/css/index.css @@ -104,6 +104,7 @@ h5{ float: left; padding-left: 25px; padding-top: 16px; + padding-bottom: 25px; width:auto; } @@ -340,7 +341,7 @@ h5{ padding-right: 10px; padding-top: 5px; text-align: left; - width: 300px; + width: 280px; } .wwctrl { @@ -652,4 +653,14 @@ div .wwgrp br { top:1px; } +.checkboxLabel{ + padding-left:5px; + padding-right:5px; +} +#stork_attributelist .wwctrl{ + padding-left:0px; +} +#stork_attributelist .wwctrl input[type="checkbox"]{ + margin-left:20px; +} -- cgit v1.2.3