diff --git a/pixelegg/css/pixelegg.css b/pixelegg/css/pixelegg.css index 01ca03a9b5..00d957c0de 100644 --- a/pixelegg/css/pixelegg.css +++ b/pixelegg/css/pixelegg.css @@ -169,7 +169,7 @@ } /*look in layout_content_elements*/ .et2_selectbox .ui-multiselect-checkboxes li:hover { - background-color: #0c5da5 !important; + background-color: #189800 !important; } .et2_selectbox .ui-multiselect-checkboxes label { display: block; @@ -266,7 +266,9 @@ .et2_gantt .gantt_task_link.invalid_constraint:hover .gantt_line_wrapper div { box-shadow: 0 0 5px 0 #ae1d00; } - /*Link to / Selector Widget*/ + /* + Link to / Selector Widget +*/ .et2_link_to { min-height: 78px; /* @@ -288,6 +290,10 @@ -moz-border-radius: 5px; border-radius: 5px; } + .et2_link_to .et2_link_entry .ui-icon-close { + background-color: transparent; + left: 0px; + } .et2_link_to button:first-child { /*.border_normal;*/ /*.box_shadow_standard_light;*/ @@ -308,6 +314,9 @@ transition-timing-function: linear; background-color: #b4b4b4; padding: 3px; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; height: 20px; position: relative; top: 5px; @@ -1336,8 +1345,8 @@ option:checked { border-bottom: solid 1px 1px; border-color: #b4b4b4; background: transparent; - font-weight: bold; - color: #999999; + font-weight: normal; + color: #1a1a1a; } .ui-state-default a, .ui-state-default a:link, @@ -1349,7 +1358,7 @@ option:checked { .ui-widget-header .ui-state-focus, .ui-widget-content .ui-state-focus { border-color: #e6e6e6; - background: #0c5da5; + background: #189800; background-image: none; color: #ffffff; } @@ -1361,7 +1370,7 @@ option:checked { border-right: solid 1px 1px; border-bottom: solid 1px 1px; border-color: #e6e6e6; - background: #0c5da5; + background: #189800; background-image: none; color: #ffffff; } @@ -1558,7 +1567,7 @@ span.ui-icon-search { background-image: none; } .ui-widget-content .et2_selectbox div.ui-widget-header ul li label.ui-state-hover { - background-color: #0c5da5; + background-color: #189800; font-weight: normal; } /*###########################################*/ @@ -3552,7 +3561,7 @@ table.egwGridView_outer thead tr th.optcol { /*width: 32px !important;*/ } table.egwGridView_outer thead tr th.optcol:hover { - background-color: #0c5da5; + background-color: #189800; } table.egwGridView_outer thead tr th.optcol span.selectcols { height: 9px; @@ -3564,7 +3573,7 @@ table.egwGridView_outer thead tr th.optcol span.selectcols { display: inline-block; } table.egwGridView_outer thead tr th.optcol span.selectcols:hover { - background-color: #0c5da5; + background-color: #189800; } table.egwGridView_outer > tbody > tr { /*Elements inside td*/ @@ -3848,7 +3857,7 @@ table.nextmatch_header img { #loginMainDiv div#centerBox #loginCdMessage span { padding: 0.5em; font-size: 1.2em; - color: #0c5da5; + color: #189800; text-shadow: -1px -1px 0px #101010, 1px 1px 0px #505050; width: 100%; } diff --git a/pixelegg/less/def_design_pattern_color_font_shadow.less b/pixelegg/less/def_design_pattern_color_font_shadow.less index 138f242239..3ae3fd9abb 100755 --- a/pixelegg/less/def_design_pattern_color_font_shadow.less +++ b/pixelegg/less/def_design_pattern_color_font_shadow.less @@ -127,7 +127,7 @@ /*@active_button_border_bottom : @egw_color_2_d;*/ // Hint / or have to do / must field -@color_hint : @egw_color_2_a; +@color_hint : #189800; //@egw_color_2_a; // Tooltipp / or have to do / must field @color_tooltip : lighten(@egw_color_1_e, 90%); diff --git a/pixelegg/less/etemplate2.less b/pixelegg/less/etemplate2.less index cf24a897ba..f0d1279eae 100755 --- a/pixelegg/less/etemplate2.less +++ b/pixelegg/less/etemplate2.less @@ -240,33 +240,45 @@ div.et2_file input.et2_file_upload{ } } -/*Link to / Selector Widget*/ +/* + Link to / Selector Widget +*/ .et2_link_to { min-height: 78px; // Background for select + Search Field div:first-child{ - background-color: @egw_color_1_e; - padding: 0.5em 0 0.5em 0.5em; - .rounded(5px); - } + background-color: @egw_color_1_e; + padding: 0.5em 0 0.5em 0.5em; + .rounded(5px); + } - // make link button - button:first-child { + // right select field - icon after + .et2_link_entry { + .ui-icon-close { + background-color: transparent; + left: 0px; + } + } + + + // BUTTON: make link button + button:first-child { .Complete_Button_normal; padding: 3px; + .rounded(5px); .dimension_height_sm; position: relative; top: 5px; padding-left: 20px; - background-image: url("../images/link.png"); - background-position: 2px 2px; - background-size: 14px 14px; - background-repeat: no-repeat; + background-image: url("../images/link.png"); + background-position: 2px 2px; + background-size: 14px 14px; + background-repeat: no-repeat; &:hover {.Complete_Button_Icon_hover; background-color: @color_positive_action_active !important;} &:active {.Complete_Button_Icon_active; background-color: @color_positive_action_active !important;} diff --git a/pixelegg/less/jquery-ui.less b/pixelegg/less/jquery-ui.less index 10f6c31271..1306d58dff 100755 --- a/pixelegg/less/jquery-ui.less +++ b/pixelegg/less/jquery-ui.less @@ -90,8 +90,8 @@ option:checked {background-color: @egw_color_1_e;} border-color: @gray_30; // background: #dfeffc url(images/ui-bg_glass_85_dfeffc_1x400.png) 50% 50% repeat-x; background: transparent; - font-weight: bold; - .color_40_gray; + font-weight: normal; + .color_90_gray; // float: left; // position: relative; } @@ -109,7 +109,7 @@ option:checked {background-color: @egw_color_1_e;} background: @color_hint; background-image: none; color: @gray_0; - + } @@ -198,7 +198,7 @@ option:checked {background-color: @egw_color_1_e;} margin-top: 1px; background-position: 0px 0px; .rounded (2px); - + &:hover{ background-color: @gray_30;} &:active { background-color: @color_cancel_action_active !important; } @@ -216,40 +216,40 @@ span.ui-icon-close {margin-top: 0px; top: 5px;} background-position: 0 0 !important; .color_0_gray; .dimension_height_s; - + &:hover{ background-color: @gray_10; color: @gray_90; .box_shadow_standard_light_hover;} &:active { - .box_shadow_standard_light_active !important; + .box_shadow_standard_light_active !important; background-color: @color_cancel_action_active !important; } - + } /*###########################################*/ /*Menu */ .ui-menu{ - + .ui-menu-item { - + padding: 0px; - + a { - line-height: 24px; + line-height: 24px; margin: 0px; padding: 2px 5px; - + input {padding: 0;} img {padding: 0;} } a.ui-state-focus { margin: 0px !important; - line-height: 24px; + line-height: 24px; padding: 2px 5px; border: none; } } - + } /*###########################################*/ /* col selection */ @@ -263,7 +263,7 @@ span.ui-icon-search{ background-size: 10px 10px; } - + .ui-corner-all{.rounded(3px)} @@ -288,12 +288,12 @@ span.ui-icon-search{ /*Dialog: edit row*/ .ui-widget-content { - + border: 1px solid @egw_color_2_a; .et2_selectbox { - button.et2_button_text, + button.et2_button_text, select.et2_selectbox {height: 20px;} button {background-image: none;} @@ -302,7 +302,7 @@ span.ui-icon-search{ ul li label.ui-state-hover {background-color: @color_hint; font-weight: normal;} - } + } } @@ -312,7 +312,7 @@ span.ui-icon-search{ /*Dialog: calendar edit series*/ .ui-dialog-buttonpane {background-color: @egw_color_2_e;} -.ui-dialog-buttonset{ +.ui-dialog-buttonset{ button{ .Complete_Button_text_icon_before; @@ -320,9 +320,9 @@ span.ui-icon-search{ &:hover{ background-color: @gray_30; color: @gray_90;} } - button.ui-button-text-only {background-color: @gray_20; - background: inherit; - color: @gray_100 !important; + button.ui-button-text-only {background-color: @gray_20; + background: inherit; + color: @gray_100 !important; font-weight: normal !important; &:hover{ background-color: @gray_30;} @@ -340,15 +340,15 @@ span.ui-icon-search{ } .ui-datepicker { - + /*padding: 1px 0em;*/ /* .ui-widget-header .ui-icon { background-image: url("images/ui-icons_d8e7f3_256x240.png"); }*/ // Kalender Tabelle - table.ui-datepicker-calendar{ - + table.ui-datepicker-calendar{ + //aktiver Tag .ui-state-active {background-color: @egw_color_2_a;color: @gray_0;} } @@ -356,40 +356,40 @@ span.ui-icon-search{ div.ui-timepicker-div{ - + padding: 3px; - + //Uhrzeit - Label dt.ui_tpicker_time_label{font-size: 0.9em} //Uhrzeit dd.ui_tpicker_time{font-size: 1.3em; padding-left: 75px; background-color: @egw_color_1_a;} - + //Stunde - Label dt.ui_tpicker_time_label{font-size: 0.9em} - + // Minute - Label dt.ui_tpicker_minute_label {font-size: 0.9em} - - // Schieberegler + + // Schieberegler div.ui_tpicker_hour_slider{ a.ui-slider-handle {background-color: @egw_color_2_a;} } div.ui_tpicker_minute_slider{ a.ui-slider-handle {background-color: @egw_color_2_a;} } - - - + + + } //Buttons div.ui-datepicker-buttonpane{ background-color: @color_button_panel_bg_color; - + } - + button.ui-datepicker-current .ui-state-hover{ - background-color: @color_positive_action_active !important; + background-color: @color_positive_action_active !important; &:hover {background-color: @color_positive_action_active;} &:active {background-color: @color_positive_action_active;} } @@ -397,13 +397,13 @@ div.ui-timepicker-div{ } // Button now -.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current { +.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current { &:hover {background-color: @color_positive_action_active;} &:active {background-color: @color_positive_action_active;} } // Button close -.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-close { +.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-close { &:hover { background-color: @color_cancel_action_hover !important; color: @gray_100; } &:active { background-color: @color_cancel_action_active !important; color: @gray_80; } }