From 15d5369b3bab40e51b1426c2b31d7d7675fdbddd Mon Sep 17 00:00:00 2001 From: Evan Xd Date: Fri, 5 Jul 2013 12:29:39 +0800 Subject: [PATCH] Bug 881137 - Support hdpi resolution device. --- apps/calendar/index.html | 2 +- apps/calendar/js/views/week_child.js | 4 +- apps/calendar/style/building_blocks.css | 14 ++-- .../drawer/images/icons/add@1.5x.png | Bin 0 -> 1265 bytes .../drawer/images/icons/close@1.5x.png | Bin 0 -> 1507 bytes .../drawer/images/icons/edit@1.5x.png | Bin 0 -> 1517 bytes .../drawer/images/icons/menu@1.5x.png | Bin 0 -> 1206 bytes .../drawer/images/icons/user@1.5x.png | Bin 0 -> 1811 bytes apps/calendar/style/calendar.css | 23 +++--- apps/calendar/style/day_views.css | 50 ++++++------ apps/calendar/style/event_view.css | 2 +- .../calendar/style/icons/60/Calendar@1.5x.png | Bin 0 -> 5323 bytes .../icons/ActionIcons_30x30_back_nav.png | Bin 1372 -> 0 bytes .../style/icons/ActionIcons_30x30_done.png | Bin 1503 -> 0 bytes .../icons/ActionIcons_30x30_forward_nav.png | Bin 1335 -> 0 bytes .../style/icons/ActionIcons_30x30_refresh.png | Bin 1936 -> 0 bytes .../icons/ActionIcons_30x30_settings.png | Bin 1931 -> 0 bytes apps/calendar/style/icons/Calendar@1.5x.png | Bin 0 -> 5323 bytes ...ntwarning_30x30.png => accountwarning.png} | Bin .../style/icons/accountwarning@1.5x.png | Bin 0 -> 3844 bytes apps/calendar/style/icons/alarm@1.5x.png | Bin 0 -> 1542 bytes apps/calendar/style/icons/forward_nav.png | Bin 0 -> 1200 bytes .../calendar/style/icons/forward_nav@1.5x.png | Bin 0 -> 1339 bytes apps/calendar/style/icons/settings.png | Bin 0 -> 1691 bytes apps/calendar/style/icons/settings@1.5x.png | Bin 0 -> 2066 bytes apps/calendar/style/icons/update@1.5x.png | Bin 0 -> 2061 bytes apps/calendar/style/modify_account_view.css | 2 +- apps/calendar/style/modify_event_view.css | 2 +- apps/calendar/style/settings.css | 16 ++-- apps/calendar/style/ui.css | 75 +++++++----------- apps/calendar/style/week_view.css | 14 ++-- .../test/unit/views/week_child_test.js | 2 +- 32 files changed, 97 insertions(+), 109 deletions(-) create mode 100755 apps/calendar/style/building_blocks/drawer/images/icons/add@1.5x.png create mode 100755 apps/calendar/style/building_blocks/drawer/images/icons/close@1.5x.png create mode 100755 apps/calendar/style/building_blocks/drawer/images/icons/edit@1.5x.png create mode 100755 apps/calendar/style/building_blocks/drawer/images/icons/menu@1.5x.png create mode 100755 apps/calendar/style/building_blocks/drawer/images/icons/user@1.5x.png create mode 100755 apps/calendar/style/icons/60/Calendar@1.5x.png delete mode 100644 apps/calendar/style/icons/ActionIcons_30x30_back_nav.png delete mode 100644 apps/calendar/style/icons/ActionIcons_30x30_done.png delete mode 100644 apps/calendar/style/icons/ActionIcons_30x30_forward_nav.png delete mode 100644 apps/calendar/style/icons/ActionIcons_30x30_refresh.png delete mode 100644 apps/calendar/style/icons/ActionIcons_30x30_settings.png create mode 100755 apps/calendar/style/icons/Calendar@1.5x.png rename apps/calendar/style/icons/{accountwarning_30x30.png => accountwarning.png} (100%) create mode 100644 apps/calendar/style/icons/accountwarning@1.5x.png create mode 100755 apps/calendar/style/icons/alarm@1.5x.png create mode 100644 apps/calendar/style/icons/forward_nav.png create mode 100755 apps/calendar/style/icons/forward_nav@1.5x.png create mode 100644 apps/calendar/style/icons/settings.png create mode 100755 apps/calendar/style/icons/settings@1.5x.png create mode 100755 apps/calendar/style/icons/update@1.5x.png diff --git a/apps/calendar/index.html b/apps/calendar/index.html index b9884e579841..ab0c8fbb2a1b 100644 --- a/apps/calendar/index.html +++ b/apps/calendar/index.html @@ -154,7 +154,7 @@

