From 5453f0c5feadcf8f55fae6ec1b120a77661f7422 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Sat, 18 Jan 2014 17:51:29 +0000 Subject: [PATCH] pixelegg changes from today --- pixelegg/css/pixelegg.css | 107 +++++++++++++---- pixelegg/less/def_buttons.less | 1 + .../def_design_pattern_color_font_shadow.less | 2 +- pixelegg/less/etemplate2.less | 112 ++++++++++++------ pixelegg/less/layout_content_elements.less | 16 ++- pixelegg/less/layout_dialog.less | 8 ++ pixelegg/less/layout_raster.less | 10 +- 7 files changed, 186 insertions(+), 70 deletions(-) diff --git a/pixelegg/css/pixelegg.css b/pixelegg/css/pixelegg.css index 0013fd8311..1d53146b06 100644 --- a/pixelegg/css/pixelegg.css +++ b/pixelegg/css/pixelegg.css @@ -967,15 +967,40 @@ action buttons, left aligned for "extra" controls .nextmatch_header > .filters > select > option { font-size: 0.9em; } - .nextmatch_header > .filters input[type=search] { - background-color: #ffd44d; - color: black; - /*height: 16.21875px;*/ - float: left; - margin: 5px 0 0 2px; - font-size: 0.95em; + .nextmatch_header > .search { + background-color: #b4b4b4; + -webkit-border-radius: 3px; + -webkit-border-top-right-radius: 20px; + -moz-border-radius: 3px; + -moz-border-radius-topright: 20px; + border-radius: 3px; + border-top-right-radius: 20px; } - .nextmatch_header > .filters button.et2_button { + .nextmatch_header > .search input { + background-color: #b4b4b4; + /*background-color: @gray_0;*/ + border: none; + font-size: 16px; + color: #000; + /*margin: 0 2px;*/ + } + .nextmatch_header > .search input::-webkit-input-placeholder { + /* WebKit browsers */ + color: #696969; + } + .nextmatch_header > .search input:-moz-placeholder { + /* Mozilla Firefox 4 to 18 */ + color: #696969; + } + .nextmatch_header > .search input::-moz-placeholder { + /* Mozilla Firefox 19+ */ + color: #696969; + } + .nextmatch_header > .search input:-ms-input-placeholder { + /* Internet Explorer 10+ */ + color: #696969; + } + .nextmatch_header > .search button.et2_button { border: 1px solid rgba(0, 0, 0, 0.15); border-color: #b4b4b4; -webkit-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5); @@ -989,36 +1014,34 @@ action buttons, left aligned for "extra" controls -moz-border-radius-topright: 20px; border-radius: 3px; border-top-right-radius: 20px; - background-color: #ffd44d; + background-color: #b4b4b4; color: #ffd44d; text-decoration: none; cursor: pointer; padding: 0px; + margin: 10px; margin-left: 0px; background-image: url("../images/search.png"); background-position: center 0; background-size: contain; background-repeat: no-repeat; - float: left; text-indent: 100%; white-space: nowrap; overflow: hidden; } - .nextmatch_header > .filters button.et2_button:hover { + .nextmatch_header > .search button.et2_button:hover { -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); -moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); - /* .Complete_Button_search_action_hover;*/ background-color: #679fd2 !important; /*hide arrow*/ color: #679fd2 !important; } - .nextmatch_header > .filters button.et2_button:active { - background: -webkit-gradient(linear, 0 0, 0 bottom, #d8d8d8, #a3a3a3), -moz-linear-gradient(#d8d8d8, #a3a3a3), -o-linear-gradient(#d8d8d8, #a3a3a3), linear-gradient(#d8d8d8, #a3a3a3); - -pie-background: linear-gradient(#d8d8d8, #a3a3a3); - behavior: url(/PIE.htc); + .nextmatch_header > .search button.et2_button:active { + /*.background_verlauf_diagonal_gray;*/ + background-color: #1aa200 !important; } - .nextmatch_header > .filters button.et2_button:focus { + .nextmatch_header > .search button.et2_button:focus { outline: 0; border-width: 1px; border-style: solid; @@ -1026,6 +1049,7 @@ action buttons, left aligned for "extra" controls -webkit-box-shadow: 0 0 2px 1px rgba(0, 0, 0, 0.1); -moz-box-shadow: 0 0 2px 1px rgba(0, 0, 0, 0.1); box-shadow: 0 0 2px 1px rgba(0, 0, 0, 0.1); + /*background-color: @color_positive_action_active !important;*/ } .nextmatch_header > .filters input { margin-right: 2ex; @@ -1244,9 +1268,10 @@ action buttons, left aligned for "extra" controls display: none; } .favorites .sideboxstar { - background-image: url("../images/bullet.svg"); + background-image: url("../images/bullet.png"); background-repeat: no-repeat; background-size: contain; + background-color: egw_color_2_a; width: 12px; height: 12px; } @@ -1378,10 +1403,10 @@ action buttons, left aligned for "extra" controls .sidebox-favorites div.ui-icon-trash { margin-top: 0px; margin-right: 2px; - background-image: url(../images/delete.svg); + background-image: url(../images/delete.png); background-size: 16px 16px; background-position: 0 0; - background-color: #000; + background-color: egw_color_2_a; -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); @@ -2567,6 +2592,21 @@ table { border-collapse: collapse; border-spacing: 0; } +*::-webkit-input-placeholder { + color: #696969; +} +*:-moz-placeholder { + /* FF 4-18 */ + color: #696969; +} +*::-moz-placeholder { + /* FF 19+ */ + color: #696969; +} +*:-ms-input-placeholder { + /* IE 10+ */ + color: #696969; +} /* ####################################################################################### * * @@ -5181,15 +5221,11 @@ div#calendar-container { margin-left: 0px; } div#calendar-container div.calendar { - margin-bottom: 1em; + margin-bottom: 16px; background-color: inherit; - padding: 0%; + padding: 0px; } div#calendar-container div.calendar table { - font-size: 0.9em; - color: #000; - cursor: default; - padding: 0.3em; background-color: #fafafa; font-family: Verdana, Helvetica, Sans-Serif; /* font-family: "Lucida Grande","Lucida Sans Unicode",Helvetica,Arial,Verdana,sans-serif;*/ @@ -5578,6 +5614,25 @@ tr.dialog-header4 .et2_label { vertical-align: bottom; padding: 0px 0px 0px 3px !important; } +/************* Tabs *********************************/ +.dialog-tabs { + /*.background-color-5-gray;*/ + background: -moz-linear-gradient(top, rgba(240, 240, 240, 0) 0%, rgba(191, 191, 191, 0.65) 100%); + /* 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))); + /* Chrome,Safari4+ */ + background: -webkit-linear-gradient(top, rgba(240, 240, 240, 0) 0%, rgba(191, 191, 191, 0.65) 100%); + /* Chrome10+,Safari5.1+ */ + background: -o-linear-gradient(top, rgba(240, 240, 240, 0) 0%, rgba(191, 191, 191, 0.65) 100%); + /* Opera 11.10+ */ + background: -ms-linear-gradient(top, rgba(240, 240, 240, 0) 0%, rgba(191, 191, 191, 0.65) 100%); + /* IE10+ */ + background: linear-gradient(to bottom, rgba(240, 240, 240, 0) 0%, rgba(191, 191, 191, 0.65) 100%); + /* W3C */ + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#00f0f0f0', endColorstr='#a6bfbfbf', GradientType=0); + /* IE6-9 */ + color: #000000; +} /************* Main **********************************/ .dialog-main-timeframe div { min-height: 100px; diff --git a/pixelegg/less/def_buttons.less b/pixelegg/less/def_buttons.less index 967e12b018..feb3875f60 100755 --- a/pixelegg/less/def_buttons.less +++ b/pixelegg/less/def_buttons.less @@ -198,6 +198,7 @@ cursor: pointer; padding: 0px; + margin: 7px; margin-left: 0px; background-image: url("../images/search.png"); diff --git a/pixelegg/less/def_design_pattern_color_font_shadow.less b/pixelegg/less/def_design_pattern_color_font_shadow.less index 0d49889ab0..7f9bb89a04 100755 --- a/pixelegg/less/def_design_pattern_color_font_shadow.less +++ b/pixelegg/less/def_design_pattern_color_font_shadow.less @@ -178,7 +178,7 @@ // Search Button -.background_color_search {background-color : lighten(@egw_color_1, 15%); } +.background_color_search {background-color : @gray_30; } // cal Heute diff --git a/pixelegg/less/etemplate2.less b/pixelegg/less/etemplate2.less index 757b688ada..6cca4d8b68 100755 --- a/pixelegg/less/etemplate2.less +++ b/pixelegg/less/etemplate2.less @@ -987,43 +987,84 @@ div.message.floating { // Search Field -.nextmatch_header > .filters input[type=search] { - .background_color_search; - color: black; - /*height: 16.21875px;*/ - float: left; - margin: 5px 0 0 2px; - font-size: 0.95em; -} - -.nextmatch_header > .filters button.et2_button { - .Complete_Button_search_action; - float: left; - text-indent: 100%; - white-space: nowrap; - overflow: hidden; +.nextmatch_header > .search{ - &:hover{ - .box_shadow_standard_light_hover; -/* .Complete_Button_search_action_hover;*/ - background-color: @egw_color_2_e !important; - /*hide arrow*/ - color: @egw_color_2_e !important; + .background_color_search; + .border_radius_button_righttop; + + input { + .background_color_search; + /*background-color: @gray_0;*/ + border: none; + font-size: 16px; + color: #000; + + /*margin: 0 2px;*/ } + input::-webkit-input-placeholder { + /* WebKit browsers */ + color: @gray_60; + } + input:-moz-placeholder { + /* Mozilla Firefox 4 to 18 */ + color: @gray_60; + } + input::-moz-placeholder { + /* Mozilla Firefox 19+ */ + color: @gray_60; + } + input:-ms-input-placeholder { + /* Internet Explorer 10+ */ + color: @gray_60; + } + + button.et2_button { + .border_normal; + border-color: @gray_30; + .box_shadow_standard_light; + width: 45px; + /*height: 1.6em;*/ + + .border_radius_button_righttop; + .background_color_search; + + color: lighten(@egw_color_1, 15%); + text-decoration: none; + + cursor: pointer; + padding: 0px; + margin: 10px; + margin-left: 0px; + + background-image: url("../images/search.png"); + background-position: center 0; + background-size: contain; + background-repeat: no-repeat; + text-indent: 100%; + white-space: nowrap; + overflow: hidden; + + &:hover{ + .box_shadow_standard_light_hover; + background-color: @egw_color_2_e !important; + /*hide arrow*/ + color: @egw_color_2_e !important; + } + + &:active { + /*.background_verlauf_diagonal_gray;*/ + background-color: @color_positive_action_active !important; + } + + &:focus { + .Complete_Button_input_focus; + /*background-color: @color_positive_action_active !important;*/ + } - &:active { - .background_verlauf_diagonal_gray; } - - &:focus { - .Complete_Button_input_focus; - } - + } - - - // Input Field .nextmatch_header > .filters input { @@ -1245,9 +1286,10 @@ div.message.floating { // List Icon .sideboxstar{ - background-image: url("../images/bullet.svg"); + background-image: url("../images/bullet.png"); background-repeat: no-repeat; background-size: contain; + background-color: egw_color_2_a; .dimension_width_height_xs; } @@ -1370,11 +1412,11 @@ div.message.floating { div.ui-icon-trash{ margin-top: 0px; margin-right: 2px; - background-image:url(../images/delete.svg); + background-image:url(../images/delete.png); background-size: 16px 16px; background-position: 0 0; - background-color: #000; + background-color: egw_color_2_a; .box_shadow_standard_light; .rounded; } @@ -1741,4 +1783,4 @@ iframe#admin-index_iframe{ } // -// \ No newline at end of file +// \ No newline at end of file diff --git a/pixelegg/less/layout_content_elements.less b/pixelegg/less/layout_content_elements.less index b1f5d60e6e..602c6fb604 100755 --- a/pixelegg/less/layout_content_elements.less +++ b/pixelegg/less/layout_content_elements.less @@ -63,7 +63,21 @@ border-spacing: 0; } - + *::-webkit-input-placeholder { + color:@gray_60; + } + *:-moz-placeholder { + /* FF 4-18 */ + color: @gray_60; + } + *::-moz-placeholder { + /* FF 19+ */ + color: @gray_60; + } + *:-ms-input-placeholder { + /* IE 10+ */ + color: @gray_60; + } /* ####################################################################################### diff --git a/pixelegg/less/layout_dialog.less b/pixelegg/less/layout_dialog.less index d092d715fe..380d230844 100755 --- a/pixelegg/less/layout_dialog.less +++ b/pixelegg/less/layout_dialog.less @@ -212,6 +212,14 @@ tr.dialog-header4{ } +/************* Tabs *********************************/ + +.dialog-tabs { + + .gradient_thead; + .color_100_gray; + +} /************* Main **********************************/ diff --git a/pixelegg/less/layout_raster.less b/pixelegg/less/layout_raster.less index 4b9f6ef21d..0c4379dca3 100644 --- a/pixelegg/less/layout_raster.less +++ b/pixelegg/less/layout_raster.less @@ -989,16 +989,12 @@ div#calendar-container { margin-left: 0px; div.calendar{ - margin-bottom: 1em; + margin-bottom: 16px; background-color: inherit; - padding: 0%; + padding: 0px; table { - font-size: 0.9em; - color: #000; - cursor: default; - padding: 0.3em; .background_color_5_gray; .basefontfamily; @@ -1296,4 +1292,4 @@ div#calendar-container { // -// \ No newline at end of file +// \ No newline at end of file