diff --git a/etemplate/templates/default/etemplate2.css b/etemplate/templates/default/etemplate2.css index 8daf7ad066..d539a30576 100644 --- a/etemplate/templates/default/etemplate2.css +++ b/etemplate/templates/default/etemplate2.css @@ -1580,7 +1580,7 @@ div.ms-sel-ctn .ms-sel-item { background-size: 16px 16px; border-radius: 3px; padding-left: 0; - background-color: #fafafa; + background-color: #f0f0f0; } .et2_toolbar .et2_toolbar_actionlist button.et2_button_with_image.et2_toolbar_hasCaption { width:auto; @@ -1771,7 +1771,7 @@ span.et2_checkbox_slideSwitch > span.slideSwitch_container > span:first-child { text-align: -moz-center; position: absolute; left:0; - + font-weight: bold; color:#C0C0C0; top: 5px; @@ -2213,11 +2213,11 @@ td.avatar { background-size: 35px 35px; background-repeat: no-repeat; background-position: center; - + bottom:25%; top:25%; } .avatar img{ padding-top:0 !important; width:50px; -} \ No newline at end of file +} diff --git a/phpgwapi/templates/default/def_content_elements.less b/phpgwapi/templates/default/def_content_elements.less index 95ef616cd0..cd6cf85599 100755 --- a/phpgwapi/templates/default/def_content_elements.less +++ b/phpgwapi/templates/default/def_content_elements.less @@ -36,7 +36,7 @@ html * { body{ background-image:none; - .background-color-10-gray; + .background-color-0-gray; .color-100-gray; // Schriftfarbe schwarz margin: 0px !important; diff --git a/pixelegg/css/mobile.css b/pixelegg/css/mobile.css index 663e89d7b1..6451936370 100644 --- a/pixelegg/css/mobile.css +++ b/pixelegg/css/mobile.css @@ -587,13 +587,13 @@ top: 6px; } .et2_nextmatch { - background-color: #f0f0f0; + background-color: transparent; } .et2_nextmatch .nextmatch_header { padding: 5px; border: none; background-image: none; - background-color: #cdcdcd; + background-color: transparent; } .et2_nextmatch .nextmatch_header_row { padding-bottom: 6px; @@ -602,9 +602,6 @@ width: 16px; height: 16px; } - .ui-helper-clearfix { - background-color: #cdcdcd; - } /*################################################################ * * ADD BUTTON for Infolog View in ADDRESSBOOK @@ -726,11 +723,12 @@ .nextmatch_header_row > .search input { /*.background_color_search;*/ /*background-color: @gray_0;*/ - border: none; font-size: 11px; color: #000000; padding: 3px; width: 150px; + border-color: #696969; + border-right: none; } .nextmatch_header_row > .search input::-webkit-input-placeholder { /* WebKit browsers */ @@ -802,6 +800,7 @@ ################################################################*/ .nextmatch_header_row .et2_label select { margin-left: 3px; + border-color: #cdcdcd; } .nextmatch_header_row > .filters { /*width: 83%;*/ @@ -2166,7 +2165,7 @@ html { } body { background-image: none; - background-color: #f0f0f0; + background-color: #ffffff; color: #000000; margin: 0px !important; padding: 0px !important; @@ -3173,7 +3172,7 @@ textarea { padding: 0px; margin: 0px; font-family: Verdana, "Lucida Grande", Helvetica, Sans-Serif; - background-color: #fafafa; + background-color: #ffffff; } input { /* .Complete_Button_input; @@ -4065,10 +4064,9 @@ div#egwpopup_message { background: #ffffff; } .egw_fw_ui_app_header_container { - border-width: 9px 0px 0px 0px; + border-width: 1px 0px 0px 0px; border-style: solid; border-color: #b4b4b4; - background-color: #cdcdcd; height: auto; } .egw_fw_ui_app_header_container .egw_fw_ui_app_header { @@ -4492,7 +4490,7 @@ td.message span.message { border-bottom-left-radius: 0; border-top-left-radius: 5px; /*.background-clip(padding-box);*/ - background: transparent; + background-color: #d9d9d9; display: inline-block; overflow: hidden; white-space: nowrap; @@ -4555,8 +4553,9 @@ td.message span.message { #egw_fw_main #egw_fw_tabs .egw_fw_ui_tabs_header .egw_fw_ui_tab_header_active { border-width: 1px 1px 0px 1px !important; /*padding: 0 0 5px !important;*/ - background-color: #b3b3b3 !important; + background-color: #ffffff; background-image: none !important; + padding-bottom: 8px; /*aktive Objekte*/ } #egw_fw_main #egw_fw_tabs .egw_fw_ui_tabs_header .egw_fw_ui_tab_header_active:hover { @@ -4651,7 +4650,7 @@ td.message span.message { top: 0px; bottom: 4px; left: 4px; - right: 5px; + right: 8px; overflow: hidden; z-index: 0; padding-top: 0.6em; @@ -4659,6 +4658,7 @@ td.message span.message { } #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv { background-color: #fafafa; + border-radius: 5px; } #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv div.ui-sortable div { padding: 3px 0 1px 3px; @@ -4699,16 +4699,16 @@ td.message span.message { background-image: url("../images/clear.png"); background-position: 95% -3000px; background-repeat: no-repeat; - background-color: #f0f0f0; - -webkit-border-top-right-radius: 5px; + background-color: #ffffff; + -webkit-border-top-right-radius: 0px; -webkit-border-bottom-right-radius: 0px; -webkit-border-bottom-left-radius: 0px; -webkit-border-top-left-radius: 27px; - -moz-border-radius-topright: 5px; + -moz-border-radius-topright: 0px; -moz-border-radius-bottomright: 0px; -moz-border-radius-bottomleft: 0px; -moz-border-radius-topleft: 27px; - border-top-right-radius: 5px; + border-top-right-radius: 0px; border-bottom-right-radius: 0px; border-bottom-left-radius: 0px; border-top-left-radius: 27px; @@ -4792,14 +4792,12 @@ td.message span.message { /*.background-clip(padding-box);*/ border-color: #b4b4b4; border-style: solid; - border-width: 0px; + border-width: 1px; margin: 0 0 2em 0; /*######################*/ } #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_content:nth-last-of-type(-n+3) { - padding: 5px 0.3em 1.5em 0.3em; - margin: 0 0 10px 0; - background-color: #b3b3b3 !important; + background-color: #ffffff; -webkit-border-top-right-radius: 0; -webkit-border-bottom-right-radius: 0; -webkit-border-bottom-left-radius: 24px; @@ -4814,9 +4812,10 @@ td.message span.message { border-top-left-radius: 0; /*.background-clip(padding-box);*/ border-color: #b4b4b4; -} -#egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_content > div { - background-color: #b3b3b3 !important; + border-right: 0px; + margin-bottom: 10px; + border-top-color: white; + padding-top: 8px; } #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_content div.egw_fw_ui_category:nth-last-of-type(-n+3) { -webkit-border-top-right-radius: 0; @@ -4946,11 +4945,13 @@ td.message span.message { } #egw_fw_sidebar #egw_fw_splitter { position: absolute; - background-color: #b3b3b3 !important; - width: 5px; + width: 8px; top: 40px; bottom: 3px; right: 0px; + border-top: 1px solid; + border-left: 1px solid; + border-color: #b4b4b4; } #egw_fw_sidebar #egw_fw_splitter:hover { background-color: #ffc200; @@ -5069,7 +5070,7 @@ td.message span.message { background-image: url(../images/splitter_vert.png); background-position: center; background-repeat: no-repeat; - background-color: #b3b3b3 !important; + background-color: #ffffff; position: absolute; width: 5px; height: 100%; @@ -5103,6 +5104,7 @@ td.message span.message { border-top-left-radius: 0; /*.background-clip(padding-box);*/ border-color: #b4b4b4; + margin-bottom: 5px; } .egw_fw_ui_category_content img { height: 16px; @@ -5230,6 +5232,7 @@ td.message span.message { .egw_fw_ui_scrollarea { overflow: hidden; z-index: 0; + background-color: #ffffff; } .egw_fw_ui_scrollarea_button { position: absolute; @@ -5266,8 +5269,7 @@ td.message span.message { display: block; overflow-x: hidden; overflow-y: auto; - padding: 0 10px; - background-color: #cdcdcd; + padding-right: 10px; /* background-color: RGB(240, 240, 255);*/ } .egw_fw_content_browser_div_loading { diff --git a/pixelegg/css/pixelegg.css b/pixelegg/css/pixelegg.css index 9ae5ee2a3f..e22858d32b 100644 --- a/pixelegg/css/pixelegg.css +++ b/pixelegg/css/pixelegg.css @@ -576,13 +576,13 @@ top: 6px; } .et2_nextmatch { - background-color: #f0f0f0; + background-color: transparent; } .et2_nextmatch .nextmatch_header { padding: 5px; border: none; background-image: none; - background-color: #cdcdcd; + background-color: transparent; } .et2_nextmatch .nextmatch_header_row { padding-bottom: 6px; @@ -591,9 +591,6 @@ width: 16px; height: 16px; } - .ui-helper-clearfix { - background-color: #cdcdcd; - } /*################################################################ * * ADD BUTTON for Infolog View in ADDRESSBOOK @@ -715,11 +712,12 @@ .nextmatch_header_row > .search input { /*.background_color_search;*/ /*background-color: @gray_0;*/ - border: none; font-size: 11px; color: #000000; padding: 3px; width: 150px; + border-color: #696969; + border-right: none; } .nextmatch_header_row > .search input::-webkit-input-placeholder { /* WebKit browsers */ @@ -791,6 +789,7 @@ ################################################################*/ .nextmatch_header_row .et2_label select { margin-left: 3px; + border-color: #cdcdcd; } .nextmatch_header_row > .filters { /*width: 83%;*/ @@ -2155,7 +2154,7 @@ html { } body { background-image: none; - background-color: #f0f0f0; + background-color: #ffffff; color: #000000; margin: 0px !important; padding: 0px !important; @@ -3162,7 +3161,7 @@ textarea { padding: 0px; margin: 0px; font-family: Verdana, "Lucida Grande", Helvetica, Sans-Serif; - background-color: #fafafa; + background-color: #ffffff; } input { /* .Complete_Button_input; @@ -4054,10 +4053,9 @@ div#egwpopup_message { background: #ffffff; } .egw_fw_ui_app_header_container { - border-width: 9px 0px 0px 0px; + border-width: 1px 0px 0px 0px; border-style: solid; border-color: #b4b4b4; - background-color: #cdcdcd; height: auto; } .egw_fw_ui_app_header_container .egw_fw_ui_app_header { @@ -4481,7 +4479,7 @@ td.message span.message { border-bottom-left-radius: 0; border-top-left-radius: 5px; /*.background-clip(padding-box);*/ - background: transparent; + background-color: #d9d9d9; display: inline-block; overflow: hidden; white-space: nowrap; @@ -4544,8 +4542,9 @@ td.message span.message { #egw_fw_main #egw_fw_tabs .egw_fw_ui_tabs_header .egw_fw_ui_tab_header_active { border-width: 1px 1px 0px 1px !important; /*padding: 0 0 5px !important;*/ - background-color: #b3b3b3 !important; + background-color: #ffffff; background-image: none !important; + padding-bottom: 8px; /*aktive Objekte*/ } #egw_fw_main #egw_fw_tabs .egw_fw_ui_tabs_header .egw_fw_ui_tab_header_active:hover { @@ -4640,7 +4639,7 @@ td.message span.message { top: 0px; bottom: 4px; left: 4px; - right: 5px; + right: 8px; overflow: hidden; z-index: 0; padding-top: 0.6em; @@ -4648,6 +4647,7 @@ td.message span.message { } #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv { background-color: #fafafa; + border-radius: 5px; } #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv div.ui-sortable div { padding: 3px 0 1px 3px; @@ -4688,16 +4688,16 @@ td.message span.message { background-image: url("../images/clear.png"); background-position: 95% -3000px; background-repeat: no-repeat; - background-color: #f0f0f0; - -webkit-border-top-right-radius: 5px; + background-color: #ffffff; + -webkit-border-top-right-radius: 0px; -webkit-border-bottom-right-radius: 0px; -webkit-border-bottom-left-radius: 0px; -webkit-border-top-left-radius: 27px; - -moz-border-radius-topright: 5px; + -moz-border-radius-topright: 0px; -moz-border-radius-bottomright: 0px; -moz-border-radius-bottomleft: 0px; -moz-border-radius-topleft: 27px; - border-top-right-radius: 5px; + border-top-right-radius: 0px; border-bottom-right-radius: 0px; border-bottom-left-radius: 0px; border-top-left-radius: 27px; @@ -4781,14 +4781,12 @@ td.message span.message { /*.background-clip(padding-box);*/ border-color: #b4b4b4; border-style: solid; - border-width: 0px; + border-width: 1px; margin: 0 0 2em 0; /*######################*/ } #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_content:nth-last-of-type(-n+3) { - padding: 5px 0.3em 1.5em 0.3em; - margin: 0 0 10px 0; - background-color: #b3b3b3 !important; + background-color: #ffffff; -webkit-border-top-right-radius: 0; -webkit-border-bottom-right-radius: 0; -webkit-border-bottom-left-radius: 24px; @@ -4803,9 +4801,10 @@ td.message span.message { border-top-left-radius: 0; /*.background-clip(padding-box);*/ border-color: #b4b4b4; -} -#egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_content > div { - background-color: #b3b3b3 !important; + border-right: 0px; + margin-bottom: 10px; + border-top-color: white; + padding-top: 8px; } #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_content div.egw_fw_ui_category:nth-last-of-type(-n+3) { -webkit-border-top-right-radius: 0; @@ -4935,11 +4934,13 @@ td.message span.message { } #egw_fw_sidebar #egw_fw_splitter { position: absolute; - background-color: #b3b3b3 !important; - width: 5px; + width: 8px; top: 40px; bottom: 3px; right: 0px; + border-top: 1px solid; + border-left: 1px solid; + border-color: #b4b4b4; } #egw_fw_sidebar #egw_fw_splitter:hover { background-color: #ffc200; @@ -5058,7 +5059,7 @@ td.message span.message { background-image: url(../images/splitter_vert.png); background-position: center; background-repeat: no-repeat; - background-color: #b3b3b3 !important; + background-color: #ffffff; position: absolute; width: 5px; height: 100%; @@ -5092,6 +5093,7 @@ td.message span.message { border-top-left-radius: 0; /*.background-clip(padding-box);*/ border-color: #b4b4b4; + margin-bottom: 5px; } .egw_fw_ui_category_content img { height: 16px; @@ -5219,6 +5221,7 @@ td.message span.message { .egw_fw_ui_scrollarea { overflow: hidden; z-index: 0; + background-color: #ffffff; } .egw_fw_ui_scrollarea_button { position: absolute; @@ -5255,8 +5258,7 @@ td.message span.message { display: block; overflow-x: hidden; overflow-y: auto; - padding: 0 10px; - background-color: #cdcdcd; + padding-right: 10px; /* background-color: RGB(240, 240, 255);*/ } .egw_fw_content_browser_div_loading { diff --git a/pixelegg/less/etemplate2.less b/pixelegg/less/etemplate2.less index b04f3c93be..a8a094787f 100755 --- a/pixelegg/less/etemplate2.less +++ b/pixelegg/less/etemplate2.less @@ -522,7 +522,7 @@ div.header_row_right{ // AREA AROUND CONTENT .et2_nextmatch { - .background_color_10_gray; + background-color: transparent; } // complete nextmatch....Background color! @@ -530,7 +530,7 @@ div.header_row_right{ padding: 5px; border: none; background-image: none; - background-color: @gray_20; + background-color: transparent; } // complete nextmatch....Background color! @@ -546,7 +546,7 @@ div.header_row_right{ // area width left and right boxes -.ui-helper-clearfix{ background-color: @gray_20;} +.ui-helper-clearfix{} /*################################################################ * @@ -647,11 +647,12 @@ div.header_row_right{ input { /*.background_color_search;*/ /*background-color: @gray_0;*/ - border: none; .fontsize_normal; color: @gray_100; padding: 3px; width: 150px; + border-color:@gray_60; + border-right: none; } input::-webkit-input-placeholder { @@ -725,7 +726,7 @@ div.header_row_right{ .et2_label { // distance to label - select { margin-left: 3px; } + select { margin-left: 3px; border-color:@gray_20;} } } diff --git a/pixelegg/less/layout_content_elements.less b/pixelegg/less/layout_content_elements.less index 483c54b66c..21eb86b82b 100755 Binary files a/pixelegg/less/layout_content_elements.less and b/pixelegg/less/layout_content_elements.less differ diff --git a/pixelegg/less/layout_loginPage.less b/pixelegg/less/layout_loginPage.less index 358a7bc75f..c025ca56f4 100644 --- a/pixelegg/less/layout_loginPage.less +++ b/pixelegg/less/layout_loginPage.less @@ -14,7 +14,7 @@ @import (reference) "definitions.less"; -@import-once "def_colors.less"; +@import "def_colors.less"; //############################################################################################################## #socialMedia { diff --git a/pixelegg/less/layout_messages.less b/pixelegg/less/layout_messages.less index f886d7f1db..66a5be24cd 100755 --- a/pixelegg/less/layout_messages.less +++ b/pixelegg/less/layout_messages.less @@ -62,11 +62,10 @@ // Container für Meldungen / Message Container .egw_fw_ui_app_header_container { - border-width: 9px 0px 0px 0px; + border-width: 1px 0px 0px 0px; border-style: solid; border-color: @gray_30; - background-color: @gray_20; - height: auto; + height: auto; // Statusmeldung diff --git a/pixelegg/less/layout_raster_main.less b/pixelegg/less/layout_raster_main.less index 04782f5808..cfedf17f51 100644 --- a/pixelegg/less/layout_raster_main.less +++ b/pixelegg/less/layout_raster_main.less @@ -112,7 +112,7 @@ padding-left: 0; position: relative; .border_radius(5px,0, 0, 5px); - background: transparent; + .background_color_15_gray; display: inline-block; overflow: hidden; white-space: nowrap; @@ -170,9 +170,9 @@ .egw_fw_ui_tab_header_active { border-width: 1px 1px 0px 1px !important; /*padding: 0 0 5px !important;*/ - .background_color_30_gray ; + .background_color_0_gray ; background-image:none !important; - + padding-bottom:8px; &:hover {.background_color_25_gray ;} diff --git a/pixelegg/less/layout_raster_scrollarea.less b/pixelegg/less/layout_raster_scrollarea.less index 46f153b4f4..0fdf25e964 100644 --- a/pixelegg/less/layout_raster_scrollarea.less +++ b/pixelegg/less/layout_raster_scrollarea.less @@ -27,6 +27,7 @@ { overflow: hidden; z-index: 0; + .background_color_0_gray; } .egw_fw_ui_scrollarea_button @@ -81,8 +82,7 @@ display: block; overflow-x: hidden; overflow-y: auto; - padding: 0 10px; - background-color: @gray_20; + padding-right:10px; /* background-color: RGB(240, 240, 255);*/ } diff --git a/pixelegg/less/layout_raster_sidebar.less b/pixelegg/less/layout_raster_sidebar.less index 04c73c88e1..9fe3dfa930 100644 --- a/pixelegg/less/layout_raster_sidebar.less +++ b/pixelegg/less/layout_raster_sidebar.less @@ -38,7 +38,7 @@ top: 0px; bottom: 4px; left: 4px; - right: 5px; + right: 8px; overflow: hidden; z-index: 0; padding-top: 0.6em; @@ -47,7 +47,7 @@ // SIDE AREA .egw_fw_ui_scrollarea_outerdiv{ .background_color_5_gray; - + border-radius: 5px; //#################################################### // AREA for @@ -109,8 +109,8 @@ background-position: 95% -3000px; background-repeat: no-repeat; - .background_color_10_gray; - .border_radius ( 5px, 0px, 0px, 27px ); + .background_color_0_gray; + .border_radius ( 0px, 0px, 0px, 27px ); .bordered (@gray_30, @gray_30, @gray_30, @gray_30); margin: 0 0 0 0; @@ -181,20 +181,22 @@ .border_radius (0, 0, 27px, 0); border-color: @gray_30; border-style: solid; - border-width: 0px; + border-width: 1px; margin: 0 0 2em 0; // rounded Corner on bottom &:nth-last-of-type(-n+3) { - padding: 5px 0.3em 1.5em 0.3em; - margin: 0 0 10px 0; - .background_color_30_gray; + .background_color_0_gray; .border_radius (0, 0, 24px, 0); border-color: @gray_30; + border-right: 0px; + margin-bottom: 10px; + border-top-color: white; + padding-top: 8px; } - & > div {.background_color_30_gray;} + & > div {} //################################################### // *letztes Element */ @@ -320,12 +322,13 @@ // Trenner (Splitter) #egw_fw_splitter { position: absolute; - .background_color_30_gray; - width: 5px; + width: 8px; top: 40px; bottom: 3px; right: 0px; - + border-top:1px solid; + border-left: 1px solid; + border-color:@gray_30; &:hover {background-color: @egw_color_1;} } @@ -453,7 +456,7 @@ background-image: url(../images/splitter_vert.png); background-position: center; background-repeat: no-repeat; - .background_color_30_gray; + .background_color_0_gray; position: absolute; width: 5px; height: 100%; @@ -504,6 +507,7 @@ &:last-of-type{ .border_radius (0, 0, 10px, 0); border-color: @gray_30; + margin-bottom: 5px; } img { .dimension_height_s; vertical-align: middle;} diff --git a/pixelegg/less/layout_reset.less b/pixelegg/less/layout_reset.less index 84d5ecbfce..48f50db0b3 100644 --- a/pixelegg/less/layout_reset.less +++ b/pixelegg/less/layout_reset.less @@ -107,7 +107,7 @@ html { body{ background-image:none; - .background_color_10_gray; + .background_color_0_gray; .color_100_gray; // Schriftfarbe schwarz margin: 0px !important;