From 309b567578ca99632f7a65423861ef556f10cd72 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Thu, 28 Nov 2013 06:19:58 +0000 Subject: [PATCH] pixelegg changes from yesterday --- pixelegg/css/pixelegg.css | 41 +++------------------------- pixelegg/images/magicwand.png | Bin 0 -> 2859 bytes pixelegg/less/etemplate2.less | 44 +++++++++++++++---------------- pixelegg/less/layout_raster.less | 20 +++++++------- pixelegg/less/layout_table.less | Bin 6327 -> 6366 bytes 5 files changed, 36 insertions(+), 69 deletions(-) create mode 100755 pixelegg/images/magicwand.png diff --git a/pixelegg/css/pixelegg.css b/pixelegg/css/pixelegg.css index c2ccc5fcdb..b72941f978 100644 --- a/pixelegg/css/pixelegg.css +++ b/pixelegg/css/pixelegg.css @@ -126,31 +126,6 @@ div.et2_hbox > div { min-width: 100px; min-height: 100px; } -.splitter-bar { - z-index: 1000; -} -.splitter-bar-vertical { - cursor: ew-resize; - width: 5px; -} -.splitter-bar-horizontal { - cursor: ns-resize; - height: 5px; -} -/* Hide iframes so moving works */ -.splitter-iframe-hide { - display: none; -} -.et2_split div.splitter-bar-vertical div.ui-icon { - position: absolute; - margin-left: -5px; - top: 45%; -} -.et2_split div.splitter-bar-horizontal div.ui-icon { - position: absolute; - margin-top: -6px; - left: 47%; -} /* Make sure there's no overflow, or hidden bits still appear */ * > .et2_split { overflow: hidden; @@ -160,7 +135,6 @@ div.et2_hbox > div { */ .et2_label { color: #1e1e1e; - float: left; } #msg, .message { @@ -1099,7 +1073,6 @@ div.message.floating { .et2_dropdown button.ui-state-default { background-image: none !important; background-repeat: no-repeat !important; - background-size: 10px 10px; } .et2_dropdown button.ui-corner-left img, .et2_dropdown button.ui-state-default img { @@ -1110,11 +1083,6 @@ div.message.floating { right: 8px; top: 3px; } -.et2_dropdown button.ui-corner-right { - background-image: url("../images/fav_filter_normal.png"); - background-repeat: no-repeat !important; - background-size: 10px 10px; -} .et2_dropdown button.ui-state-hover { background-color: #b4b4b4 !important; background-size: 16px 16px !important; @@ -3111,7 +3079,7 @@ table.egwGridView_grid tr:hover { table.egwGridView_grid tr td { border-left: 0px; border-right: 0px; - padding: 0.3em 0 1em 0.3em; + padding: 0.3em 0 0.3em 0.3em; border-bottom: 1px solid; color: #bfbfbf; /*&:hover {background-color: @egw_color_2_e;} legacy*/ @@ -3123,6 +3091,9 @@ table.egwGridView_grid tr td:active { box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5); color: #ffffff; } +table.egwGridView_grid tr td span { + color: #505050; +} .nextmatch_header .selectcols { background: none; } @@ -4189,10 +4160,6 @@ div#calendar-container div.calendar table tbody tr.rowhilite td { border-style: solid; border-color: #b4b4b4; } -#egw_fw_main .egw_fw_ui_tab_content div:nth-child(1) iframe { - height: 100%; - min-height: 99%; -} /*@import "../less/layout_nextmatch.less";*/ /** * Less-file for egroupware diff --git a/pixelegg/images/magicwand.png b/pixelegg/images/magicwand.png new file mode 100755 index 0000000000000000000000000000000000000000..2e116062118f86124283ae06da8956171a4ec6e9 GIT binary patch literal 2859 zcmbVOdpuNm8$T|~xK#ScC>o|wt+I19_Y4ig4pL&us9eU(FoT(4W{feiNh-ILtRk|z z*d$UbyfK8@Wocci6(P3JWh10m6z|by_x)o(`^WqHoO6Dc^E}_@dA`r{e9lSs-2LS$ zeKUOk09Ls&8D8KFU%nwa;8Uhjy#=QYa%Z;OTM{gf=1BPfohJ$6!(Bz35WW|m!;6V* z<=X*(mO#j2%h?{gs9cE%#aWg?DMb;WHUQW;C?h!BFuoif#19dQX^07R0|GAO(GWfa z4~$2I6JH=?s-%2x)ovD76~?9T5DxZmJ0%qa5b@<4xKb1@mQj^7#7A5zxL!U+Bj6uJ zBMaXbgA}kyt#HK&0YG@J|B) zT9fjEsa_11Pqx4v4Iz-rBdBO}baXT-+7=~|hM=(&3S}7sheLuANLh?n&QT)8GOHB? z24BXN3M1q~i5R|&$O)1}$!Q4C(?3HHMR<7p1uT|*A_}Aot>i?Yu_z2$BwCK^qqI!! z#sAxlf0UN7Vj}oxFTP9?CFO$o2)0^L2D$rpL(77oH`F~+A(#|SI77mX67j`yR|X9M zzCrPXJSxVP46;bVV@Nm*k&MNXF=Sh33YOwXV%WM+aHJKCf6}#O5M3~Mk~7|gPQhZG zZ7Gf}&Mr7d3WiJ|Qm`(R6y{_s_-8?AYia`9G1brWB!hu zOb0_CQi!$`3K{W9m-qj$h6bHMFPF#vl*`HyScA*UzltB+{M9~uG1xOwusLGSBBuaA z*VmOnXDR#2&WAC-7Ora<>eCz05w9mzSG;iqJJ6M1RVnR1Fn#WsUrRr^{g=fKjB&Lv^j+hzTN4X*&);`0 z&3z-w-|JJx{!V~5a%}pS%^l9oXpR z?%w^Nc+aa{TOU}$V6cXnw{P=q2VNOh8`uu~^wUqN9H~rZdwS4tCjkU{B*5oq*2l%g z6+bd}FaZ(<_7y)kK07l*4G9h|Pf)nKxw!!+Miy3GA{kOn*+X+>esns$t*fi6+?*ud zTpu&tJk;5FEpB0EytF-7*3AO`_+x(Fg-oShpxN1_k-aVLltwKJ6Tq{&uRhF&Fb0Q* zhYKgbk+`Z*tyZsnw*QIz^PSL&7H(gq(4|q&NmASvpAt#H;VSI0*dH!kxw5^vzyIJi z6e>Mappj9foO=2+%f^Se#?UZP6K@$pud1rrF)>hcqbm@j468a|06!5}?!pKS5mo>U z{3&utrNNDg3a_2nsVON>1496#+2r~1;^N|rD3s@tRz{0FDr#=3BT;te{`c-SkdfKp zmeW1EvW{vzvst^jc{J_nWNB$>;q%UKhVZd7W96@3izCk+wK5R;8Xgp-LXq>&A6`9Z z{{^x@zg^Dki zmZl<9#xIGU0Ra;Y;>Wf6Z>1aVJ!|^KsBs|tc$BMb0! zLp?n`QB6&ayCqGvS%pEdum6TklV?aH>-L<@)O>+yiBy-Bjh)XWNn9voGFx=LTsARS zubXZ`qi%vAJI?K81fTIQy5>7t7n>~D^y|`=l2*^`c`*B^f(~fkH9z&GkFZZ z>x9KeULv=Li9}J(dH$LSRsQ4SU8**xTEiHXf-Up8Rmcf+8*Q1$N;HCs)IM z&$W+J!2mO6&CH1tCzyuC0d>l$umZh2EVsF|v9ZxdvjFrt)X+%GYqiVs+CE@T6b~qO z5D5DmUg8;t?j(#%4YyDW4khb&tz|iKxm-A`D*!5bR56+tr{#O&1z0-|mngSP7Z(?0 z{taJUy^pJaeqtE9W@V6exKs^~knZ|g80*cT|y z4u4Bf6G)_!Bm$uwA^jOA{K0rvvv&C7+HOaatNH8VtE-8yZe&qG!PAfe=0*#PnT)>O zbFi&LcgaIHtgNi+yWShSty!h7e_zIXyeHo-nRnGRCunWAm0gMPf$YkJ-fB_qaWgMk zhR#OdiEC!^r3WvIs@+js`TBQ05i`$;qQ19h_J1%Dl9qlg@h;`G<~Flxg4-|X1J*?s zk5v_DB)qf26uHHoICXJhc4A54HLLNaXI1f5x6qR#INB4vFJ(}=$y6L_!mjA0(f1pO z>)4ld6UX)?;f^vl^1iXV(+laWebsaAAVC8%I{D;Ij-?hR?e;6z!f@bM>FW=5Y7YfV zG+5_b?wfzTz`S0s+U#s*rh2SX)A2%1{B_%==^aM8t2eGUO$1(W7GdV*Hs1O_Gg+*! zKP!G{aK^-u4UKj1R2ZLg zyN_|3i}sv4711Fg@wIMbvFe8&J@UQQ^GYjHnv3hV-p7Xa(tER+8{4&ms&Mq~N|a`! zE}Ui7c2o1awR-wBYeK^V({8U;Wz;?i)WW82@b&l4KMeK@TZ68%O|f;eD&_p@NvO78 zdV{QxF8KaY8Y!?P@o3Ymk#Wx0lZv47l9GGP(9bWKqW!f~^clVO1X)fTEG1J>gv3kQSKO+@L#e)xy}Fp literal 0 HcmV?d00001 diff --git a/pixelegg/less/etemplate2.less b/pixelegg/less/etemplate2.less index 2d67ff088d..e1f29fb5c3 100755 --- a/pixelegg/less/etemplate2.less +++ b/pixelegg/less/etemplate2.less @@ -112,21 +112,21 @@ div.et2_hbox>div { min-width: 100px; min-height: 100px; } -.splitter-bar{z-index: 1000;} -.splitter-bar-vertical { cursor: ew-resize; width: 5px;} -.splitter-bar-horizontal { cursor: ns-resize; height: 5px;} -/* Hide iframes so moving works */ -.splitter-iframe-hide { display: none;} -.et2_split div.splitter-bar-vertical div.ui-icon { - position: absolute; - margin-left: -5px; - top: 45%; -} -.et2_split div.splitter-bar-horizontal div.ui-icon { - position: absolute; - margin-top: -6px; - left: 47%; -} +//.splitter-bar{z-index: 1000;} +//.splitter-bar-vertical { cursor: ew-resize; width: 5px;} +//.splitter-bar-horizontal { cursor: ns-resize; height: 5px;} +///* Hide iframes so moving works */ +//.splitter-iframe-hide { display: none;} +//.et2_split div.splitter-bar-vertical div.ui-icon { +// position: absolute; +// margin-left: -5px; +// top: 45%; +//} +//.et2_split div.splitter-bar-horizontal div.ui-icon { +// position: absolute; +// margin-top: -6px; +// left: 47%; +//} /* Make sure there's no overflow, or hidden bits still appear */ * > .et2_split { overflow: hidden; @@ -137,7 +137,7 @@ div.et2_hbox>div { */ .et2_label { color: @gray-90; - float: left; +// float: left; } #msg,.message { color: red; @@ -1088,7 +1088,7 @@ div.message.floating { button.ui-state-default{ background-image: none !important; background-repeat: no-repeat !important; - background-size: 10px 10px; +// background-size: 10px 10px; img { height: 16px; @@ -1104,9 +1104,9 @@ div.message.floating { /*right Button*/ button.ui-corner-right { - background-image: url("../images/fav_filter_normal.png"); - background-repeat: no-repeat !important; - background-size: 10px 10px; +// background-image: url("../images/fav_filter_normal.png"); +// background-repeat: no-repeat !important; +// background-size: 10px 10px; } /* hover */ @@ -1119,8 +1119,8 @@ div.message.floating { } button.ui-state-hover > img { - position: absolute; - top: 70000px; +// position: absolute; +// top: 70000px; } diff --git a/pixelegg/less/layout_raster.less b/pixelegg/less/layout_raster.less index e6aebe1ca5..b643fb0329 100644 --- a/pixelegg/less/layout_raster.less +++ b/pixelegg/less/layout_raster.less @@ -1067,16 +1067,16 @@ div#calendar-container { // background-color: white; // width: 99.5%; - div:nth-child(1) { - // height: 100%; - // min-height: 400px; - - iframe{ - height: 100%; - min-height: 99%; - } - - } +// div:nth-child(1) { +// // height: 100%; +// // min-height: 400px; +// +// iframe{ +// height: 100%; +// min-height: 99%; +// } +// +// } } diff --git a/pixelegg/less/layout_table.less b/pixelegg/less/layout_table.less index 3de10060d8d8c179beee94d9755bb2d5aa24909a..325cf3a4ba6a6c30fc394abe8802f56c767a05a4 100755 GIT binary patch delta 67 zcmdmPc+YUdO)+KzJ>$u@#A;bMIXSr|-{VrBTrb|L1mqMKB<59f0U4ah`8oMTRtgU3 SMTwQV<_6Xv!P?0z5}N_bE)#nI delta 27 jcmca-xZQBWO)*Bp$#=wR8M!9k<5Hj8BHlV#TVgW+o?Z&H