- +
diff --git a/apps/calendar/js/views/week_child.js b/apps/calendar/js/views/week_child.js index a9d766a542ac..e4740010a401 100644 --- a/apps/calendar/js/views/week_child.js +++ b/apps/calendar/js/views/week_child.js @@ -52,9 +52,9 @@ Calendar.ns('Views').WeekChild = (function() { // TODO: This is a magic calculation based on current CSS. Fix this so // that it can be dynamic based on CSS, or fix CSS to not need this. - var pxHeight = (hoursDuration * 2) - 5; + var remHeight = ((hoursDuration * 2) - 5) / 10; - element.style.height = 'calc(' + percHeight + '% + ' + pxHeight + 'px)'; + element.style.height = 'calc(' + percHeight + '% + ' + remHeight + 'rem)'; }, create: function() { diff --git a/apps/calendar/style/building_blocks.css b/apps/calendar/style/building_blocks.css index cd671a108f90..69dd4ec842a2 100644 --- a/apps/calendar/style/building_blocks.css +++ b/apps/calendar/style/building_blocks.css @@ -14,7 +14,7 @@ -moz-box-sizing: border-box; padding: 0 0.5rem; font: 1.4rem/4rem "Open Sans", Sans-serif; - border: solid 1px #d1d1d1; + border: solid 0.1rem #d1d1d1; border-radius: 0.3rem; background: #fff url("building_blocks/input_areas/images/ui/shadow.png") repeat-x left top; } @@ -54,7 +54,7 @@ body[role="application"] label .clear[data-state="active"] { body[role="application"] .fieldbox { background: #fff url("building_blocks/input_areas/images/ui/shadow.png") repeat-x left top; border-radius: 0.3rem; - border: 1px solid #C8C8C8; + border: 0.1rem solid #C8C8C8; overflow: hidden; font: 1.4rem/1em "Open Sans", Sans-serif; } @@ -100,14 +100,14 @@ body[role="application"] .fieldbox input { } body[role="application"] .fieldbox dd { - border-left: 1px solid #DDD; + border-left: 0.1rem solid #DDD; border-radius: 0 0.3rem 0.3rem 0; display: block; overflow: hidden; } body[role="application"] .fieldbox label { - border-bottom: 1px solid #DDD; + border-bottom: 0.1rem solid #DDD; } body[role="application"] .fieldbox label:last-child { @@ -130,7 +130,7 @@ body[role="application"] > nav > header { z-index: 10; height: 5rem; color: #fff; - background: url("building_blocks/drawer/images/ui/header.png") repeat-x left top; + background: url("building_blocks/drawer/images/ui/header.png") repeat-x left top / auto 100%; } body[role="application"] > nav > header:after { @@ -206,9 +206,9 @@ body[role="application"] > nav > header .icon { width: 3rem; height: 3rem; margin: 0 -1rem; - background: transparent no-repeat center center; text-indent: 100%; white-space: nowrap; + background: transparent no-repeat center center / 3rem; overflow: hidden; position: relative; height: 4.9rem; @@ -295,4 +295,4 @@ body[role="application"] > nav .inner > ul > li > a { text-overflow: ellipsis; white-space: nowrap; overflow: hidden; -} \ No newline at end of file +} diff --git a/apps/calendar/style/building_blocks/drawer/images/icons/add@1.5x.png b/apps/calendar/style/building_blocks/drawer/images/icons/add@1.5x.png new file mode 100755 index 0000000000000000000000000000000000000000..e3c28f7cc59813b613578e0b90db0c0c6b5530f7 GIT binary patch literal 1265 zcmbVMZD`zN98Xs_T<5vb73Mm%A$2mDcX_$H++ApFbC=wDtm(?#ZS5R_Y4Wre+q^V+ z>ZP3?W#XhCWQZ`ztRe;XVa|S<16PZnOlh}4hqD{vijLumtoT6?ZNd4Zz3co?_Q83uR@6QK@ovzon>_LR)K>(q zYdp~zl_}Xyfr8#T?10>GdtM#xQxh7|{1V>eafrYGP{BQ;-*h>TCsuhmwD-j%fv>8- zKAu=}s!Q&`Q~CpO)3qEO06Pq9flM3IK!$F-{M!Yp{`#)jH%e#i!77P!`+qoR8B zG*-YUcaJvYD&=f2>*E7VG&2qw zj>$t0S~0AuAtMTT@5lRN{Pq*nj+4RC6E!EV3p;nFCkAZz^S$t*Hg>BG-VpXaPk3)V zC+@#olfQa=X7lWU75j_R$FJOpn>VgqNCyIQBmcw}kIc*8-n#Pn_^0xzFH@zx&7;d# znFa5&+D!v^EVtA+^x)?A-@NhKp1RvdpK&jZ{!l$PvL*6yRbX-A-L2;?2L5iX>TH?J zU90`$FY&!+_to^=92kGQfB3@TPe#De<*DSs$KE`=d1a_0ulCW%se^)H(9( zMPtuL_g<;}bN251t`B~jS*hn6MwjdAUT)|U+r*aYOPi*)QP`2Ny!6z>`Ct5>P)2GO JCzG$9_!ojYtakta literal 0 HcmV?d00001 diff --git a/apps/calendar/style/building_blocks/drawer/images/icons/close@1.5x.png b/apps/calendar/style/building_blocks/drawer/images/icons/close@1.5x.png new file mode 100755 index 0000000000000000000000000000000000000000..2800a3f85a1967eda1052cfafdddea1dcf962c93 GIT binary patch literal 1507 zcmeAS@N?(olHy`uVBq!ia0vp^x**KK1|+Sd9?b$$k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+m@_g%B1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+* zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxSU1_g&``n5OwZ87 z)XdCKN5ROz&`93^h|F{iO{`4Ktc=VRpg;*|TTx1yRgjAt)Gi>;Rw<*Tq`*pFzr4I$ zuiRKKzbIYb(9+TpWQLKEE>MMTab;dfVufyAu`kBtHuNWFoz#!AFNG#Ad)HBe}%?0@jth%@)C>7xhtg4GcDhpEegHnt0 zON)|$@sXws(+mtd{1$-}0$pR}Uz7=ql*AmD{N&Qy)VvZ;7h5Huj9yA+ij{?{rK_Q# zp{0?5k%5_op`nG5k)xBVqq&8ltA&Z9ktNIwYg;H2=7#XO ztAUxNsgse3k(rU95>#&rIiaQxbc{YIc_1Yhm=G`xf|&5c59GkJPih`8&lCYO2ltB3 zMg|5ZK~ERQkcwMxZu)y4N|0eM5I^>dSujLEv*hI^MUGu1uP&)B^lpDw`u2?~Q{whU z!7B&13&>Tm&J+4FYe|VmppbJDOQCC@%H~?EBsU>K+%i`NyZcb)22|TXRW*#4+!cA-6tU z3jR?iVz~P1E6JDKY3=MKN8W_(zFU{t8l4cdHf(i+vv=KseBbDe2i_*E4hiioa8vl`(qd&6kaJ_^$14Z@lwWZc1vUt_CLu4)Xy)FD z7HxAnLK3X^MCiQh<9*9^>_?sU^wXYVJLLJr!wXELY@If*japmg%Kd!rsl`l_RXH=` z*I(Dqd|(q^>65TJ*ANgE@MaNk(vwX{f%tM!CROq#2= z&U*c-fAb?8zU1w>#`Wo6dRjq8xgL}51rV}*^-C~;;fz?a?859V)}Uh7)78&qol`;+ E07-WtHUIzs literal 0 HcmV?d00001 diff --git a/apps/calendar/style/building_blocks/drawer/images/icons/edit@1.5x.png b/apps/calendar/style/building_blocks/drawer/images/icons/edit@1.5x.png new file mode 100755 index 0000000000000000000000000000000000000000..cb666b7b8363de9f876e90ccc23fcb91396f6a79 GIT binary patch literal 1517 zcmbVMdr;GM9Pa>~hkA3!DMD{%fjyiwO+s7RK-IKqrD{8_)KT24p$#;HJWQi4G8N}= za)A3kqWG8HLQWQ1^=VN-#(_4yE_lM^n%O&~!e&2jQ zpYJ;r*|x>gV-sU#GTC%X7GalGMfjOAS$boMmujVDj%adP$CHgm}1t41@z!JFDC87VkHQS ztB6H<@PSiKYc^oy1PV|?X$m)tAb>^#Au6>-gQNl|jG#(bx-|+!g{d_dnhs1{pkz(( z6kvA3JYh>Z=|Qh3@|aTT_xmA#8pH{ON<^pAg*i}EA!#UlC9FsW6s#{f!az_yw?OkE z&9Ok3k<8~-iF#1-^g##=Z?!%oW_=Thl2WD&kh~IsU?szZ;~LlYiFWFd8;{lYIZAj+ zX{UVLD#0z)qaZl~mU8!GLt#b98|+nqmWo0a6P$Y$L$RWT(1X$!$U}QDtx0D>5JZQ< zD6G*Uh!#b0g9%U9A||a0M|Ba7$6<9SVb+=ulu)M=2x3BUoFH(m%7B{F)VSF|M6edt zCz7n2irA$kyAxRCiCD}iP^8ES4vs61bU?P36FHxk;{jui26)*@x@k5nm=`Y4gLnx_ zpjT5Kv%oRHc!n|hF&+>mEvz=;X&UpR$W5?Dr#7G}RD&Ym1lIF^vZj=rQHI;&KkX6` zNj(_eK5TyJ@Nj%6R+8jk%ZZx_g9QArj8cLXk6{q#HAk?i=NT17ti&ioZKz0|Y6KGU_YrG0P1-Xsxdn>%>Txv@1p5ASVy(Gzbw zxI%H~#@XVdSSZ?4e|uDvUn$heX9Z7OcUI4i+X^3_dB7B^T**3?AGAZ;#|G|aomrH( zzk8&A_2J(v+eRA)pn1*wo}Tti^eMn!bz$?l;LgTRv^z9Y5|R=R#k_DJu9tG{KKqI* z)qC;0t8A@d*tsmYjXty|v*R~DLs zZ#4RW&ZjrxifNz8YBFxlb`>Si6J*tqte^bl$o?Usy^u#U6Pi20ftxKr{?<9@7K0osHUlplc zSAyr0m;V#nQ!y#(l*)Q|@%E!jN*k27I=TaI#b<=3?!LYa+IscR*CyBDg{Ql&%@4|= WhmKz?nU#A_1?d_5;RZ% literal 0 HcmV?d00001 diff --git a/apps/calendar/style/building_blocks/drawer/images/icons/menu@1.5x.png b/apps/calendar/style/building_blocks/drawer/images/icons/menu@1.5x.png new file mode 100755 index 0000000000000000000000000000000000000000..d63e735af400ed2a3d935cd25ad288a305ab2542 GIT binary patch literal 1206 zcmbVMZ)n_P7>}!)GHBUggS7~z=^PH1KX00(mvGmaOLF#b*L8QNEq*Ab$=hDq=8wsH zyR;w-duup zigfG@H7FLiLZHEl(>EQ$(sX~>nx3#^o7&$?reg&YxDc6S>`r=-5@)DYUIovSZI&We zP0&P!S`#%?7$7x2grvxH(-sE+DM<_vL`eesNS*^c%i&w1fuM+z!uODki^ASQdsHdv zxrQ&i%1{-A0)=I3wHj0FX8drB1+pwB96V2B3p$$ekQvin)YW9rVPu6)fE?c=6Gn5y zuc8cvm9B;028F^pu@^NGg;U1HX21f5V_i3iYt=eJMR-rfhSpJeDu8SeMt(K4@Og}O zHNiM{_ji;SVl~Ra(7}gdPU^l@b)kpydWOPZ7~8Rxlpz}c0Ga1_PD%lg;(0Y|s68oQ zqy&|hn;aWqWuR$NPM37CM+d;*RaMv3l#u0f-J+Vy>P>9ki;(GAu<6&qej8ZvzF0*I zp^5yk?E90=3K*#P$d4+1Kx!q4e7s;&1^3>+J(Q+%q9=j+0t^ z12@*qysnnxAC})!+pdz^jCS~A{ri@;KSjTsc=hbB<>7O+8=Ee3Uu|CK?5yv6^OVr} z_dDD6IHlp+2Oiy#9hhCnRd*fPBAk3+ma5Q~W{&Q7`d0n+De&bh-(9ZnequI0#2rqb zS?t|2vGURUWAyPCuixGLdAi*?cKYJG*}3=64gP%njkE3_U+jM9O!@0SzZF+zUmE|I z{qWdlCoYW7KiGR0F)LReS$4j;^Si(F>`waHb6uab-Q0BRnent(-`BwkzYQ)ey#D0U zVoGRxOItef+ICalwLP~yfAp_|Egg%AuzzNb6D>q(xGz6f-P@Y{N%BU&em?vB%l`st CrIs83 literal 0 HcmV?d00001 diff --git a/apps/calendar/style/building_blocks/drawer/images/icons/user@1.5x.png b/apps/calendar/style/building_blocks/drawer/images/icons/user@1.5x.png new file mode 100755 index 0000000000000000000000000000000000000000..47792828c7f6dd3e9dbbddc86ca3c2e3053c9d85 GIT binary patch literal 1811 zcmbVNdsNeA6t9YkaCpd6v=hnVP(YeCDGjtxAkbD2iU^2>ff(A*7HCtOAO#OTU_Oti z9K{Jvd;lsw=X`?<8FT7j@|XzD2}~#AVJa%<5vMFg(EZ`@kL4u!zI^%J-~HYD-J5KP z2%l?X#kOLxST-TSl1OIcm@mt5%w5F3Tf_|0XsLpZB9rM1+(@u66`4c;Av#=5L=w0v zbLln0m&F>R(MBt1g*;58By|vO#y}>Wfw5+>eEm%ZT$xJHKoX(W>c!xb%4!hMs>I+T zft)8d1Q8l-aF&sX$_kHGW~C~HD$w5#@HL4T0v$o)fJv98r$i<(IK(Sr=H_KC2n<2! zR5AEYltLZ>1d&Dp5I}s6k_W>8ibAlb07YRB0O7$1m&cqa2lf;RP!Zw<3?Crl&8SKi zMM`ADzL+O5sG(_th|A5$$bd5V5NT9%VWCiH=0Fe*gWyn^dKx!z^wi7|1_?najamb( zCG~)r5lFfYVp7I6;RY@Y@whsjIj$izMMn}JWPB7&MQ0ia zZX`jG=|&~9AIUREjG5eh+L0N^s1eOKYMD*J(a{4QT*^qENt9jw`i#^Mads zgWkm}A&lB(gi2;4b-+-DMcR)jkVw6Gf*_2K%05Ic<)K1BAmWLj2n-I}s{T*bxQrOC zxjg<;E+b1!4VtI#i=TOT-#&z%=@}!_93|}wx|yECLL^wU>G!{PhH5^;re1l@JC<+n z+{m_H@D#LiNVI4Q6&L1KEswSQY(( zA1Ez9ndyIXaQ0ViDW`m17b$vk{rREGl2`iNdNo7oC~Z31Qjg!xdEs32jV`LPMt_bx zpWHSEx@zaNioKQPQua3Sxm#?jy2)-{vtbbGwvDzQ{4V_9shlq8P6;8cL<%jkrwq(G ztT@v0%OdvzYH)O)+aV7muJX?D>kSQip1AZa(_l9=Ehz#%f_#5)QDdug_mnMH$ns3? zk-Z(=YZfOY$d^=%5;xlBK7Mw(y=L)=mxmf2eBS94e=(xEy{5Mns_yU)PAG0n?XzP~ z<<8o6jU6|8zGkB#vCsB+Yfr~mOtb%X*Y4$#KHK^S&&e`J$IKxA=2MZAZq@$TYf<5n z?YyIAJtJ<0COu>QdOR%M!T8dBlTT<_^Q1WjbXT@*M#i|PM?KmfJyEnv5g&gs@8bTW zTdD18wc5EN9(wj@og#jBOKdxtw|Vo74VRN%8ZZ1Y=jhwH4*exf-EWrgOrvV&2Q1H9 zQL*ey>EhIht6sZBMk0T$9#B2b|7XDJ1`=nn)AraIhvqT5pYAu!YhUGu)v^O1jB1o$ zt*yJ?R8193Uw!o3l+xcG)}>G(m(p)_)$c31Afw{WPF(tEZE;$c)6`2|th!_Ikbl_) z`8rvLbyd`}8mrEP)vY#X?yU=(b?SCn_kO>x7#TxtPYcx18=3H}kPt=*O>f-EV7S z;}o;;3y;P(==H9rrU8}PDyZ9m)Rdl>T;{QL?7(=kJKDWJsvJz3x6@U#uQGQ$4^8^@ zA>ACCm;+YjfBleuVxjESi-NX-n4-y|8tV#$2h=zrcUp^SljCW?lG3;*2UK^Bb=n|F zN@=VwuttN~Z*r%sY=}K~TRv85b(noTp5=@8yK_05s_j2KI2=1WY)e^!uJD}on!u>j zjtd .hour.hour-allday { @@ -61,15 +61,15 @@ .day-events .container { /* turn off calendar color bg */ background: white !important; - border-width: 1px; + border-width: 0.1rem; border-style: solid; - border-left-width: 6px; + border-left-width: 0.6rem; height: 100%; padding: 1rem; } .day-events .event.has-alarms .container { - background: #FFF url(/style/icons/alarm.png) no-repeat top right !important; + background: #FFF url(/style/icons/alarm.png) no-repeat top right / 3rem !important; } .day-events .hour .display-hour { @@ -81,18 +81,22 @@ } .day-events .event h5 { - width: calc(100% - 1rem - 6px); - min-height: 2rem; - padding-top: 0.25rem; - font-size: 1.6rem; + width: calc(100% - 1rem - 0.6rem); + min-height: 2.2rem; + padding-top: 0.6rem; + font-size: 1.9rem; + font-weight: 500; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; } .day-events .event .details { - width: calc(100% - 1rem - 6px); - min-height: 2rem; + display: block; + top: 2.8rem; + width: calc(100% - 1rem - 0.6rem); + min-height: 2.1rem; + padding-top: 0.8rem; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; @@ -113,16 +117,16 @@ /* overlap */ -.event[data-overlaps="1"] { padding-left: 6px; z-index: 11; } -.event[data-overlaps="2"] { padding-left: 12px; z-index: 12; } -.event[data-overlaps="3"] { padding-left: 18px; z-index: 13; } -.event[data-overlaps="4"] { padding-left: 24px; z-index: 14; } -.event[data-overlaps="5"] { padding-left: 30px; z-index: 15; } -.event[data-overlaps="6"] { padding-left: 36px; z-index: 16; } -.event[data-overlaps="7"] { padding-left: 42px; z-index: 17; } -.event[data-overlaps="8"] { padding-left: 48px; z-index: 18; } -.event[data-overlaps="9"] { padding-left: 54px; z-index: 19; } -.event[data-overlaps="10"] { padding-left: 60px; z-index: 20; } +.event[data-overlaps="1"] { padding-left: 0.6rem; z-index: 11; } +.event[data-overlaps="2"] { padding-left: 1.2rem; z-index: 12; } +.event[data-overlaps="3"] { padding-left: 1.8rem; z-index: 13; } +.event[data-overlaps="4"] { padding-left: 2.4rem; z-index: 14; } +.event[data-overlaps="5"] { padding-left: 3rem; z-index: 15; } +.event[data-overlaps="6"] { padding-left: 3.6rem; z-index: 16; } +.event[data-overlaps="7"] { padding-left: 4.2rem; z-index: 17; } +.event[data-overlaps="8"] { padding-left: 4.8rem; z-index: 18; } +.event[data-overlaps="9"] { padding-left: 5.4rem; z-index: 19; } +.event[data-overlaps="10"] { padding-left: 6rem; z-index: 20; } /* months day view */ @@ -140,8 +144,8 @@ height: calc(100% - 8.33rem); position: absolute; width: 100%; - border-left: 1px solid #AAA; - border-right: 1px solid #AAA; + border-left: 0.1rem solid #AAA; + border-right: 0.1rem solid #AAA; display: none; } @@ -156,7 +160,7 @@ #day-view .day-events { overflow-y: scroll; overflow-x: hidden; - height: 80%; + height: calc(100% - 6rem); } #day-view .day-events.allday { diff --git a/apps/calendar/style/event_view.css b/apps/calendar/style/event_view.css index 990fd5e6259e..b27a0075c491 100644 --- a/apps/calendar/style/event_view.css +++ b/apps/calendar/style/event_view.css @@ -30,7 +30,7 @@ #event-view .start-date, #event-view .description { - border-top: 1px solid #ccc; + border-top: 0.1rem solid #ccc; margin-top: 0.8rem; padding-top: 0.8rem; } diff --git a/apps/calendar/style/icons/60/Calendar@1.5x.png b/apps/calendar/style/icons/60/Calendar@1.5x.png new file mode 100755 index 0000000000000000000000000000000000000000..5df11930acff958ff188fa9501c18fb607c1cc1d GIT binary patch literal 5323 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 literal 0 HcmV?d00001 diff --git a/apps/calendar/style/icons/ActionIcons_30x30_back_nav.png b/apps/calendar/style/icons/ActionIcons_30x30_back_nav.png deleted file mode 100644 index 5383ee24de586e91e8af7db6982ce7a424dafaef..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1372 zcmbVMTTC2P7@pmtDG-Vzb(Pl8VbDh6?#`THuLBD#JG(n6~ZN?FeUi#}8zoXpHQ z=b!KU{>%B#oTv=$%ShXmhGAHSe?MD|#vJY0{y2IUQX?OtAzSsjN(`yc{-j8pa$8M-Ussib`S;j&Fe~9)eAx2zuuG;Kl%Q?yf3xtK|c<|P$a808f) zqKdMFYl>V*ZdY9digY7|a3m1e5|*Nyg+e7GV_bv;W{M1lwY=8RQMDTW9mXTk(b~=k zB&%UmZdZ7;AB}lQGOFEwJJNtC8s;TMM4Q63vNGQuhLY-MT?G1K7DRz@c%5DVfRm2lU%f&Q)Q)AmRpk@P}wZ2a{GY0kC>T;} zkAJjF(u8_Yn{G8fT5KI3D4{c>pu-`aZhQ{IbbWr-T^pMVttJvBS4y$HZ|U?yhOaZ? zx6TMfD_Iv85(}#*ONTR$U(kQ^y>3~&!#`V*Ufi?x{^XI|ao@djzE5^O(`q#4l=cmN zY#3@t(~rIWQ18tquN$Wuf0;S8=i;kfT?YNTH~sf?@!J!}vV*Vn^7vrZ@jnxJZ)EN% zJ~SGSM|8XLGL}<{N2zOjr$Zs*vEiY!QFTKg;!M`z?rXENvuXFCb@%QD*TCH@ z{CBpU505>Hg#XfnabXW#_Nd4>!kpqPqOl zxo>CcjXig7UCys$&Ue3;es#I&##z(h&tgl4b3Z?|_#~b(cW8WJ#|!gNj;>Ws h&3}3Hw|M+%d>s2JR^z$eZ4PMvJHI!`j+7mF^DjxYc-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxSU1_g&``n5OwZ87 z)XdCKN5ROz&`93^h|F{iO{`4Ktc=VRpg;*|TTx1yRgjAt)Gi>;Rw<*Tq`*pFzr4I$ zuiRKKzbIYb(9+TpWQLKEE>MMTab;dfVufyAu`kBtHuNWFoz#!AFNG#Ad)HBe}%?0@jth%@)C>7xhtg4GcDhpEegHnt0 zON)|$@sXws(+mtd{1$-}0$pR}Uz7=ql*AmD{N&Qy)VvZ;7h5Huj9yA+ij{?{rK_Q# zp{0?5k%5_op`nG5k)xBVqq&8ltA&Z9ktNIwYpKn^_nq~-zhOc5}1w5VLI zVqjq6^>lFzskrrKn!Wd72Z>{o)xt7#Sqo1rYTnhcx>>=Az3|e;#k1G>JxU4;`5?Sw z=Z=m9>nnOeI$nz2_RRqrAzBN4w=TRkN$um#Nlwv|SNleBzdCq$?@sS`<@NWzf7;ZR zXs}pAF3siX`^KN|*ruhn^R>qRteD+r9AYi-e9}Va=@Do4Wlr9h9yoW?-8kQ{o^3); zrmAQz&YZPa_rveM@&^+NT(6h5J>FqyGS%mW^070Y&F&W-O$roYQDoZvs$i>-!}As9 z3%t0w&R%(4+PVF!RlmFISDw8)Ed6>GGh5wlnsm%<@xi|>;r-j44LNn^`W^4MsJQvF zX!P6$%^hFvX)j*;V2||1h&KYU+|JCCjaxrW3uybu%bMdUSIfq-$9nHS4>_9`o1(xYVBII zqrKwn1-7?4uU6bMweo%<-Dl!@i1U2@hUaq|eim5RbY|<_WVLUbrg`u54p#I0`2iX# zSF*NNA6^#GdPdp=f JS?83{1ONl%Ds2D& diff --git a/apps/calendar/style/icons/ActionIcons_30x30_forward_nav.png b/apps/calendar/style/icons/ActionIcons_30x30_forward_nav.png deleted file mode 100644 index a71c7c05d8e3878952ad8e2f46a8c75e24a2b9df..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1335 zcmeAS@N?(olHy`uVBq!ia0vp^av;pX1|+Qw)-3{3k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+m@_g%B1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+* zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxSU1_g&``n5OwZ87 z)XdCKN5ROz&`93^h|F{iO{`4Ktc=VRpg;*|TTx1yRgjAt)Gi>;Rw<*Tq`*pFzr4I$ zuiRKKzbIYb(9+TpWQLKEE>MMTab;dfVufyAu`kBtHuNWFoz#!AFNG#Ad)HBe}%?0@jth%@)C>7xhtg4GcDhpEegHnt0 zON)|$@sXws(+mtd{1$-}0$pR}Uz7=ql*AmD{N&Qy)VvZ;7h5Huj9yA+ij{?{rK_Q# zp{0?5k%5_op`nG5k)xBVqq&8ltA&Z9ktNIwYNUly*UGslHL)bWC?r2W2bKZ?GV)9Ei!<^I z6r6+26f}GjlQZ)`0-B%*g80`ZwJ5VJHN~wcKUV=9!d97BTwv;CY~t)>ZenZ>^|`a5 ziJQ5Jfupmji?g!<(B}}nDddEjKF~4xpyYv+Twp@LGzenC6F-mx&pxSnz&uj~%p9+| zT2C`DFapEOF{I*F(x3nT?GHOJsI@UNEf%}XyJ5nj86TgxxBY+i=afSl*MwM458D9U z&{`SJBccw@)-PnQ%nR5hlToQ|tLxS`&!|XO{cI99 z^%b72Sg|7D=hxTQTmP?EF!|vTcD9tB>pGKk*d#rgo?h8HgXQ$fd_%_5_O-u4{7xjf z1!buRFg8uQ;V^A8#yqpjz3}Q&UY9G-rhhc}$BscqH%6j*YkO+^G?p@N-(# zPYKi2ADBM|K5;4i`|E3{gEDVpM2Ff+sjQcVHPeFbCMD^rrWjfl?qTiFo%lE;IC!({ zi5iYAZ)A0|)!n>wRj)siof73$#h9dcU{CS!zOxS8p$!#EJEt`@_byQq=4cSH7BObj nt@Y2F-Cejv-SCYr8;1ddp3G_%y%#AbK}DITtDnm{r-UW|;pfXl diff --git a/apps/calendar/style/icons/ActionIcons_30x30_refresh.png b/apps/calendar/style/icons/ActionIcons_30x30_refresh.png deleted file mode 100644 index ba75f60532890ac4068cc2f5e89eb7c6cb8da795..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1936 zcmbVNX;2eq7!Hbvj0gzc2kRo#T5@biLK27?vcZHJgb)Qa3NhJ`EhHN^3nbuyA}Su7 zRZ&C*tTu6shAL&es3+12R@7>-f}$vn2lb#>bhH}<+aHcUy0g3AvCs3o$M?Roc`?y5 zJw3*HP$(2nsRWjj<3#7rvc$+J}IC_2o+$~ry5LrvjBXr%O~f~Z8`|NhY%?O z@PktcvKT;w;RwK{g;3QD2m&}98pL9AI8ZRaWI#+hgSnC?*d6{xJJvD z!;yWq$dv%p5rmOXr)Okj&@w`37@karcs!m{gUO_l2&&0qAXH|m!4%N103#+fjv5IR zGXPFS)nY7-5P+noA41R@WwMXL22)?6$du8|DkB}DG3a`|Gp_e&6Cp?bb>ow0lfq&| z=yJq_rQvGwJhTD*WHNW3H{=A8-tcGRD0wKVR2WmI=@A1Vg#{q_g{DC@e6E-$h9HQ? zWH1>VE(CFzOkspr7|MmjT$Yf@>(}@c7lt4)n+ZoUVTeginIxPmhDffM!GV};xSuOE zm4WWAT%VkL`mP$ezK;=9t$s|1#NgC#A4ZVQzUGzfe*VJ34)VsYVuh z<7!3P-Bqh43y$fuBGFm*pulfEt2=A*8nvT*zUNkLnA{l|Ts$Rjd13SZM#N{0DGFUw zD)yf*NB|Ly6NXY~?C?c4y(ZoaE>K+VDSE~;^2=PB1p zsc#Nz!Zm%=_^(#ZxP9!FVMWI?^Z21|0o#j;CN(uRZE^hm_@YIWmF)}k1RuM)AKsl` z!Y^-Xu-on9$dMTq7Uo&vwa(k$YPF)}<>l*bHro{??Z?7=NY#!2J%J+~5t5*DN9G?G zwUD+o#;T|Z_?do4rrNkdmFO7fySe^(aBuIvL_ez1hMc7OuBy(@&$kKN%inoqwcToN#_g4r zpto1)9(d>6{kITD0xRZD*_1II-O)3)$=Gc6)Z>>1-hd|A*YNhesi>%knw7czm4{o7 z{rvg!araCEt$W&b*nBd>H&nDCie!dM*se=$k9uA|(Y?M*-;r$_!n>Zt_;!?^-_>-2 z_@ntzcg~?@t9IRPf3n&Ipw*WYu^gH?&kJA17B5&|i0y4yJI1$VM@!t6fS}8>3rpN% z3l7)ROfB=$<*dluPmcy}yz!0*#8X3$D24WG2kJd17nhZ#xLS6+3RbjvFs>ikTzVKY zwV(C&X}Vb$S!K-`n<#%YD9L+R&y@|QDt{SZSvxc2$xY4X+OeHOw*F)p+OaU+z5K?o znJq0X_93nVK<=Q%ZxV&iH!iYBCe5??UC8sQ&wHsnFt^NF8=jZA%s#v ziFeWUX}c~xG;*hvHr_Al?d^3@j@+B{)~&9!?dW4_>5Q?!WQ+gpm`$r6veyM$$Gz45 lcDVfQyWDvPpMRb0LQ(Adft7sooYeV`l!~KadqmQze*h~-`Ah%+ diff --git a/apps/calendar/style/icons/ActionIcons_30x30_settings.png b/apps/calendar/style/icons/ActionIcons_30x30_settings.png deleted file mode 100644 index 04c0b44180dc8573e6a68ed99969d2389a3732e7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1931 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 literal 0 HcmV?d00001 diff --git a/apps/calendar/style/icons/accountwarning_30x30.png b/apps/calendar/style/icons/accountwarning.png similarity index 100% rename from apps/calendar/style/icons/accountwarning_30x30.png rename to apps/calendar/style/icons/accountwarning.png diff --git a/apps/calendar/style/icons/accountwarning@1.5x.png b/apps/calendar/style/icons/accountwarning@1.5x.png new file mode 100644 index 0000000000000000000000000000000000000000..40e332e5d60063ac02a320a88465f84d4ae1f272 GIT binary patch literal 3844 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 literal 0 HcmV?d00001 diff --git a/apps/calendar/style/icons/alarm@1.5x.png b/apps/calendar/style/icons/alarm@1.5x.png new file mode 100755 index 0000000000000000000000000000000000000000..6cdd382be0fd3301dbf7e7691fd8925e8ef5fca0 GIT binary patch literal 1542 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 literal 0 HcmV?d00001 diff --git a/apps/calendar/style/icons/settings.png b/apps/calendar/style/icons/settings.png new file mode 100644 index 0000000000000000000000000000000000000000..ce6949729d07a06e49f2bc86991fc8be996cf925 GIT binary patch literal 1691 zcmaJ?c~BEq91aMGh*d#B)Z)5=%9Y&&0wfSH2S`RjAwf)0DIwWFAe)VwjpQh`+JX(# zq9Rm4w1T1x0uya*83j?X>Qsi&cyNq@N5`8(Mr}*gZV<44l%MKfdB$jnu&-Isob#X zG7?FlOaqn45<()3XUQ;>Dz#y#dQ?NQDU`@)y+$g_K?ooN$yBP@;NYnDA1EDl3EjT1BEG!V9!!#Iz=@5+`Lhya zn{3b^kOzzJX4&NvM-^?#Ih|R}iS;**M;#cP8(*;X{wm0Eg~lPA84+Qc zxoC~D+oR}$=U!R%YL!FlP{HWv=-M-V?x=pP07`Rg zJ8y$AkNa+Agm;}dIXcPJGGq6-nMAF9yVFU9(9+k{rT?x`T)kVFV&e3~ulD^xBP{J` z%D88o*G5#WjKQ1t)w|Q~bmknk4h*P0&S$1Nd5&b)=DRjp@)_ptu8Ojyd(gRJ zr=G(le)C+a8g4xuj$eM_>wVPW{U<7Vn~p!t%tI2=etS$9o0I*0BfUF6PO+|cTN7CA z_c!EdzqL29O4l;KT2$xLk~YZmIF#_Jd=~eHVAokbc=x*4Rf z!u>^UH*cowtvXV-v8SB%;E)@;=E)bA(tRpB8t)fcf9!q!RZ9KK3cA7~DH!5qSRXxc z+O}D5H1-G>o}AY@GJUVSTXvo!s&tcSblQ%jhRvsL=XRIBBGv@bd|8|dc42JilXLW_ zsDX4{&xPt+n*P_>=G*>=H1MZpTF7S3{#Tsb6sQZ8D7|a7lN1sej_)1 F+duvWixB_- literal 0 HcmV?d00001 diff --git a/apps/calendar/style/icons/settings@1.5x.png b/apps/calendar/style/icons/settings@1.5x.png new file mode 100755 index 0000000000000000000000000000000000000000..79c400cdd81a6aa9f30f5606020157aa5ca38299 GIT binary patch literal 2066 zcmbVNYg7|w8V+{^L1-(=MHvP;ia?SHBqWg_fk`06ppb}A1<7R+Vn`-V1`{q)u#}4) zx^gLJm0Gu2up-N)tsuG;R5*xMp$Mpm2nY(59_T8T;~sS<3U+^Z`eSG2o9{C3^Ssad ze(!gtcw0=QgPofli9~V`M8R=HA7E;>*2J6bHhz@oTyb6kE!m$c8{NiYX}&i^Vc=&}adKMSwm-i%X0FTD|uY z1B~cpm`aDMP%U6$lt|HZoC6X{--e*k35D;7wfeB{~X3rcyK-Q(SMX^>`fe zr;PVn>%|#5gc677(R55k?1#d82~6bfuN|2T2{r7kn2OjGNg9mG(lv+{7r-2l_(GPe z9IX*6y)j~mQ{c+4O!jkUz_J}iqyr?IH?2$&uWLlBR~<-#zR z85Bj_f-h{I)jIQ6ozb2o+l!;Fg*IM2Q0KcR zBN2du-JeKnDyM7gzY2WZFKn3)*;_$>V3_U7a9y@(PDW8Gd!A-__GEnhKraVNi==HO zA9aR$2>MKSR-s$3wb6D%$q)6bd!q+yPlrgal^1j?`si}#@!2GW;*r|;%6a8jeEZ~`wwb}f!Qiu>?Du%!9b0n5)+$_+<0Uk_Wi+c&w1ox zw~NC|59*VWlK2VgmC{>dy5U33UKKxXJg?I^wA|y=5A50cnFR+phF& ztH9aQb#?v4KKqlS@|TT$K=OVDTsowvYiM}N&o&wt?5dKwUCsYkfA@n-DBsZ7+^lGS z>ekaWGc)7fcr2g*pB^8V2LJnE)OK(Aic``5tZlSP#yTx)Cx5tkGv=cmpPz694;~*F z*lu4nke6rnVfJp=%fjg~^JceA+5R8X%(oPcMW+?0)#@jgQe1qd{TcUUGMOS|ebCUu ztQpG*(d&+m{N2_sn?9cF$;BTZSkX`?Bwe9yoNz?fl$|b4aW`}8^U2DoC_AB5sk%$^ zbmX-YcLYBre_GUh|NK?P-I0-G2j{KT>yo+{iQBg$9TppSM=PDyI7v78|HEfQrm6`k zqMVCc`)z;nWv-WU@3Q&%d3vl<{iq-L`t|ECrJ}W{YoUksx2dVCm0<}M3qLDA)#(~V zX?tTOw|`cy?(FIB7az5~yrwqtXGFx$nRu8yuVRqGnIR4--VxSvd%NJJSwe!PdVFZyReH^cwYb{w-trp`vL_*VTo2QpZIlncz9>uEmdn~OvCMa zXj4LcspDGv$cuOUprQXvPu1jJ!lH8xK4xE}tMaE%7(Ss-j9ULXwqo5&&yvmN%SqWa VRRP~Mqy(A%(gI!#Tpylt;J>ufHQE3G literal 0 HcmV?d00001 diff --git a/apps/calendar/style/icons/update@1.5x.png b/apps/calendar/style/icons/update@1.5x.png new file mode 100755 index 0000000000000000000000000000000000000000..fabdbcef964f0ae92c98f3fe58bf71eff153f8a5 GIT binary patch literal 2061 zcmbVNYg7|w8jgmA0!1unK_uHDz^Z62Gmwx(A_OLZP!o|m3c@5AOn_WW1_&&ITvXJ> z0t&VYUMQih_8_39P`lK+P>V|ir8S@kr5Jsk;*e+aI3(=$x7PzVDs)dEWb( zLt)}zI~x}p0)b#B41vS(m12J0u*BaSm!XsRvIgVFViD?OEECb91fEPSK>?u>*^P#y zh%9SQ2kJ*45ao)jn?wib=Z7Dr06Q>APf*?$Y*r{~}VN)$r?y)sRuDl}mo0?Q%2Jx8X8EY)09ecTraeBSUCE- z8?V*YMP_MGS~#jxr)#BnJ(As*zluj_lC1gtH6tbq`_)wx)N1kLYPa&zfffg z8HdGZ^Fa_~Lv)DFWPuAFwA55 z1VRFD22T(OFJXl$9fqi+=#pIpZg&yO_){z=NQ)wvS{tcWr!93rm|Tsib#k=^2#R0= z>qUrEp)w0Lm<#kWUKrIXGEkX7t5yOpGR#rD#siqoqBDYc-b}&ok@M+HHX{)7ftV0T zUc}1&O4ew&Gcf$Q+-Rpl-6mP#f?xe31HLjmM=B?c2Y00v!k_^TyBPJblhdYDIv6Vr@Rm(iDr2`o! zvZ9j+TU*=2_BPQ!dLr7>?nxRiAItbYW!7^m*XrZn zSk3oKD=N|@$;qRJ(wWiGy4`a5cxAX%S)E5|#z^^UX>M+-FvQiWCpId|5OH&4zfJ$c zhbixs&JPdEPIbxm5<(nrUGsT9RckVtoNR4u9PBxYiu;dqso!NJCJu6c$;mIj+r6#X zzU{+vO5bfR&s$Hlg!aV^kgi!T5bmrJ54^okz2HyXRNfO-^v-#O~&b6AjJH^Q5`*g^u9@w^pMux$X0x3JVLnJglF+6~E;T zh@Q#kx1)x_t)ZczdV%1;>5cx@hPO;pg$LF84eCTQiZj{7piBjWo&SQjhtE OPZ09OaD8A>!T$ja8acWE literal 0 HcmV?d00001 diff --git a/apps/calendar/style/modify_account_view.css b/apps/calendar/style/modify_account_view.css index 5362e6cd8a0d..8bd35c348564 100644 --- a/apps/calendar/style/modify_account_view.css +++ b/apps/calendar/style/modify_account_view.css @@ -62,7 +62,7 @@ #modify-account-view .sync-errors p { margin: 0; height: 3rem; - background: transparent url('icons/accountwarning_30x30.png') no-repeat left top; + background: transparent url('icons/accountwarning.png') no-repeat left top; padding-left: 3.5rem; line-height: 3rem; } diff --git a/apps/calendar/style/modify_event_view.css b/apps/calendar/style/modify_event_view.css index caa62b3186a5..2388eb95570c 100755 --- a/apps/calendar/style/modify_event_view.css +++ b/apps/calendar/style/modify_event_view.css @@ -37,7 +37,7 @@ #modify-event-view li.end-time, #modify-event-view li.start-time { text-align: center; - width: calc(40% - 1px); + width: calc(40% - 0.1rem); float: left } diff --git a/apps/calendar/style/settings.css b/apps/calendar/style/settings.css index d04d8e57a748..079efdc0f8fa 100644 --- a/apps/calendar/style/settings.css +++ b/apps/calendar/style/settings.css @@ -14,7 +14,7 @@ body[data-path^='/create-account'] #time-views, body[data-path^='/settings'] #time-views { position: relative; transform: translateX(80%); - box-shadow: 1px 1px 5px 5px #222; + box-shadow: 0.1rem 0.1rem 0.5rem 0.5rem #222; transition: transform 0.5s ease-in-out; } @@ -37,7 +37,7 @@ body[data-path^='/settings'] #time-views { overflow: hidden; white-space: nowrap; text-overflow: ellipsis; - width: -moz-calc(100% - 20px); + width: -moz-calc(100% - 2rem); height: 100%; } @@ -47,7 +47,7 @@ body[data-path^='/settings'] #time-views { } #settings .calendars .error label { - background: transparent url('icons/accountwarning_30x30.png') no-repeat 2rem 0.5rem; + background: transparent url('icons/accountwarning.png') no-repeat 2rem 0.5rem; padding-left: 6rem; } @@ -82,9 +82,9 @@ body[data-path^='/settings'] #time-views { #settings > menu { position: absolute; - bottom: 0px; - height: 40px; - padding: 5px 0px; + bottom: 0; + height: 4rem; + padding: 0.5rem 0; background-color: rgba(0, 0, 0, 0.3); } @@ -95,7 +95,7 @@ body[data-path^='/settings'] #time-views { #settings .settings { width: 5.5rem; height: 4rem; - background: transparent url('/style/icons/ActionIcons_30x30_settings.png') no-repeat center; + background: transparent url('/style/icons/settings.png') no-repeat center / 3rem; font-size: 0; display: block; } @@ -112,7 +112,7 @@ body[data-path^='/settings'] #time-views { #settings .calendars input[type="checkbox"]:checked + span { width: 2.2rem; height: 1.9rem; - background: transparent url('/style/icons/checkmark.png') no-repeat; + background: transparent url('/style/icons/checkmark.png') no-repeat center / 1.4rem; } #settings .calendars input[type="checkbox"] + span { diff --git a/apps/calendar/style/ui.css b/apps/calendar/style/ui.css index e281b965282e..38a920fbefad 100644 --- a/apps/calendar/style/ui.css +++ b/apps/calendar/style/ui.css @@ -1,8 +1,3 @@ -/* Device Layouts */ - -@media screen and (max-width: 480px) { -} - /* loading */ body.loading { @@ -31,7 +26,7 @@ ol.link-list a { line-height: 150%; font-size: 1.8rem; padding: 1.5rem 1rem; - border-bottom: 1px solid #C5C5C5; + border-bottom: 0.1rem solid #C5C5C5; text-decoration: none; color: #333; margin: 0 1.5rem 1rem; @@ -42,7 +37,7 @@ ol.link-list li:last-child label { } ol.link-list a { - background: transparent url('icons/ActionIcons_30x30_forward_nav.png') no-repeat right; + background: url("icons/forward_nav.png") no-repeat scroll right center / 3rem transparent; } /* view management */ @@ -93,10 +88,10 @@ ol.link-list a { #progress-indicator { position: absolute; - top: 10%; - left: 0px; + top: 6.9rem; + left: 0; width: 100%; - height: 3px; + height: 0.3rem; border: none; overflow: hidden; z-index: 1000; @@ -108,15 +103,17 @@ ol.link-list a { } #throbber { + height: 5.2rem; + background: url('ui/progress.png') repeat-x left bottom / 32rem !important; animation: .5s throb infinite steps(12); } @keyframes throb { from { - transform: translate(0px, 0px); + transform: translate(0, 0); } to { - transform: translate(0px, -48px); + transform: translate(0, -4.8rem); } } @@ -160,7 +157,7 @@ ol.link-list a { } #advanced-settings-view .account-list .error a { - background: transparent url('icons/accountwarning_30x30.png') no-repeat left; + background: transparent url('icons/accountwarning.png') no-repeat left; padding-left: 3.5rem; } @@ -190,7 +187,7 @@ ol.link-list a { /* completely override other views */ background: #E6E6E0; position: absolute; - top: 0px; + top: 0; width: 100%; height: 100% } @@ -233,8 +230,8 @@ ol.link-list a { text-transform: uppercase; font-size: 1.3rem; padding: 0.185rem 0; - border-right: 1px solid #131314; - border-left: 1px solid #515051; + border-right: 0.1rem solid #131314; + border-left: 0.1rem solid #515051; } #month-days li:first-child { @@ -257,8 +254,8 @@ section.month { position: absolute; color: #484848; width: 100%; - border-left: 1px solid #AAA; - border-right: 1px solid #AAA; + border-left: 0.1rem solid #AAA; + border-right: 0.1rem solid #AAA; display: none; } @@ -312,10 +309,10 @@ section.month li:last-child { section.month li { padding-top: 0.3%; - border-right: 1px solid #A4A4A4; - border-left: 1px solid #FDFDFD; - border-top: 1px solid white; - border-bottom: 1px solid #9D9D9D; + border-right: 0.1rem solid #A4A4A4; + border-left: 0.1rem solid #FDFDFD; + border-top: 0.1rem solid white; + border-bottom: 0.1rem solid #9D9D9D; height: 100%; position: relative; background-color: white; @@ -332,7 +329,7 @@ section.month li.past { section.month li.present { background-color: #525963; - box-shadow: inset 1px 2px 3px 0px #333; + box-shadow: inset 0.1rem 0.2rem 0.3rem 0 #333; color: white; border-left: none; border-top: none; @@ -368,7 +365,7 @@ section.month li .busy-indicator > span{ section.month li .busy-indicator { overflow: hidden; clear: both; - bottom: 0px; + bottom: 0; position: absolute; width: 100%; } @@ -379,7 +376,7 @@ section.month li .busy-indicator:before { } section.month li .busy-indicator > span { - top: 0px; + top: 0; position: absolute; text-indent: -1000em; } @@ -437,8 +434,8 @@ Indicators are in units of 12 padding: 1.2rem 1.2rem 0.7rem; text-transform: uppercase; color: #F93700; - border-bottom: 1px solid #F93700; - box-shadow: 0px 4px 5px -1px #888 inset; + border-bottom: 0.1rem solid #F93700; + box-shadow: 0 0.4rem 0.5rem -0.1rem #888 inset; } /** sub: view selector **/ @@ -449,13 +446,13 @@ Indicators are in units of 12 } #view-selector { - padding: 0px; - margin: 0px; + padding: 0; + margin: 0; width: 100%; background: #949494; line-height: 2.1rem; overflow: hidden; - box-shadow: 0px 0 0.5px 0.5px #6F7070; + box-shadow: 0 0 0.05rem 0.05rem #6F7070; } #view-selector a { @@ -475,16 +472,16 @@ Indicators are in units of 12 width: 25%; height: 3.33rem; background-image: -moz-linear-gradient(#D9D9D9, #969696); - border-right: 1px solid black; + border-right: 0.1rem solid black; } .rtl #view-selector > li.today { - border-left: 1px solid #666; + border-left: 0.1rem solid #666; } .ltr #view-selector > li.today { - border-right: 1px solid #666; + border-right: 0.1rem solid #666; } #view-selector > li.time-selection { @@ -547,18 +544,6 @@ section[role="status"].active { animation-duration: 1.5s; } -@media screen and (min-width: 481px) { - html, body { - font-size: 12px; - } -} - -@media screen and (max-width: 480px) { - html, body { - font-size: 10px; - } -} - /* Hide on initial render to prevent flashing */ #settings { visibility: hidden; diff --git a/apps/calendar/style/week_view.css b/apps/calendar/style/week_view.css index 2592e8f35c57..4fb1b20b3a94 100644 --- a/apps/calendar/style/week_view.css +++ b/apps/calendar/style/week_view.css @@ -10,8 +10,8 @@ font-size: 1.3rem; height: 2rem; padding: 0.5rem 0.5rem; - border-right: 1px solid #131314; - border-left: 1px solid #515051; + border-right: 0.1rem solid #131314; + border-left: 0.1rem solid #515051; font-weight: normal; white-space: nowrap; overflow: hidden; @@ -42,8 +42,8 @@ #week-view .week-events > ol, #week-view .sticky .week-events { - border-bottom: 1px solid #ccc; - border-left: 1px solid #ccc; + border-bottom: 0.1rem solid #ccc; + border-left: 0.1rem solid #ccc; text-align: center; color: white; font-size: 120%; @@ -78,10 +78,10 @@ } #week-view .sticky { - border-bottom: 1px solid #2A2A2A; + border-bottom: 0.1rem solid #2A2A2A; height: 8rem; overflow: hidden; - box-shadow: 0px 5px 5px 0px rgba(1, 1, 1, 0.2); + box-shadow: 0 0.5rem 0.5rem 0 rgba(1, 1, 1, 0.2); position: relative; z-index: 11; } @@ -136,7 +136,7 @@ } #week-view .scroll { - height: calc(100% - 7.9rem); + height: calc(100% - 8.1rem); overflow-y: scroll; } diff --git a/apps/calendar/test/unit/views/week_child_test.js b/apps/calendar/test/unit/views/week_child_test.js index 5ed60350f4be..2ceccc81e961 100644 --- a/apps/calendar/test/unit/views/week_child_test.js +++ b/apps/calendar/test/unit/views/week_child_test.js @@ -64,7 +64,7 @@ suiteGroup('Views.WeekChild', function() { subject.date = new Date(2012, 0, 1); subject._assignPosition(busy, el); - assert.equal(el.style.height, 'calc(325% + 1.5px)', 'height'); + assert.equal(el.style.height, 'calc(325% + 0.15rem)', 'height'); }); test('#create', function() {