From: Moritz Bunkus Date: Tue, 8 Nov 2016 10:28:22 +0000 (+0100) Subject: ActionBar: CSS: Styling für kivitendo-Stylesheet X-Git-Tag: release-3.5.4~1376 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=c2091a1cf8f09e53d7b136aa02d033f95e0570d5;p=kivitendo-erp.git ActionBar: CSS: Styling für kivitendo-Stylesheet --- diff --git a/css/kivitendo/dhtmlsuite/menu-bar.css b/css/kivitendo/dhtmlsuite/menu-bar.css index 7bdc15fde..9ae0fc3d6 100644 --- a/css/kivitendo/dhtmlsuite/menu-bar.css +++ b/css/kivitendo/dhtmlsuite/menu-bar.css @@ -16,21 +16,17 @@ ************************************************************************************************************/ .DHTMLSuite_menuBar_top{ /* The bar that is parent of the menu strip */ - height:26px; - width:100%; - background-repeat:repeat-x; - font-family: sans-serif, Verdana, Arial, Helvetica; - font-size:12px; - z-index:100000; - padding-left:10px; + position: fixed; + height: 26px; + width: 100%; + z-index: 100; + padding-left: 10px; + background-color: white; } .DHTMLSuite_menuBar_sub{ - position:absolute; - background-color:#FFF; - border:1px solid #D1D1D1; - background-repeat:repeat-y; - background-position: left center; - display:inline; + position: fixed; + background-color: #FFF; + border: 1px solid #000; + display: inline; } - diff --git a/css/kivitendo/dhtmlsuite/menu-item.css b/css/kivitendo/dhtmlsuite/menu-item.css index c3a09f089..8bfe131f9 100644 --- a/css/kivitendo/dhtmlsuite/menu-item.css +++ b/css/kivitendo/dhtmlsuite/menu-item.css @@ -20,7 +20,7 @@ .DHTMLSuite_menuItem_top_over{ /* Top level menu item - Mouse over state */ color:#FE5F14; - background-color:#D1D1D1; + background-color:whitesmoke; cursor:pointer; } @@ -30,7 +30,7 @@ .DHTMLSuite_menuItem_top_click{ /* Top level menu item - Mouse click state */ color:#FE5F14; - background-color:#D1D1D1; + background-color:whitesmoke; cursor:pointer; z-index:20000; } @@ -119,12 +119,12 @@ .DHTMLSuite_menuItem_sub_over,.DHTMLSuite_menuItem_sub_active{ /* Mouse over effect */ color:#FE5F14; - background-color:#D1D1D1; + background-color:whitesmoke; } .DHTMLSuite_menuItem_sub_click{ /* Mouse click effect */ color:#FE5F14; - background-color:#D1D1D1; + background-color:whitesmoke; } .DHTMLSuite_menuItem_sub_click div, .DHTMLSuite_menuItem_sub_regular div,.DHTMLSuite_menuItem_sub_over div,.DHTMLSuite_menuItem_sub_active div,.DHTMLSuite_menuItem_sub_disabled div{ /* divs for the text,icon and arrow of a menu item */ @@ -152,7 +152,7 @@ margin-left:24px; /* left margin because we don't want the separator to cover the gradient */ padding-right:3px; /* space at the right of the separator */ color:#FE5F14; - background-color:#D1D1D1; + background-color:whitesmoke; } .DHTMLSuite_menuItem_textContent diff --git a/css/kivitendo/frame_header/header.css b/css/kivitendo/frame_header/header.css index 029ca5c99..6eda3f01a 100644 --- a/css/kivitendo/frame_header/header.css +++ b/css/kivitendo/frame_header/header.css @@ -11,10 +11,18 @@ padding: 0; border: 0; overflow: hidden; - min-height: 20px; + height: 20px; width: 100%; border-spacing: 0; font-size: 12px; + position: fixed; + top: 0; + z-index: 40; + background-color: white; +} + +#frame-header + div { + padding-top: 20px; } #frame-header .frame-header-left { diff --git a/css/kivitendo/main.css b/css/kivitendo/main.css index 0a90bc819..a4ef71f00 100644 --- a/css/kivitendo/main.css +++ b/css/kivitendo/main.css @@ -89,7 +89,7 @@ A:link, A:visited, A:active { } a:hover { color: #FE5F14; - background-color: #D1D1D1; + background-color: whitesmoke; } a.selected:hover { color:#EBEBEB; @@ -528,3 +528,47 @@ span.toggle_selected { background-color: #006400; color: #FFFFFF; } + +/* actionbar styling */ +div.layout-actionbar { + background-color: white; +} + +div.layout-actionbar div.layout-actionbar-submit, +div.layout-actionbar div.layout-actionbar-scriptbutton, +div.layout-actionbar div.layout-actionbar-submit:focus, +div.layout-actionbar div.layout-actionbar-scriptbutton:focus { + border-color: darkgray; + background-color: whitesmoke; +} + +div.layout-actionbar div.layout-actionbar-submit:hover, +div.layout-actionbar div.layout-actionbar-scriptbutton:hover { + color: #FE5F14; + border-color: gray !important; +} + +div.layout-actionbar div.layout-actionbar-action-disabled, +div.layout-actionbar div.layout-actionbar-action-disabled:hover { + color: gray; + background-color: whitesmoke; + border-color: lightgray; +} + +div.layout-actionbar-combobox div.layout-actionbar-combobox-head span { + border-color: darkgray; + background-color: whitesmoke; +} + +div.layout-actionbar-combobox div.layout-actionbar-combobox-head span:hover { + color: #FE5F14; +} + +div.layout-actionbar-combobox div.layout-actionbar-combobox-head span:after { + border-color: black transparent; +} + +div.layout-actionbar-combobox div.layout-actionbar-combobox-head span:hover:after { + color: #FE5F14; + border-color: #FE5F14 transparent; +} diff --git a/css/kivitendo/menu.css b/css/kivitendo/menu.css index 168a021b2..ccab8420d 100644 --- a/css/kivitendo/menu.css +++ b/css/kivitendo/menu.css @@ -4,6 +4,21 @@ orangemenu color #FFFFFF whiteMenu Hover background color #FFFFE0 DarkGreensubenu pointer */ +/* #main_menu_div { */ +/* background-color: #d0cfc9 */ +/* } */ + +#main_menu_div ~ div.layout-actionbar { + top: 45px; +} + +#main_menu_div ~ #content { + padding-top: 25px; +} +#main_menu_div ~ div.layout-actionbar ~ #content { + padding-top: 54px; +} + body.menuv3 { behavior: url("css/csshover.htc"); /*font-size: 14pt;*/ @@ -13,13 +28,25 @@ body.menuv3 { color: #000000; } #menuv3 { - /*font-size: 85%;*/ - width: 99.8%; - float: left; - /*border: 3px solid;*/ background-color: #FFFFFF; color: #000000; + width: 100%; + position: fixed; + z-index: 30; } + +#menuv3 ~ div.layout-actionbar { + top: 40px; +} + +#menuv3 ~ #content { + padding-top: 35px; +} + +#menuv3 ~ div.layout-actionbar ~ #content { + padding-top: 64px; +} + #menuv3 a, #menuv3 h2, #menuv3 div.x { font-size: 80%; line-height: 120%; @@ -80,6 +107,7 @@ body.menuv3 { position: relative; float: none; border: 0; + border-width:0 0 1px 0; } li.sub { position: relativ; @@ -106,7 +134,6 @@ li.sub { #menuv3 ul ul { position: absolute; z-index: 500; - top: auto; display: none; } #menuv3 ul ul ul { @@ -126,7 +153,6 @@ div#menuv3 h2:hover { } div#menuv3 li:hover { cursor: pointer; - z-index: 100; } div#menuv3 li:hover ul ul, div#menuv3 li li:hover ul ul, div#menuv3 li li li:hover ul ul, div#menuv3 li li li li:hover ul ul { display: none;