From b9d02e42e0d3ec3687c2c9231c9bcb4b03e3b776 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Wed, 18 Dec 2013 04:33:46 +0000 Subject: [PATCH] pixelegg changes from Tuesday --- pixelegg/changelog.txt | 47 +++++++++++++++ pixelegg/css/pixelegg.css | 76 +++++++++++++++---------- pixelegg/css/pixelegg.less | 2 + pixelegg/images/dialog_debug.png | Bin 0 -> 1239 bytes pixelegg/images/dialog_error.png | Bin 0 -> 1591 bytes pixelegg/js/slider.js | 4 +- pixelegg/less/etemplate2.less | 2 +- pixelegg/less/layout_dialog.less | Bin 6345 -> 6590 bytes pixelegg/less/layout_messages.less | 2 +- pixelegg/less/layout_raster.less | 88 ++++++++++++++++++----------- pixelegg/less/layout_table.less | Bin 7959 -> 7991 bytes 11 files changed, 154 insertions(+), 67 deletions(-) create mode 100755 pixelegg/changelog.txt create mode 100755 pixelegg/images/dialog_debug.png create mode 100755 pixelegg/images/dialog_error.png diff --git a/pixelegg/changelog.txt b/pixelegg/changelog.txt new file mode 100755 index 0000000000..7fcf1b50de --- /dev/null +++ b/pixelegg/changelog.txt @@ -0,0 +1,47 @@ +/** + * EGroupware: Stylite Pixelegg template + * + * @author Stefan Reinhardt + Wolfgang Ott + * @package pixelegg + * @version $Id$ + */ + +/* 13.12.2013 ***************** */ + +button behavior + +addressbook edit + +tab - addressbook-edit_link_to + +.filters select = + +egw_fw_ui_sidemenu_listitem img = kein Button mehr + +Listen: +tr:nth-child(even) {background: @color-even;} +tr:nth-child(odd) {background: @color-odd;} + +calendar > ui dialog +calendar > edit +calendar > edit series +calendar > edit new + +####### +Buttons behavior on button:active + +positive = green +negative = red +between = yellow + + +/* 14.12.2013 ***************** */ + +def: dimension XL + M + S + XS + +calendar Dayview +calendar Edit Alarms + +Topmenu Items > put some Icons before + + diff --git a/pixelegg/css/pixelegg.css b/pixelegg/css/pixelegg.css index 9668c72313..80ea81f5ef 100644 --- a/pixelegg/css/pixelegg.css +++ b/pixelegg/css/pixelegg.css @@ -2082,7 +2082,7 @@ action buttons, left aligned for "extra" controls .nextmatch_header > .filters input[type=search] { background-color: #ffd44d; color: black; - /*height: 25px;*/ + height: 25px; float: left; } .nextmatch_header > .filters button.et2_button { @@ -3310,7 +3310,7 @@ span.ui-icon-search { background: #ffffff; } .egw_fw_ui_app_header_container { - border-width: 9px 0px 0px 9px; + border-width: 9px 0px 0px 0px; border-style: solid; border-color: #b4b4b4; background-color: #b3b3b3 !important; @@ -4263,6 +4263,7 @@ table.egwGridView_outer thead tr th { background-position: center; background-repeat: repeat-x;*/ vertical-align: top; + overflow: auto; } table.egwGridView_outer thead tr th:hover { background-color: #bfbfbf; @@ -4864,7 +4865,7 @@ img { right: 88px; top: 0; z-index: 200; - padding: 6px 0.8em 6px 0.5em; + padding: 5px 0.8em 6px 0.5em; } #egw_fw_topmenu_addons span#quick_add:before { content: "+"; @@ -4883,7 +4884,7 @@ img { -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); - height: 30px; + height: 26px; padding: 0 0 0 10px; font-size: 0.9em; line-height: 1.1em; @@ -4979,11 +4980,21 @@ img { } /*Name / Datum / angemeldete User*/ #egw_fw_topmenu_info_items { - padding-right: 20px; - white-space: nowrap; + /*postion : top*/ + bottom: 0px; + right: 5px; + padding-right: 0px; + position: relative; + z-index: 1000; + margin-right: 20px; + display: inline-flex; float: right; - display: flex; - height: 16px; + /*postion: bottom*/ + /* bottom: 3px; + right: 5px; + padding-right: 20px; + position: fixed; + z-index: 1000;*/ } #egw_fw_topmenu_info_items .topmenu_info_item:nth-child(2) { /*float: right;*/ @@ -5216,7 +5227,7 @@ img { #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_content .egw_fw_ui_category_active { border-bottom-width: 0px; margin-top: 4px; - background-color: #0c5da5; + background-color: #408dd2; /*.background-color-50-gray;*/ color: #f2f2f2; -webkit-border-top-right-radius: 3px !important; @@ -5264,8 +5275,7 @@ img { } #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_icon { display: inline-block; - width: 20px; - height: 20px; + height: 24px; padding-left: 0; padding-right: 10px; float: left; @@ -5285,7 +5295,7 @@ img { position: absolute; background-color: #b3b3b3 !important; width: 5px; - top: 60px; + top: 51px; bottom: 3px; right: 0px; } @@ -5525,10 +5535,11 @@ div#calendar-container div.calendar table tbody tr.rowhilite td { } #egw_fw_main #egw_fw_tabs .egw_fw_ui_tabs_header { margin: -1px 0 0 0; - padding: 0px 5px 0px 5px; + padding: 0px 1px 0px 1px; background-position: bottom; background-repeat: repeat-x; background-color: transparent; + height: 48px; } #egw_fw_main #egw_fw_tabs .egw_fw_ui_tabs_header h1 { float: left; @@ -5562,46 +5573,46 @@ div#calendar-container div.calendar table tbody tr.rowhilite td { -moz-background-clip: padding-box; -webkit-background-clip: padding-box; background-clip: padding-box; - /* -moz-border-radius-topright:3px; - -webkit-border-top-right-radius:3px; - -moz-border-radius-topleft:3px; - -webkit-border-top-left-radius:3px; - border-top-right-radius:3px; - border-top-left-radius:3px;*/ - background-color: #fafafa; + /*.background-color-5-gray;*/ + background: transparent; display: inline-block; margin: 3px 5px 0px 0px; - padding: 2px 10px 2px 10px; + /*padding: 2px 10px 2px 10px;*/ cursor: pointer; - border-width: 1px; + border-width: 1px 1px 0 1px; border-style: solid; - border-color: #c6ced6; + border-color: #b4b4b4; background-repeat: repeat-x; - height: 49px; + height: 47px; } #egw_fw_main #egw_fw_tabs .egw_fw_ui_tabs_header .egw_fw_ui_tab_header:hover { - background-color: #bfbfbf; + background-color: #b3b3b3 !important; } #egw_fw_main #egw_fw_tabs .egw_fw_ui_tabs_header .egw_fw_ui_tab_header h1 { font-size: 100%; line-height: 1em; margin-top: 0; } +#egw_fw_main #egw_fw_tabs .egw_fw_ui_tabs_header .egw_fw_ui_tab_header img.egw_fw_ui_tab_icon { + display: inline-block; + height: 24px; + margin-right: 5px; + margin-top: 5px; +} #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: 1px 10px 3px 10px !important; + padding: 0 0 5px !important; background-color: #b3b3b3 !important; background-image: none !important; } #egw_fw_main #egw_fw_tabs .egw_fw_ui_tabs_header .egw_fw_ui_tab_header_active:hover { background-color: #bfbfbf; } -#egw_fw_main #egw_fw_tabs .egw_fw_ui_tabs_header img.egw_fw_ui_tab_icon { +#egw_fw_main #egw_fw_tabs .egw_fw_ui_tabs_header .egw_fw_ui_tab_header_active img.egw_fw_ui_tab_icon { display: inline-block; - width: 20px; - height: 20px; + height: 24px; margin-right: 5px; - margin-top: 10px; + margin-top: 5px; } #egw_fw_main #egw_fw_tabs .egw_fw_ui_tab_close_button { position: absolute; @@ -5755,7 +5766,7 @@ table.dialog-main-view { ##############################################*/ /********** Header Part ********************/ .dialog-header { - background-color: #0c5da5; + background-color: #408dd2; color: #ffffff; } .dialog-header table.et2_grid { @@ -5770,6 +5781,9 @@ table.dialog-main-view { .dialog-header table.et2_grid td { padding: 0px 0px 0px 3px; } +.dialog-header table.et2_grid table.et2_grid label.et2_label span.et2_selectbox li { + float: left; +} .dialog-header .et2_label { color: #ffffff; vertical-align: bottom; diff --git a/pixelegg/css/pixelegg.less b/pixelegg/css/pixelegg.less index de0cb03151..470ec343d3 100644 --- a/pixelegg/css/pixelegg.less +++ b/pixelegg/css/pixelegg.less @@ -65,4 +65,6 @@ // // + + // \ No newline at end of file diff --git a/pixelegg/images/dialog_debug.png b/pixelegg/images/dialog_debug.png new file mode 100755 index 0000000000000000000000000000000000000000..50f7c0ed25b89402821dd7b56bfdd814e2477f74 GIT binary patch literal 1239 zcmV;|1StE7P)@Gf=Hm11`25xlY$OTGGj6%A(NT+?{?wb=X;Z+ zm{9D-19vgp^Un93?>qOtH}EF@=MVt>{r$(UUcLHdPfyRsN~t}QjWMrW*yg&fn|m&b zqF`=rZhCrp`U_wc-}m30nwt8vUay1$H2e<07s7= z#rOT=S_qNYdn6Me18yXvaY*bzmY|Yler1u}a5r{Blo9nM>~N?d82wr+DY$MM~8w zzs}F|`{T!~J%5hYIliwPLI||h96NT5D2j;VIJGKAz;#`MAYf{8k`K-leM)qk|ZIDqI55(fKrOm)2H0Hd6Uu6Q92JD;z_m24>L2& zK6pT_R-@grR|zR4<#L&7wThH7m0wDkCm@6XAsD=HfxnlQ_g9)6)f9LFg@9LI!V_<~>%q!^Z9dJ5X*vfX)}hf*pXnr5THR}&Ky zd>MGiC(&J_G!!RTW0-`8Nm9PZ%R6t6JQVJ<0p68)kzAL3rN>N>21|g6w zqNb%O4VMrK;>Ev6RQroi%NGWk$7tix@1niQnfy*kD_1<=`wN6#A z`Fj#*KLwuW;kqua>*BPAE~|nikqu)^>bnJRCt9!9Q%mDGPSxIV6+4cTBcZk4L1H%r zEP*JBazt&O{cV-9xH~R)3+Q=Xs(>Y6N$f=+3vLy)`?iKvz~002ovPDHLkV1jKS BS0MlZ literal 0 HcmV?d00001 diff --git a/pixelegg/images/dialog_error.png b/pixelegg/images/dialog_error.png new file mode 100755 index 0000000000000000000000000000000000000000..1de7a6fda07e70b050552b56d937b0988e00a00d GIT binary patch literal 1591 zcmV-72FUq|P)(RCwBA z{Qv(y!$1On0Ac|VjEsy#DL&4?5CC+p0TA2&V_*;fv4J!LkiGzHxNS|^Z-aN1kw|HfDXgw0Du6( z>j0qT0YGX#$hV-N5&&X;d3gpNTU!PuAdOe)bgw+8+%jW|vPhbPGp8(F-*@a_*x%E`@DbvOz!+$n0ND)? zKyU{@Q~P};AgwGa${^6)&A`ab4KYDck%7V3n1KNpzYM2N;kVq(jDbN;j)CFqS)gh6 z;ll5xOkvn_@E|BnfU>J%JSc$z?FI-SCU|f_vYG%W!STh#F);oDDt-T+fk8|RVmSza z3^p);h-1SbIglC<0OI$xD*gyhJ=Cv$N>NW1a<(BV-Jc8ZUF&=?~%d8i4e;i9Z|(`lnuWZEMWMN zn21$Q02=H-)9gWffB=GpfB>j$XW`+&?f?*IZ-)fCyF1=YfX{Lm;0NLt5VtS@1Q09) zz_l8~j~}SPj}EG0U&^2Apph<-@oGy0T}r6hvGH>)B#`s5J0dH zxByCsU;x7HJAm%E1;qc*@%;J!u>zntOwE5BYW^Xqf#G97 z+y}(HpynOWZh!z{fHg|D0jrLEAj8<%5!loeyXA`)qpAa8kQg=qG6PB79H1RNK)Ya` z2M8c|T>xssfzrV}CZG_g76jqDcNrLRb5X;0#R>+7{CtEO7zT-f{sI2b=2HKi63=Bm@_)}pYFn~is z7#NC+5p@L+d;(_QMZmh?`@er6Hz<}tt7CuwLTQj}fK*EB`PkVR?0}6vmS;kRSv61p0hG zupx69Si*vu>E&omGJpWW+9+KKZIto@cl4bcPV8OQG>Q#o9U%!GZUr>&v zQ3?=1IGg3mpdrBm3;|tLRR&E^vy23A4%i$!cKbHNcVGyh`yAN;00D%zW3m{MCP1Mf zz{SPIpaM)6axyXu!h(WW)xQSTBX^%XVYmv6?+@R;flFARaAFyrjtM{j5$u{RfVScO zA$84IfejZSpd .filters input[type=search] { .background-color-search; color: black; - /*height: 25px;*/ + height: 25px; float: left; } diff --git a/pixelegg/less/layout_dialog.less b/pixelegg/less/layout_dialog.less index d96f750b05e430fbe1504d154a238b5be50ae91b..d641b3b8d82b34ef9f8803e4f6e16c7b9aa2c18f 100755 GIT binary patch delta 156 zcmX?UxX*aQ2|mV@$tU?P$tnN=7l;4>ef^Ncq?}ZR%sd4!WAaxfwaK%Ec};T?lTvf^ zQcH~D!7PPpxE6>;1%={*#5}Nq;?$hfY#|Z#Wng^Ny diff --git a/pixelegg/less/layout_messages.less b/pixelegg/less/layout_messages.less index 8c068cf421..09b8aa8fd8 100755 --- a/pixelegg/less/layout_messages.less +++ b/pixelegg/less/layout_messages.less @@ -25,7 +25,7 @@ .egw_fw_ui_app_header_container { - border-width: 9px 0px 0px 9px; + border-width: 9px 0px 0px 0px; border-style: solid; border-color: @gray-30; .background-color-30-gray; diff --git a/pixelegg/less/layout_raster.less b/pixelegg/less/layout_raster.less index a6058744f3..2dcecc7fde 100644 --- a/pixelegg/less/layout_raster.less +++ b/pixelegg/less/layout_raster.less @@ -249,14 +249,14 @@ top: 0; z-index: 200; - padding: 6px 0.8em 6px 0.5em; + padding: 5px 0.8em 6px 0.5em; &:before {content: "+";font-size: 1.5em;color: @egw_color_1; line-height: 1.1em} select#quick_add_selectbox{ .border_normal; .box_shadow_standard_light; - height: 30px; + height: 26px; padding: 0 0 0 10px; font-size: 0.9em; line-height: 1.1em; @@ -335,11 +335,24 @@ #egw_fw_topmenu_info_items { - padding-right: 20px; - white-space: nowrap; + /*postion : top*/ + bottom: 0px; + right: 5px; + padding-right: 0px; + position: relative; + z-index: 1000; + margin-right: 20px; + display: inline-flex; float: right; - display: flex; - height: 16px; + + + /*postion: bottom*/ +/* bottom: 3px; + right: 5px; + padding-right: 20px; + position: fixed; + z-index: 1000;*/ + .topmenu_info_item { // Info Bell @@ -573,7 +586,7 @@ border-bottom-width: 0px; margin-top: 4px; - background-color: @egw_color_2_a; + background-color: @egw_color_2_d; /*.background-color-50-gray;*/ .color-5-gray; @@ -616,8 +629,8 @@ .egw_fw_ui_sidemenu_entry_icon { display: inline-block; - width: 20px; - height: 20px; + .dimension_height_m; + padding-left: 0; padding-right: 10px; float: left; @@ -646,7 +659,7 @@ // background-color: RGB(200, 200, 255); .background-color-30-gray; width: 5px; - top: 60px; + top: 51px; bottom: 3px; right: 0px; @@ -1027,15 +1040,15 @@ div#calendar-container { margin: -1px 0 0 0; - padding: 0px 5px 0px 5px; + padding: 0px 1px 0px 1px; background-position: bottom; background-repeat: repeat-x; background-color: transparent; - + + height: 48px; h1 { - // font-size: 8pt; float: left; width: 100%; text-align: center; @@ -1069,49 +1082,57 @@ div#calendar-container { .border-radius(5px,0, 0, 5px); -/* -moz-border-radius-topright:3px; - -webkit-border-top-right-radius:3px; - -moz-border-radius-topleft:3px; - -webkit-border-top-left-radius:3px; - border-top-right-radius:3px; - border-top-left-radius:3px;*/ - .background-color-5-gray; + /*.background-color-5-gray;*/ + background: transparent; + display: inline-block; margin: 3px 5px 0px 0px; - padding: 2px 10px 2px 10px; + /*padding: 2px 10px 2px 10px;*/ cursor: pointer; - border-width: 1px; + border-width: 1px 1px 0 1px; border-style: solid; - border-color: #c6ced6; + border-color: @gray-30;; background-repeat:repeat-x; - height: 49px; - - &:hover {.background-color-25-gray ;} + height: 47px; + &:hover {.background-color-30-gray ;} h1 {font-size: 100%; line-height: 1em; margin-top:0;} + + // Bilder + img.egw_fw_ui_tab_icon { + display: inline-block; + .dimension_height_m; + margin-right: 5px; + margin-top: 5px; + + } + } .egw_fw_ui_tab_header_active { border-width: 1px 1px 0px 1px !important; - padding: 1px 10px 3px 10px !important; + padding: 0 0 5px !important; .background-color-30-gray ; background-image:none !important; &:hover {.background-color-25-gray ;} - - } - // Bilder + + + // aktive Bilder img.egw_fw_ui_tab_icon { display: inline-block; - width: 20px; - height: 20px; + .dimension_height_m; margin-right: 5px; - margin-top: 10px; + margin-top: 5px; } + + + } + @@ -1190,4 +1211,5 @@ div#calendar-container { } +// // \ No newline at end of file diff --git a/pixelegg/less/layout_table.less b/pixelegg/less/layout_table.less index 1ba45b92870278c5a0d5be25ed58ad67ad50d1d4..8e674e8beb1dcdaacd471fc1c3cad038987f7ab8 100755 GIT binary patch delta 47 pcmbPkx7}{T99}sEG>~7GT9lTPUv8z4SXz=ld7_ZW=5@T8f&e`24f_B9 delta 16 YcmdmPH{EW-9Nx*Bg@iVr