From 7e672697fbe08f655c9d71cac481420e1996144f Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Thu, 6 Feb 2014 07:40:54 +0000 Subject: [PATCH] pixelegg changes from Wednesday --- pixelegg/css/pixelegg.css | 113 +++++++++++++----- pixelegg/js/slider.js | 2 + .../def_design_pattern_color_font_shadow.less | 3 +- pixelegg/less/etemplate2.less | 1 - pixelegg/less/jquery-ui.less | 76 +++++++++++- pixelegg/less/layout_dialog.less | 16 ++- pixelegg/less/layout_raster.less | 20 ++-- 7 files changed, 180 insertions(+), 51 deletions(-) diff --git a/pixelegg/css/pixelegg.css b/pixelegg/css/pixelegg.css index 9191dc8d1e..7c652b5062 100644 --- a/pixelegg/css/pixelegg.css +++ b/pixelegg/css/pixelegg.css @@ -1043,21 +1043,8 @@ option:checked { border-left: solid 1px 0px !important; border-right: solid 1px 0px !important; border-bottom: solid 1px 0px !important; - /*.background-color-5-gray;*/ - background: -moz-linear-gradient(top, rgba(240, 240, 240, 0) 0%, rgba(191, 191, 191, 0.65) 100%) !important; - /* FF3.6+ */ - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, rgba(240, 240, 240, 0)), color-stop(100%, rgba(191, 191, 191, 0.65))) !important; - /* Chrome,Safari4+ */ - background: -webkit-linear-gradient(top, rgba(240, 240, 240, 0) 0%, rgba(191, 191, 191, 0.65) 100%) !important; - /* Chrome10+,Safari5.1+ */ - background: -o-linear-gradient(top, rgba(240, 240, 240, 0) 0%, rgba(191, 191, 191, 0.65) 100%) !important; - /* Opera 11.10+ */ - background: -ms-linear-gradient(top, rgba(240, 240, 240, 0) 0%, rgba(191, 191, 191, 0.65) 100%) !important; - /* IE10+ */ - background: linear-gradient(to bottom, rgba(240, 240, 240, 0) 0%, rgba(191, 191, 191, 0.65) 100%) !important; - /* W3C */ - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#00f0f0f0', endColorstr='#a6bfbfbf', GradientType=0) !important; - /* IE6-9 */ + /*.gradient_thead !important;*/ + background-color: #0c5da5; /*border-color: @gray_10;*/ color: #000000; font-weight: bold; @@ -1076,7 +1063,7 @@ option:checked { border-left: solid 1px 1px; border-right: solid 1px 1px; border-bottom: solid 1px 1px; - border-color: #e6e6e6; + border-color: #b4b4b4; background: transparent; font-weight: bold; color: #999999; @@ -1288,11 +1275,73 @@ span.ui-icon-search { } /*###########################################*/ /*Dialog: calendar edit series*/ -.ui-datepicker { - padding: 1em; +div#ui-datepicker-div { + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; + border: 1px solid #b4b4b4; + -webkit-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5); + -moz-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5); + box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5); } -.ui-datepicker .ui-widget-header .ui-icon { - background-image: url("images/ui-icons_d8e7f3_256x240.png"); +.ui-datepicker { + /*padding: 1px 0em;*/ + /* .ui-widget-header .ui-icon { + background-image: url("images/ui-icons_d8e7f3_256x240.png"); +}*/ +} +.ui-datepicker table.ui-datepicker-calendar .ui-state-active { + background-color: #0c5da5; + color: #ffffff; +} +.ui-datepicker div.ui-timepicker-div { + padding: 3px; +} +.ui-datepicker div.ui-timepicker-div dt.ui_tpicker_time_label { + font-size: 0.9em; +} +.ui-datepicker div.ui-timepicker-div dd.ui_tpicker_time { + font-size: 1.3em; + padding-left: 75px; + background-color: #ffc200; +} +.ui-datepicker div.ui-timepicker-div dt.ui_tpicker_time_label { + font-size: 0.9em; +} +.ui-datepicker div.ui-timepicker-div dt.ui_tpicker_minute_label { + font-size: 0.9em; +} +.ui-datepicker div.ui-timepicker-div div.ui_tpicker_hour_slider a.ui-slider-handle { + background-color: #0c5da5; +} +.ui-datepicker div.ui-timepicker-div div.ui_tpicker_minute_slider a.ui-slider-handle { + background-color: #0c5da5; +} +.ui-datepicker div.ui-datepicker-buttonpane { + background-color: #679fd2; +} +.ui-datepicker button.ui-datepicker-current .ui-state-hover { + background-color: #1aa200 !important; +} +.ui-datepicker button.ui-datepicker-current .ui-state-hover:hover { + background-color: #1aa200; +} +.ui-datepicker button.ui-datepicker-current .ui-state-hover:active { + background-color: #1aa200; +} +.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current:hover { + background-color: #1aa200; +} +.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current:active { + background-color: #1aa200; +} +.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-close:hover { + background-color: #f5b301 !important; + color: #000000; +} +.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-close:active { + background-color: #fecc44 !important; + color: #373737; } /** * EGroupware: Stylite Pixelegg template @@ -3956,7 +4005,7 @@ table.nextmatch_header img { padding: 0.5em; top: 5px; position: fixed; - right: 15px; + right: 0px; } #egw_fw_logout:hover { -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); @@ -3992,7 +4041,7 @@ table.nextmatch_header img { box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5); padding: 0.5em; top: 5px; - right: 56px; + right: 40px; z-index: 200; } #egw_fw_print:hover { @@ -4082,7 +4131,7 @@ table.nextmatch_header img { float: right; padding: 0.5em; position: fixed; - right: 96px; + right: 80px; top: 5px; width: 16px; height: 16px; @@ -4102,17 +4151,17 @@ table.nextmatch_header img { top: -5px; } #egw_fw_topmenu_info_items img#topmenu_info_error { - width: 12px; - height: 12px; + width: 16px; + height: 16px; position: fixed; /*.Button_size_square_16;*/ border: 1px solid rgba(0, 0, 0, 0.15); -webkit-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5); -moz-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5); box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5); - padding: 7px 4px; + padding: 5px; top: 6px; - right: 0px; + right: 115px; z-index: 200; background-color: #ff0000; -moz-transition: all 1s ease-in-out; @@ -5116,6 +5165,9 @@ table.dialog-main-view { .dialog-header table.et2_grid table.et2_grid label.et2_label span.et2_selectbox li { float: left; } +.dialog-header input.et2_textbox { + font-size: 1.3em; +} .dialog-header .et2_label { color: #000000; vertical-align: bottom; @@ -5186,6 +5238,7 @@ tr.dialog-header4 .et2_label { /*Buttons / Toolbar*/ .dialog-footer-toolbar { background-color: #679fd2; + /*.et2_selectbox {height: 32px; top: 0px; font-size: 1em;}*/ } .dialog-footer-toolbar td { padding: 0px 5px; @@ -5196,10 +5249,8 @@ tr.dialog-header4 .et2_label { .dialog-footer-toolbar button[id="addressbook-edit_button[delete]"] { float: right; } -.dialog-footer-toolbar .et2_selectbox { - height: 32px; - top: 0px; - font-size: 1.2em; +.dialog-footer-toolbar div.et2_hbox { + white-space: normal; } .dialog-footer-toolbar label.et2_label { /* .Complete_Button_input; diff --git a/pixelegg/js/slider.js b/pixelegg/js/slider.js index fc18607e6b..5fce7fad49 100644 --- a/pixelegg/js/slider.js +++ b/pixelegg/js/slider.js @@ -46,6 +46,8 @@ function hide_pixelegg_header(_toggle, _delay) $j("#egw_fw_topmenu_info_items").css("position", "fixed"); $j("#egw_fw_topmenu_info_items").css("z-index", "1000"); + // Form - Country Switch + $j("#egw_fw_topmenu_info_items form").css("display", "none"); $j(".egw_fw_ui_tabs_header").css("height", "34px"); diff --git a/pixelegg/less/def_design_pattern_color_font_shadow.less b/pixelegg/less/def_design_pattern_color_font_shadow.less index 91bf638f10..500b86ffe5 100755 --- a/pixelegg/less/def_design_pattern_color_font_shadow.less +++ b/pixelegg/less/def_design_pattern_color_font_shadow.less @@ -152,7 +152,8 @@ @color_hover_row : fade(@egw_color_2_e, 20%); - +/* Dialog Button panel Background Color*/ +@color_button_panel_bg_color : @egw_color_2_e; /*Button edit + save + apply + copy = positive action */ diff --git a/pixelegg/less/etemplate2.less b/pixelegg/less/etemplate2.less index 1e142d9a95..557b9e3009 100755 --- a/pixelegg/less/etemplate2.less +++ b/pixelegg/less/etemplate2.less @@ -44,7 +44,6 @@ div.et2_vbox>* { /** * HBox widget */ - div.et2_hbox_right { background: transparent; } diff --git a/pixelegg/less/jquery-ui.less b/pixelegg/less/jquery-ui.less index f0caa2b083..817db256cd 100755 --- a/pixelegg/less/jquery-ui.less +++ b/pixelegg/less/jquery-ui.less @@ -66,7 +66,8 @@ option:checked {background-color: @egw_color_1_e;} .ui-widget-header { // border: 1px solid #4297d7; .bordered(0px, 0px, 0px,0px) !important; - .gradient_thead !important; + /*.gradient_thead !important;*/ + background-color: @egw_color_2_a; /*border-color: @gray_10;*/ // background: #5c9ccc url(images/ui-bg_gloss-wave_55_5c9ccc_500x100.png) 50% 50% repeat-x; // color: #ffffff; @@ -86,7 +87,7 @@ option:checked {background-color: @egw_color_1_e;} .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { .bordered(1px, 1px, 1px,1px); - border-color: @gray_10; + border-color: @gray_30; // background: #dfeffc url(images/ui-bg_glass_85_dfeffc_1x400.png) 50% 50% repeat-x; background: transparent; font-weight: bold; @@ -278,16 +279,81 @@ span.ui-icon-search{ /*###########################################*/ /*Dialog: calendar edit series*/ + // Kalender Widget + div#ui-datepicker-div{ + .rounded (3px); + border: 1px solid @gray_30; + .box_shadow_standard_light_inset; + } + .ui-datepicker { - padding: 1em; + /*padding: 1px 0em;*/ - .ui-widget-header .ui-icon { +/* .ui-widget-header .ui-icon { background-image: url("images/ui-icons_d8e7f3_256x240.png"); +}*/ + // Kalender Tabelle + table.ui-datepicker-calendar{ + + //aktiver Tag + .ui-state-active {background-color: @egw_color_2_a;color: @gray_0;} + } + + + +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 + 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; + &:hover {background-color: @color_positive_action_active;} + &:active {background-color: @color_positive_action_active;} +} } +// Button now +.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 { + &:hover { background-color: @color_cancel_action_hover !important; color: @gray_100; } + &:active { background-color: @color_cancel_action_active !important; color: @gray_80; } +} + + // \ No newline at end of file diff --git a/pixelegg/less/layout_dialog.less b/pixelegg/less/layout_dialog.less index 6ed24c2652..f731a435ac 100755 --- a/pixelegg/less/layout_dialog.less +++ b/pixelegg/less/layout_dialog.less @@ -173,11 +173,17 @@ table.dialog-main-view {width: 100%;} } + input.et2_textbox {font-size: 1.3em;} + + .et2_label { .color_100_gray; vertical-align: bottom; padding: 0px 0px 0px 3px !important; } + + + td.space { @@ -250,18 +256,22 @@ tr.dialog-header4{ /*Buttons / Toolbar*/ .dialog-footer-toolbar{ - background-color: @egw_color_2_e; + background-color: @color_button_panel_bg_color; td {padding: 0px 5px;} - button { height: 32px;} + button { .dimension_height_l;} button[id="addressbook-edit_button[delete]"]{ float: right; } + + div.et2_hbox { + white-space: normal; +} // selectbox - .et2_selectbox {height: 32px; top: 0px; font-size: 1.2em;} + /*.et2_selectbox {height: 32px; top: 0px; font-size: 1em;}*/ diff --git a/pixelegg/less/layout_raster.less b/pixelegg/less/layout_raster.less index fd8ee8b5b9..e6f45d5156 100644 --- a/pixelegg/less/layout_raster.less +++ b/pixelegg/less/layout_raster.less @@ -295,7 +295,7 @@ padding: 0.5em; top: 5px; position: fixed; - right: 15px; + right: 0px; &:hover {.box_shadow_standard_light_hover;} @@ -323,7 +323,7 @@ .box_shadow_standard_light; padding: 0.5em; top: 5px; - right: 56px; + right: 40px; z-index: 200; &:hover {.box_shadow_standard_light_hover;} &:active {.Complete_Button_active;} @@ -427,7 +427,7 @@ float: right; padding: 0.5em; position: fixed; - right: 96px; + right: 80px; top: 5px; .dimension_width_height_s; &:before {content: "+"; font-size: 2em; color: @egw_color_1; line-height: 0.6em} @@ -450,16 +450,16 @@ // JS ERROR img#topmenu_info_error{ - .dimension_width_height_xs; + .dimension_width_height_s; position: fixed; /*.Button_size_square_16;*/ .border_normal; .box_shadow_standard_light; - padding: 7px 4px; + padding: 5px; top: 6px; - right: 0px; + right: 115px; z-index: 200; &:hover {.box_shadow_standard_light_hover;} &:active {.Complete_Button_active;} @@ -484,10 +484,10 @@ -@-moz-keyframes blink {0%{opacity:1;} 50%{opacity:0;} 100%{opacity:1;}} /* Firefox */ -@-webkit-keyframes blink {0%{opacity:1;} 50%{opacity:0;} 100%{opacity:1;}} /* Webkit */ -@-ms-keyframes blink {0%{opacity:1;} 50%{opacity:0;} 100%{opacity:1;}} /* IE */ -@keyframes blink {0%{opacity:1;} 50%{opacity:0;} 100%{opacity:1;}} /* Opera and prob css3 final iteration */ + @-moz-keyframes blink {0%{opacity:1;} 50%{opacity:0;} 100%{opacity:1;}} /* Firefox */ + @-webkit-keyframes blink {0%{opacity:1;} 50%{opacity:0;} 100%{opacity:1;}} /* Webkit */ + @-ms-keyframes blink {0%{opacity:1;} 50%{opacity:0;} 100%{opacity:1;}} /* IE */ + @keyframes blink {0%{opacity:1;} 50%{opacity:0;} 100%{opacity:1;}} /* Opera and prob css3 final iteration */ } // Ende items