From e8e20a733a9ec7bf0585f40709f517285d4a810c Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Thu, 20 Feb 2014 19:42:42 +0000 Subject: [PATCH] pixelegg changes from today --- pixelegg/css/pixelegg.css | 24 ++++++++++----- pixelegg/images/prio_high.png | Bin 168 -> 315 bytes pixelegg/images/prio_low.png | Bin 166 -> 243 bytes pixelegg/images/scroll.png | Bin 706 -> 846 bytes pixelegg/images/scroll_hover.png | Bin 659 -> 876 bytes pixelegg/images/view.png | Bin 0 -> 2227 bytes pixelegg/js/slider.js | 2 +- pixelegg/less/etemplate2.less | 33 ++++++++------------- pixelegg/less/layout_content_elements.less | 2 +- 9 files changed, 31 insertions(+), 30 deletions(-) create mode 100755 pixelegg/images/view.png diff --git a/pixelegg/css/pixelegg.css b/pixelegg/css/pixelegg.css index a66d4c231d..cfae2993ad 100644 --- a/pixelegg/css/pixelegg.css +++ b/pixelegg/css/pixelegg.css @@ -347,7 +347,7 @@ -webkit-user-select: none; -moz-user-select: none; user-select: none; - min-width: 76px; + min-width: 73px; } .et2_tabflag:hover { color: #f2f2f2; @@ -387,7 +387,7 @@ background-image: none; } .et2_tabheader :first-child { - margin-left: 0.3em; + margin-left: 1px; } /** * Validation @@ -767,6 +767,10 @@ background-color: #ffffff; background-image: none; } + .et2_dropdown button img { + width: 12px; + height: 12px; + } .et2_dropdown button > div { vertical-align: middle; } @@ -781,20 +785,23 @@ .et2_dropdown button.ui-state-default { background-image: none !important; background-repeat: no-repeat !important; + /*&:hover {.Complete_Button_save_apply_copy;}*/ } .et2_dropdown button.ui-corner-left img, .et2_dropdown button.ui-state-default img { - width: 16px; - height: 16px; + width: 12px; + height: 12px; text-align: left; position: relative; right: 1px; top: 3px; } + .et2_dropdown button.ui-corner-left:active, + .et2_dropdown button.ui-state-default:active { + background-color: #1aa200; + } .et2_dropdown button.ui-state-hover { - background-color: #b4b4b4 !important; - background-size: 16px 16px !important; - background-position: 10px center !important; + background-color: #e6e6e6; } .sidebox-favorites ul.favorites { width: 99%; @@ -2708,6 +2715,7 @@ button.et2_button_with_image { -moz-transition-timing-function: linear; -o-transition-timing-function: linear; transition-timing-function: linear; + background-color: #b4b4b4; padding-left: 30px !important; background-position: 6px center !important; background-size: 20px auto !important; @@ -2716,7 +2724,7 @@ button.et2_button_with_image { background-repeat: no-repeat !important; background-position: 6px center; background-size: 20px 20px; - background-color: #b4b4b4; + background-color: #e6e6e6; } button.et2_button_with_image background-color[url$="svg"] { background-color: #b4b4b4; diff --git a/pixelegg/images/prio_high.png b/pixelegg/images/prio_high.png index 41ea8635158971251eaec5e6a7243f7799871d4f..e794b9b23bbd5bcf3c176f33a1e748ee5f833f98 100755 GIT binary patch delta 300 zcmV+{0n`4d0lNZ_7=H)`00017Qv8+x000?uMObuGZ)S9NVRB^vL1b@YWgtmyVP|Dh zWnpA_ami&o0002pNklNi zI#}4**3Q+~zkiIs`1m#l1_u5B>Aw5z+c(v3NlDi(K^(*iCjbBcuK@JW y;uk05(Mi20000{>Eakt qF(>&!V!{S@C!2&L3~C2s7-XI?3Rdh?UKF diff --git a/pixelegg/images/prio_low.png b/pixelegg/images/prio_low.png index 25c253a0fa846178d10eb09a69499ffb8a7b2d0b..f856832ce7dbef725c6b3f2480aa88cb23578bc8 100755 GIT binary patch delta 227 zcmV<90383O0rLTn7=H)`0001&4lgqR000?uMObuGZ)S9NVRB^vL1b@YWgtmyVP|Dh zWnpA_ami&o0001$NklUxsa^S!LD-Z+Z5)fFwetk5M+ROa?`}b*=E?iyGdiClR$LZ6jWuHBJ zrl+l~{emedDCinc#V$TrRS+vri8U d4156)U;s)1N+F5jDW(7b002ovPDHLkV1kuOV&nh- delta 150 zcmey&xQuavL_HHT0|UdWgyRc<6i$Ul0)>PT)7apRv5{S|Hm!9O5~ zxGG3-V-a*!u?Ve@SZZx;N}HrfCtpqG`kdB679!l#1D87=cYn@#&wJi;5_4r`#i>*( zdDnFxDy6QQrWrO2!!rJpd7fwB*RZT3yX@h|#orA33+}(!-EQ~t&d$!`R;zW!@AvoQ z5DCZ{C_=m4Rsbz0lgST(K)~JG+smx2tzF#O+H!)yppi%LKoZy39+m((txSm}avn<<;(f5|2^(I6h*cX>|WF zlgSjAG%o&BpH6+-+uKQo!z5#Q8rH|_^}1i0OyUjz-XLb%9v&X<;7~NFJ02Abc4dCC zI}mUWKsOkP&w2EY_upAfn$+R_Bva=W;O}rI#(%w3O>xc~1h{!%6?1-mer9%d_7ZF< z^ydva->n1liEJ2!KUl9|rv^Y_c^cp;`3(^Nx>f$mpfJGu)E*rj{hZI|k1s4NjKGMG z@+;B5ZW1V$E9kGXkag7m2GX1KREwT^%eZ|;qc8s!U;t}pnNNH+=hFZH002ovPDHLkV1jfu Bj7R_g delta 682 zcmV;b0#*Ia2Eql9B!2;OQb$4nuFf3k00006VoOIv0RI600RN!9r;`8x010qNS#tmY z4c7nw4c7reD4Tcy000McNliru+6EB^4LWXl;mH6102y>eSad^gZEa<4bO1wgWnpw> zWFU8GbZ8()Nlj2!fese{00JFJL_t(Y$JLf?PTMdT$A6CPG=FY*6>4v??_7f&fD4Rc zY!}!8wrlWx+7S??C`d?DqJ*?4wjb{cjSB5V5lCZy$x@{J^yL4%*p3>FMm*{WI0ile zB_B@>@C*13`~*-{RRMejzHAa9r9?^zr4&l3f5HOafD?6neSHM{c!>@naDRV~h|ur% zan50kApeHP%{;F)K?%sOy@3zmHOi zi;D}!<1tOsAR=h3yCot_CKIf+0Iy=l<1tlL;k_rNwBo~Bi`JSD0>+qQQ`hyOwU!uT z7xZ~M>$)b(vhE|^d#P-gnPtxxz8V zl{pg;%CclM8WBPu#>jj=r)e76wk3o>N~w!cmL=!s=kLlcw5a-8^CCjqwku;}tz~a- zkE*J=>VIghan5x!xKOXxdlxpPwARaVLdH3F8bUY(R^a7~2ZI4hDQ<3VD9e)V?QMp` zAw^L>{zED9H1C?aVJ9mFn#5>{XZ42P4rp;KV$(<^=ftzx^Kk0jeF-H}2Ie Q9smFU07*qoM6N<$g2#?H?f?J) diff --git a/pixelegg/images/scroll_hover.png b/pixelegg/images/scroll_hover.png index 8deeabf33a533c2c27fc4520bd55210cdc7a66ad..10396f8ab07c578a7739381f74c496a361071aa5 100644 GIT binary patch delta 853 zcmV-b1FHO!1?&cpB!3xnMObuGZ)S9NVRB^vL1b@YWgtmyVP|DhWnpA_ami&o0009H zNkl!XT6?bxrznbcZEfv! zKA)e2x?6 zjZPqmjID4S*XT3}?luPp2h*dYqo)9@fCxSoi@6UD4u)_nYPDKftyU|HF$p~1Y&PxX za@pqh`?V`8D}Qw{m&?7_-rjyn0rA2gwmM)~al75wKp>E@SS(*dq0p8_qcOKytv(bJ z92*2`7{FP!3HzkX0y3CK0cnrv&wq+{QSIUe}CUc#Ieo;R1-kLwRm-P zWxxO^P=#X&fa>{rz3$xI-F2}7hy2Rr<)uO_qP3L!woiLC8V#jZs~JTC4GG8%SOdrg zgP{QCQ-5fi3Tpvyx1PPdJwM1Z0|WDX(H&8z(_MoJJs422GLHfr0N?=l)8XOagxzlc zHZn5u19tXrG2HR-u@$ZsIypIc2Iuj^mLHP>cm2-1fcIK-I-P|~Ci4V6FR=t7>9AV} z!b5&{p-||<8K8Cv8a0BB1JJ%#i^;Ol+|io f#@~bG-vSH(Xe6UC$NP1600000NkvXXu0mjf5097& delta 634 zcmV-=0)_qT29pJlB!2;OQb$4nuFf3k00006VoOIv0RI600RN!9r;`8x010qNS#tmY z4c7nw4c7reD4Tcy000McNliru+6EB^3OLU;79s!u02y>eSad^gZEa<4bO1wgWnpw> zWFU8GbZ8()Nlj2!fese{00HhvL_t(Y$JLg*ZWBQihQFD;F@K2_2OP=Z0wGIWiinQh z6+LBm0A2t$eg{%fAn^boiaY^L`iP4Vq)24N&e{J(OM&fKnU?qSYR8d zi(ap{1-!e8PJe?D`s4@csL%9P6?yXxw(VdT#?oeau?u=`G#ZW9VHn=CEDO^#ky0)N z(-F?$M~dq!tj5QP?>qeL$Hax(IF5sD+qtt+%GrUUD8jbwlJtGQ29P8PLI_OLyby+A zAiCdJaRRJ@!ZIS(rHkC(q0{LwnM`tLvk*d%Bnbe%?|;|KtOrs`EX(>`k@>c!De>eC zarOnq2jI0ahQ}nQH*j5-a=A>UQpuH_R}@9Fu{nQXvg$7;AC(?3{Q8EXae|0^ywf3{ zy~hOOG1KW3t#z(!rmX6hCZDD$VHhsCKwPYFRDOoF|AAzXu-CuKf!btqZ4KMDXLIsm z7aeJqymL}&H;&^Pumook(m*_V%As?gcDqdw1U%f>pjxd`C=@Qt%Zpu{{R3007*qoM6N<$g4q!trvLx| diff --git a/pixelegg/images/view.png b/pixelegg/images/view.png new file mode 100755 index 0000000000000000000000000000000000000000..422d4390293e353ad6363c6090ce15fef2a17c6b GIT binary patch literal 2227 zcmbVOc~}!?8XrKSqG+VbqaYH-16+Y*a*;$paxMtr2vI1C7?J@3NhW3n5)hP2POaMm z#VvRPqM}%;mE{mn>w?f|1&?)Azync);(^LxJ5jOwhfn|5d1mJOzIWc=@4cUA@`D5a zZf#{}1pt7xpRYiIuO!nmjex(=l$4kFvH%l?W1&b4rkCkpfU7{FVUnL(77I&YnId^p zE9?mX7I8{xI2JAr;K&iRyUe8HZcuA+Gyr(6GH7M;1Q;Vl!?8+@7dTXR4kRfRUSJqQ zOc87OaGcUNMF)qb1WM&8339dqT;)yjG;nYNHH^tf2DM6qatvPJdtMH{H;Kt0>Aeb; z;01ngDqI{);v+hk#Bis%$te&-Vlv$!I)llCTuD?4L?u)3o9PD8ISeL;>OuN=fw(oD zB8DRoh(6lFPhMaghG{uuvRw=~MllKeryHNu zMy1JGm@I)&BvB{F>k+ef5{&2WuML?Lac?+5Iwf8dnM#1j6V2!ez(Hia+Z3mFib z#)NnfPdJJ7)1a74BZnvLDsj6Xv9!O$a`-w}h9NpBf~Y1tAUF=e5Ht?alK7!al8aa- zS87ax<)#9Ch*tpXlu58cq(juC_Zj9WKjVRr$`aAoToy(2XXIQVgDRxcXaYKy3x32Z z{-3Ooac9V;_V}N6nH1qYXxe^ie*Exhd|(YeGdg@Y-cZXQ0>G3WKLJ;2_|HJtI)8cC z++SK-yXK1n0=5T!D>`&U-Bny5ZwQPp^Y#DQ`zFu7uYv3^IyF@lwR-GV-g0<9(URMI z^rHQS>X!%NPlum;^-aLsxeibmy0ZVLmO0V%rMt`=pX7Ah?HfqDK05MKoQ zM=}p|e|5Xmf@nQ!*4^ChMLy-v%toEZ4WXN-Pe7|0SwLiDWb~eZ>vlUt=N39Rq-BOZ zTmBTpYJ*);6BLREHQ}x!mK!|ki2%j5w4`Lf+uQpcrcxc(BqUtUzJZjhE-zcl`fBr! zwY6_`2r|Uqd5Q0HufxUq8Y_nKZ|7yp7M(nK@?1l8b?|x0c9yuSo#$~)P$?A|jmEB7 zxrb_NYC>b^c14C~XXgQ|*xkE!1yod240RZd=W6Qe)=f{b>@)*&+p$t*3nc zRzz4A5n-!C(cJ39SI@sMD6nD^s%|{(Ft)W>4GsR44(TEQ!%JGHNTzB&EXw2{%_$5SotwzTjZ)5p&D zR0FEVW_d5hCVqJM5MEq7Q+ChT3N9)8=hvcxzDrubwIS{OiiDz~q991G_$KgdXUnwv zP`Ojl>co(!sG-HSmHf^wU>?uza<#jEhq*+VsoTDuL?nVcg)3LCT+88##XE`z4sE6a zb1bLL&VH<~U0;TxC}ZQuJc^yOle~VHaJSQyrpmPkg0o3>4*qX1Y#L~5YqJOrlSD*} z5(!DamPvHB9qsM)X1@jHrMpxShf zjGUR3BZXnu_DFH>xZbWW-<9`d%gjDz-WBa0A@S}4iD5d}uuC|F^z$)R)3IVMl)sN=R904|#4Z1Rb|t{PlT=kg#dtSUfTv%B6^O-YD$#C#$r-QDe#MkMi@n%u% z+UL)oGmh*HoNy>X#uJw3r1R4Gl4HyrGYlb=@$u0lOQF*Lk1RJ zh#nS3M&2p7r5e0cw~yL50|3p5#^f@B?1A~FnOPY#)?Z|n@HS^zx7i4LCFysACp@dF zs1`q@`n%P|gQ0=zs;(1@wS4=Kl1FRm{dX+RziBb7*%MHHgTvvxGqPKAtN+z#tnamZ1%-wCdXlXsJpC+Op`1jIky>Kr(6_?TeOv#L zp3myfG^XkK{PW91Hs8_U6&YCAnl)}&2OKH-JCB?fWNjXM7dBkVe6;oVp*N0Z1mHz( VNV?UH*c#Jsgr6`_aDuln^ACEIe)0eS literal 0 HcmV?d00001 diff --git a/pixelegg/js/slider.js b/pixelegg/js/slider.js index e2aedf242e..f07c110795 100644 --- a/pixelegg/js/slider.js +++ b/pixelegg/js/slider.js @@ -171,7 +171,7 @@ egw_LAB.wait(function() { if (ev.relatedTarget && ev.relatedTarget.id != 'quick_add_selectbox') { $j(this).css({ - transition: "0.2s ease-out 0s", + transition: "0.6s ease-out 0s", width: "16px", 'border-top-left-radius': "0px", 'background-color': "transparent" diff --git a/pixelegg/less/etemplate2.less b/pixelegg/less/etemplate2.less index fbb7b7047a..7edb18358a 100755 --- a/pixelegg/less/etemplate2.less +++ b/pixelegg/less/etemplate2.less @@ -251,7 +251,7 @@ div.et2_link_entry{ -webkit-user-select: none; -moz-user-select: none; user-select: none; - min-width: 76px; + min-width: 73px; &:hover { .color_5_gray; .background_color_25_gray; @@ -294,7 +294,7 @@ div.et2_link_entry{ margin: 0 2px; background-image: none; :first-child { - margin-left: 0.3em; + margin-left: 1px; } } @@ -603,6 +603,9 @@ hr { background-image: none; // width: 50px; + // Filter img + img{.dimension_width_height_xs;} + } button > div { vertical-align: middle; @@ -623,36 +626,26 @@ hr { // background-size: 10px 10px; img { - .dimension_width_height_s; + .dimension_width_height_xs; text-align: left; position: relative; right: 1px; top: 3px; - } + } + + /*&:hover {.Complete_Button_save_apply_copy;}*/ + &:active {background-color: @color_positive_action_active;} } /*right Button*/ - button.ui-corner-right { -// background-image: url("../images/fav_filter_normal.png"); -// background-repeat: no-repeat !important; -// background-size: 10px 10px; - } + button.ui-corner-right {} /* hover */ - button.ui-state-hover { - background-color: @gray_30 !important; -// background-image: url("../images/fav_filter_normal.png") !important; -// background-repeat: no-repeat !important; - background-size: 16px 16px !important; - background-position: 10px center !important; - } + button.ui-state-hover { background-color: @gray_10; } - button.ui-state-hover > img { -// position: absolute; -// top: 70000px; - } + button.ui-state-hover > img {} diff --git a/pixelegg/less/layout_content_elements.less b/pixelegg/less/layout_content_elements.less index b213d02f15..cf78a6865c 100755 --- a/pixelegg/less/layout_content_elements.less +++ b/pixelegg/less/layout_content_elements.less @@ -945,7 +945,7 @@ button.et2_button_with_image{ background-repeat: no-repeat !important; background-position: 6px center; background-size: 20px 20px; - background-color: @gray_30; + background-color: @gray_10; background-color[url$="svg"]{.gradient_vertical (@gray_30, @gray_30);} }