From cc53069d40ca0824427b64a3b6ced24517d9155a Mon Sep 17 00:00:00 2001 From: Nathan Gray Date: Thu, 14 Jan 2016 21:52:40 +0000 Subject: [PATCH] Some missing bits for Stylite theme - Missing new & day toolbar icons (thanks Ulle) - Incorrect colors --- calendar/inc/class.calendar_uiviews.inc.php | 2 +- calendar/templates/default/app.css | 6 +++--- calendar/templates/default/images/day.png | Bin 0 -> 3274 bytes calendar/templates/pixelegg/app.less | 12 ++++++++++++ 4 files changed, 16 insertions(+), 4 deletions(-) create mode 100755 calendar/templates/default/images/day.png diff --git a/calendar/inc/class.calendar_uiviews.inc.php b/calendar/inc/class.calendar_uiviews.inc.php index df578e1e68..9aef1f229e 100644 --- a/calendar/inc/class.calendar_uiviews.inc.php +++ b/calendar/inc/class.calendar_uiviews.inc.php @@ -274,7 +274,7 @@ class calendar_uiviews extends calendar_ui $actions = array( 'add' => array( 'caption' => 'Add', - 'icon' => 'add', + 'icon' => 'new', 'group' => ++$group, 'onExecute' => 'javaScript:app.calendar.toolbar_action', 'hint' => 'Add', diff --git a/calendar/templates/default/app.css b/calendar/templates/default/app.css index a77ec4c4b9..b3a0257719 100644 --- a/calendar/templates/default/app.css +++ b/calendar/templates/default/app.css @@ -662,7 +662,7 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget .calendar_calTimeGridList .calendar_calEventBody { overflow: hidden; border:none; - background: #f0f0f0 !important; + background: white !important; height: 100%; padding-left: 6px; display: flex; @@ -692,7 +692,7 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget width: 100%; height: 100%; min-height: 3ex; - background: #f0f0f0; + background: white; z-index: 21; } .calendar_calTimeGridList .calendar_calDayCol .hiddenEventAfter:hover { @@ -700,7 +700,7 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget top: initial !important; bottom: 0px; white-space: pre; - background: #f0f0f0; + background: white; height: 100%; overflow: auto; } diff --git a/calendar/templates/default/images/day.png b/calendar/templates/default/images/day.png new file mode 100755 index 0000000000000000000000000000000000000000..8b016df6d6b1a319ec29752fab95b710351fc7c8 GIT binary patch literal 3274 zcmV;*3^ntKP)Oz@Z0f2-7z;ux~O9+4z06=<WDR*FRcSTFz- zW=q650N5=6FiBTtNC2?60Km==3$g$R3;-}uh=nNt1bYBr$Ri_o0EC$U6h`t_Jn<{8 z5a%iY0C<_QJh>z}MS)ugEpZ1|S1ukX&Pf+56gFW3VVXcL!g-k)GJ!M?;PcD?0HBc- z5#WRK{dmp}uFlRjj{U%*%WZ25jX z{P*?XzTzZ-GF^d31o+^>%=Ap99M6&ogks$0k4OBs3;+Bb(;~!4V!2o<6ys46agIcq zjPo+3B8fthDa9qy|77CdEc*jK-!%ZRYCZvbku9iQV*~a}ClFY4z~c7+0P?$U!PF=S z1Au6Q;m>#f??3%Vpd|o+W=WE9003S@Bra6Svp>fO002awfhw>;8}z{#EWidF!3EsG z3;bXU&9EIRU@z1_9W=mEXoiz;4lcq~xDGvV5BgyU zp1~-*fe8db$Osc*A=-!mVv1NJjtCc-h4>-CNCXm#Bp}I%6j35eku^v$Qi@a{RY)E3 zJ#qp$hg?Rwkvqr$GJ^buyhkyVfwECO)C{#lxu`c9ghrwZ&}4KmnvWKso6vH!8a<3Q zq36)6Xb;+tK10Vaz~~qUGsJ8#F2=(`u{bOVlVi)VBCHIn#u~6ztOL7=^<&SmcLWlF zMZgI*1b0FpVIDz9SWH+>*hr`#93(Um+6gxa1B6k+CnA%mOSC4s5&6UzVlpv@SV$}* z))J2sFA#f(L&P^E5{W}HC%KRUNwK6<(h|}}(r!{C=`5+6G)NjFlgZj-YqAG9lq?`C z$c5yc>d>VnA`E_*3F2Qp##d8RZb=H01_mm@+|Cqnc9PsG(F5HIG_C zt)aG3uTh7n6Et<2In9F>NlT@zqLtGcXcuVrX|L#Xx)I%#9!{6gSJKPrN9dR61N3(c z4Tcqi$B1Vr8Jidf7-t!G7_XR2rWwr)$3XQ?}=hpK0&Z&W{| zep&sA23f;Q!%st`QJ}G3cbou<7-yIK2z4nfCCCtN2-XOGSWo##{8Q{ATurxr~;I`ytDs%xbip}RzP zziy}Qn4Z2~fSycmr`~zJ=lUFdFa1>gZThG6M+{g7vkW8#+YHVaJjFF}Z#*3@$J_By zLtVo_L#1JrVVB{Ak-5=4qt!-@Mh}c>#$4kh<88)m#-k<%CLtzEP3leVno>={htGUuD;o7bD)w_sX$S}eAxwzy?UvgBH(S?;#HZiQMoS*2K2 zT3xe7t(~nU*1N5{rxB;QPLocnp4Ml>u<^FZwyC!nu;thW+pe~4wtZn|Vi#w(#jeBd zlf9FDx_yoPJqHbk*$%56S{;6Kv~mM9!g3B(KJ}#RZ#@)!hR|78Dq|Iq-afF%KE1Brn_fm;Im z_u$xr8UFki1L{Ox>G0o)(&RAZ;=|I=wN2l97;cLaHH6leTB-XXa*h%dBOEvi`+x zi?=Txl?TadvyiL>SuF~-LZ;|cS}4~l2eM~nS7yJ>iOM;atDY;(?aZ^v+mJV$@1Ote z62cPUlD4IWOIIx&SmwQ~YB{nzae3Pc;}r!fhE@iwJh+OsDs9zItL;~pu715HdQEGA zUct(O!LkCy1<%NCg+}G`0PgpNm-?d@-hMgNe6^V+j6x$b<6@S<$+<4_1hi}Ti zncS4LsjI}fWY1>OX6feMEuLErma3QLmkw?X+1j)X-&VBk_4Y;EFPF_I+q;9dL%E~B zJh;4Nr^(LEJ3myURP{Rblsw%57T)g973R8o)DE9*xN#~;4_o$q%o z4K@u`jhx2fBXC4{U8Qn{*%*B$Ge=nny$HAYq{=vy|sI0 z_vss+H_qMky?OB#|JK!>IX&II^LlUh#rO5!7TtbwC;iULyV-Xq?ybB}ykGP{?LpZ? z-G|jbTmIbG@7#ZCz;~eY(cDM(28Dyq{*m>M4?_iynUBkc4TkHUI6gT!;y-fz>HMcd z&t%Ugo)`Y2{>!cx7B7DI)$7;J(U{Spm-3gBzioV_{p!H$8L!*M!p0uH$#^p{Ui4P` z?ZJ24cOCDe-w#jZd?0@)|7iKK^;6KN`;!@ylm7$*nDhK&GcDTy000JJOGiWi{{a60 z|De66lK=n!32;bRa{vGf6951U69E94oEQKA00(qQO+^RV3>FU!58=L4N&o->{7FPX zR4C6)i#uymVE{nS_vJRXq_H=>ZA#OJAyx`HC>^9#I(2anx;U7+2!$ZnNnG6AoCG%u z`2!u)C5oVfQfo><5VcQjv0!hip+%CL$9?y65TR!~a1NYcdFlP5_0_WZ-^9krGC7+-H0lYLe30mQb-6F_UTR(t$W{=E{8&Hw*j4OM z@NBQfP*0NW@Em|6izck2HCV};*p`=oZ<7378 z#s+h9b2zR`quHX{FnF@CK&kWsKL~JKM}@wRRDk0+7>2>(;v!)fQm@yUpP#2#ERxUX zsnu%Ob|VU+NJ#+S_fbk=+cv)MBc-HJC?KUIl}aIm!1uferTz^;7~r}tLI}pk$EjAU zn5IcKnYvX=qu$FVzC&Rfebr4JIv;1(PA;yzOK>TZE$pS z*a;xw@pwm1s%J*iv;iRnQc9$hpg<|5bX`YCAsolqt60{XzeQi`9-iq>kN^Mx07*qo IM6N<$f?F3N7ytkO literal 0 HcmV?d00001 diff --git a/calendar/templates/pixelegg/app.less b/calendar/templates/pixelegg/app.less index e38c6d70ac..d5a5b386fc 100755 --- a/calendar/templates/pixelegg/app.less +++ b/calendar/templates/pixelegg/app.less @@ -996,6 +996,18 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget height: 13px; } + + +.calendar_calTimeGridList .calendar_calEventBody { + background: #f0f0f0 !important; +} +.calendar_calTimeGridList .calendar_calDayCol .hiddenEventAfter:before { + background : #f0f0f0; +} +.calendar_calTimeGridList .calendar_calDayCol .hiddenEventAfter:hover { + background: #f0f0f0; +} + /* table of the dayView containing 2 cols: 1) day-view, 2) todos */ .calendar_calDayView{