From c98730e6b9b673682bac66ddea9974164fb6f652 Mon Sep 17 00:00:00 2001 From: joan Date: Thu, 18 Nov 2021 14:00:45 +0100 Subject: [PATCH 1/3] Updated styles --- front/core/components/calendar/style.scss | 4 ++-- front/core/components/chip/style.scss | 2 +- front/core/components/smart-table/table.scss | 2 +- front/core/components/table/style.scss | 2 +- front/core/directives/no-image-dark.png | Bin 0 -> 6990 bytes front/core/directives/on-error-src.js | 2 +- front/core/styles/variables.scss | 6 +++--- modules/worker/front/calendar/style.scss | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) create mode 100644 front/core/directives/no-image-dark.png diff --git a/front/core/components/calendar/style.scss b/front/core/components/calendar/style.scss index aecc3eecb..6a7995ea5 100644 --- a/front/core/components/calendar/style.scss +++ b/front/core/components/calendar/style.scss @@ -86,12 +86,12 @@ align-items: center; &.today { - color: $color-font-bg; + color: $color-font; & > .day-number { border: 2px solid $color-font-link; &:hover { - background-color: lighten($color-font-link, 20%); + background-color: $color-marginal; opacity: .8 } } diff --git a/front/core/components/chip/style.scss b/front/core/components/chip/style.scss index d1632890c..cc0554509 100644 --- a/front/core/components/chip/style.scss +++ b/front/core/components/chip/style.scss @@ -50,7 +50,7 @@ vn-chip { &.alert, &.alert.clickable:hover, &.alert.clickable:focus { - background-color: $color-alert-medium; + background-color: lighten($color-alert, 5%); } &.message, &.message.clickable:hover, diff --git a/front/core/components/smart-table/table.scss b/front/core/components/smart-table/table.scss index 855534011..21ac20c81 100644 --- a/front/core/components/smart-table/table.scss +++ b/front/core/components/smart-table/table.scss @@ -90,7 +90,7 @@ smart-table table { color: $color-font-bg; } &.alert { - background-color: $color-alert-medium; + background-color: lighten($color-alert, 5%); color: $color-font-bg; } &.message { diff --git a/front/core/components/table/style.scss b/front/core/components/table/style.scss index edb40d385..b1ff51d6a 100644 --- a/front/core/components/table/style.scss +++ b/front/core/components/table/style.scss @@ -146,7 +146,7 @@ vn-table { color: $color-font-bg; } &.alert { - background-color: $color-alert-medium; + background-color: lighten($color-alert, 5%); color: $color-font-bg; } &.message { diff --git a/front/core/directives/no-image-dark.png b/front/core/directives/no-image-dark.png new file mode 100644 index 0000000000000000000000000000000000000000..f94f961697c229ee77d19e9a23ddc88382db8b43 GIT binary patch literal 6990 zcmV-U8?oexP)@!{HkWL00S;QL}=@0IU6?B!UcPH0OI`g%}-6 z`<^YJVHv!Poea1zM6w7{0P_Vj!9cfyHD!Xff?<`KJR5?v7}n-Gk=bG1vM7AX>WZY> zR5}}i@ZgHMj_1yKX|s^zslhWlR@zK)y($w4g>X0tf)v8a*uyz-r)QB2yfHhCFky;p zgCI=XnZ;$kS!=BbzzREMnU^!`w?%cH-^YJ%HTT;ha4OPDcWPLB)aaoR#K23(3S%Z1 zGHN2%KUBSz4^F^j(_AdVRN>5H^M*^u|Q3#w@o%}swsMdBO-n3?DrHD-?i%nXIK+Qs*RamR}u7@Tb z4YO%YDaF90>kv!ngVU~V5Mdqw&D8SLvIs#u4e-E!m022rb|a(+K}y5TZBOqWe5`|) z;A*{=FM+^HkP;}j(uSlbP%>LtosXQv#!M^j1Tof^4_MI}{BSrge2O|F+8EbE?gXh1 z2~z_uf+X=SLP;$*Td3efTZ2J61c`N}(zue=(;zw26|~(~5mdC$*Heb8NfP1weBBN~ zJRP;lZWsZ6(3Ui&d4ib0H|}gC9ZyM*tZlIoP{jxm561*49Y7B4#Q{^n$adO!RbXPv zEH1-RA6T85q~q=~4NtmO5g(%n`f8y+3gxIDRW!9+0&AQgdLp83W?eI}m!?omQI%kf zTM^be#x{h_MtCKeBB&Hq-EiZ*&om7VoFIN`yGx!r%g1#-Qk|h$h|(>nX-W`H$J_!K z>9EvT)^e~9cD0Q@F9X=(ttLprp@Sn;Sb5Lp8V_;Y7mb!662#NBjUuzE<&MA-NKGV& zJ63B0D*`+O3bD(WAm@^43VCM~GUtLUk0t)4jS1qfaQ`g;2+;Le1_H6pq#cF{B zDGBcRk+GP?CEZA2M?#-GLEO-?L5CxSQ+AGL6b6kz?q;W(A1IO2QW-rET(>PSg9shQ zz?M;zt&FE^nljuFp-J^A<&PGI#`zG$$Ajil{X@b+Wh|_q4N4gcU3T{nIZaDXiy#Gk zV&vMgfh1CT8I%>77OiwfXR+)+D#Hv(eTa9O*cQ0PvR*ZdfG>22{Hl!hE?z0y<1lF%(bl+O?lWF zRZHY+n3sI}_N|+r)Og$p5_1+z$gi%hx)mzgvox3Q^zHtIjBzWxAK5&bGX)`o+}_^O zLPb(4bIG1NL1OxzMD~z4B3efgu8OKs^(!>lWsmRQzjsT*l1DShDozj>OTyga`Sa%! zTQ$H>>uMxP;6LFyjX()80~rLCe@j2b2r^&|OS#wA*Hb$aj(FNWg@->6iV0e2INNQH z+KW=l$t~?$fJGVzeCQ}C6Y$@^e|IFI?2lR6P>di0pa95+4C25LaXXkAtoS;GHBAuZx!Tl(W0wZf*?}u zdxA)7(=phWG$V+h?X#=G^((i$5uhaqB2{&tL3V2kyE{~*;_!M)CrG6j!hv0I2@ydG zrE~HS%L@Oc6T}LKRn7qc5kU$8*dRgRC7OqD^Zh0~KFM}YRoE5knN&J@RW5A%cx7|( zlXNSe)XE^k5+ZC$bsJM#_-DJ{u(Gl*C8u!gd7HzRpBbBaWDu*NaDy2nbj!OI%e(_A zUc7h_;13**gq{3h=N5j4y%uN>c4}cM@pxC)3Tl2#ol6Z5f>>cEB#1m{x(sslzU#eH z&*Q^mxVhEsgFx_)-&D*UXBdbCZ?M7cJrIU+{K3izxEwj&xNO@J5>4A8$dK!MON0cG zgX%lP>WzX-0q>eX){s0v5;$VbKh}^MNJ+v*qIqj|Xm6j0!iQ$ zDgA+Su(=r)T~djXv_RKtk|&CqAdW_Cu0QUMnlLb+^$T%KPXv{lb1ezaz|ZpB(lsp z>X~d$f^=9Z6weYwAvfv6Tm~6%;}8V)HQ)s->!H=y0FVtYaNXSA7J7}yj{+@9b|;9! z=*4G{H*el_t5*CaSsrR2AKphGuWEVpE<%~wVFnK=e(9AUBg`!4AP}@4KYr|X$GsoO zBEuzS-fi{r<7^Oeq>Rc!Ce8^G6XUfHk_P4kHVT0lKoB&0q#Q?fD4gHwC+l$ijOTE! zOeBw6sZY8386+JDiymUZPWj(|{~h|ziKLINSOnd$KlA0wm&FhSIt~avzzJ?mZ{dm2 z(Uu^5!slu%mLTB#Vg6Cl@t;0@S_DCcy`laX`6k@m{RlsQ{xpG#9D>AxwgkxyQ1Rd9 z0JTjJcps!o4C55o|2G5xd{4x4c{dhKMF~P40v>A`3%c&M^a_`+VXRCOgYWDscc^S_^q-5G@iR_b>Mxc#Yu5y@cg1SCmi5@LrhRV!IviV2dh}hPK|)yaKg9#D%LFgc7L7DIdD8| zNRnxX!4i)-2#x@)1oDl-xRAK*geVLBadb)sp}bKDK>_#t(m$g>1LaWaU=t7o$N_I2 z<{ugkTurd@`5=qy)XJPBuKQGHN(S*je$g2Og2rtpeTFuBCmoAu)$hG>gNl;jWRJ^g=Ny#QbD4xkVM=R#nV#&4OB;4#EHemQvrz9= z6H9`Oha6U~-45@7s6OJu@x-odE(kqeEgq{{dQL*gh8;m*4kDds34GCI*6w!qf{(`# zYpnk8`YjB%&{Mt{yWvO%^rnLhuikU70@46)&Y^dxcuvwq74PgQnIMc0=;#sH4LxlL zLPtbQ5PB2c%GPi%7I)qNJr(qzt({q-1d&xx40DqBu@rq*F?S`!wz@+sz0E}5Y{JWz z{ahi}yL0CtvBrlU7j8R&Yyz1jMHXle902coz@OG`R+R2@5S=nDHi};C?3PG=q*D6? z*(n|Cq}kj__VoP^M;T;Seq7ChAoF1tWR>A=Uifby1ds^+4ebpiA!Qs!Hq!)AsW}Ix zqxYP||11_}VfuHcIY^pTvLP0grqpscU|J4HG#S^K&pEXE;1=ggsOBU{$EzoBWB`UsPWTg*CQHC9AH5o8@4!0<_iV30w$ti=R zwZb#V?gKj2zH+NX)S!CNIR~omfkj>E&?^W{?a)YI1|SxSu3Q+^y+-j!g)g0;6Cip)KbmS%U1~5)ZK`F_U51 zvIxR*BCCI4N%kmA=|w%-mCDo)w+{ZH*e)iB)WBUm0YNB~)XYJ!A(qnO2CKI<=b!_m zCrRHHk04OPdr|3t!JZ(c`dj@RB;vqQ%F|9-eOs8kxki*;6StzB5}M%_1&gQUy-|oeCzig-W{|OtSTa471#-Z# zdC=A4RonLG99+8ZI*HM%$s7qJg1~Y2<(}rHf25=yL2yEMnP9W&hCSmiV+($t4!3w1QG!4gitW~-b}IP{ z(&K!-lk|vxOH9(o%?@*p@vtftc2uX2>r>_&Ji5)b)79osjMEa}`p-ZApyDZ=$B7Zd z`nY=>V~(>@UW&~*FppA(51`wV(ozC6D9dg;4?j7=&g_c%lLe{VuDnVqE^t27+sWZl0`lStaO{xfDr$)D06`ym^ zBP2K6qV$T%tXA|e1tCg=MS6mKj#x9rn1a=b4YAUQ<_I#t<~;}D%sF~X;-opAxc8+g zbB?ss`8Y+u7COg;p-;;|nhesJFtQ^?5VDzyj`hTknjAY)GUv!f(I$lZpZz`wT&(x% z)#&3jyNYB-YQiyR6Xbh%e0)+j%$;+LVcdjG{w`P<=4zXk zBA_jT0BZc6U6w%<9-jZIFr)#*uSd~}Qik6$|NfPE8+5(Y z1Q|7DNe~Wdbu-AY$uaB5sTss(SjB;BL1i0AVpM`u-3LK(f(t=%eT-EGfftf4FE6`4 znvZoZDCC8z(tCVv1H)V+brUF+Ai8}JTl?mG!3h#=U#=8~AWx5v$y-=~6mQ?Y4VUjO zOJ3E=jiL6+56j_#*G#y^Pzh2lgYe@PCkPi6r2Ie-@psa96yFo%^3qtt2E;}D$agJn zhlk9`{O@c}^JcNnUn$ z2#*hs;RgB2ZS6S-&+79mP0b+jRjes>&4*YNmuxK$D-y|z5+u+*!B&(YtR9_JnBt~I zl!;kQB?vi#eEHffPR9-id7<832B|<0FK`zT**hgYFrX5o+&&23BP&7pn5{L42pkBK zr{7AD5umgo)B;5l;iw5| zC%vSFD46&wr0egY~Y>C$~D5rU0lK$q+n>vRT zSH96=ZLF46bBL9?0K%RiF*pvbTM{G*Jh^Kj7d&c8UK0zK z^ZWhfi`_fv8PlumgP854GkjWvAfOM{S$ae`)+Pg|r5BCDo4|*XK^8&~eN?3hGN88! zkB_j5b(3AiT6zG9^w+~LYSz0_5rPOiuYQs)tSkYpSO&=sicU1rBo5)!ae}P~K?L{m zb_0?49E8ajMsf8EQ~4_n7O;V3-F=T(ogXW0tUW&_pUofMFEEn$Qh66 zn=xIgNWLD#31p8Nqlqd6fq4i_$}Tn+>2Cl^v8FTXxMYnsHTpW&Z3T|h@T!D@yHi!SH1@2`iaEki%+bS=4}f|v%Rc>er(H))5ZJ_<>yqIE)z)8m|8QhKH@)&i_p!7_jCn6NpEr3@TM zpRiE`pEB@%81D8~WtBfe0O9~P1b_Va5ubD9oJU&SCKZ}!g=Y}HOp)WEr-1ng5Ctah zFzi~+QwXHx0K(D~d=JF9zrXKJPn3Vs%*zvm>vwhcyxniG16iKI1b#hgVjnMDzuIfC zmpG7P7)qs&7Fj9HlY?iF5jZ^2j;N+Ys|i{`=dQ_G$hHBPh4mIPV&30ef4q+00qD?tbW*-9+5q6Y!8Op#>`4`>8|FBQO73<${J zP80$ptVU3Ic|~xLmuFK88b@%Y5#(h011~RN5xcV63;DTR%oAKa)CA!+I4z$r=LF)( z+EF^3p|(b&1v$i6RR%#~0Bbz}s4*QG&GS{5)_3jib>+sMngu zTG3|@ofn1?xn51>rV#kmqZPEO9RwYj&d_c{+}Y@9(qE>oMl8U=7-EeVhnZL5u+cK~ z)GEpyfm3#`j39f+=g`ohnlPJQ&DYu5?#5TU=A^gcHcwzw1UUzQJi+f|Hv?jAMd-Z~ zy`n&&`gIVVoCAUUItuZNjG7u}OC1ViYA?gcWR;AeiQ^zk9NTqWJj*A_Wy) z85yPrg2?LYbZ(@!%5+ub7ytt~Ym=1VoCT;zup(O|nL((wo5zRNqLZn=EM%9ZEj>tV zhFA+hhe~=nd<~Zr7#pu55Y#X%T-6K+QkfllKq)bOHpa2YS5a0#qr`L~E#0 zGpM!RjS*zIo|pDe)(&0e%@9yJ1}DgJW44)CQTnJEJL)P@ClGOhAgF-z;Q{sQKXpLl z*j-PF#8Tt?eGNiGfu2+~~bV50KO+RbP62#n&(+e+i zh*p6r1Qt#ZmF Date: Thu, 18 Nov 2021 14:07:05 +0100 Subject: [PATCH 2/3] Updated dark image --- front/core/directives/no-image-dark.png | Bin 6990 -> 7038 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/front/core/directives/no-image-dark.png b/front/core/directives/no-image-dark.png index f94f961697c229ee77d19e9a23ddc88382db8b43..2a20d7eb4970509bc5f8e9a2bb2b5d33fee3c260 100644 GIT binary patch literal 7038 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 literal 6990 zcmV-U8?oexP)@!{HkWL00S;QL}=@0IU6?B!UcPH0OI`g%}-6 z`<^YJVHv!Poea1zM6w7{0P_Vj!9cfyHD!Xff?<`KJR5?v7}n-Gk=bG1vM7AX>WZY> zR5}}i@ZgHMj_1yKX|s^zslhWlR@zK)y($w4g>X0tf)v8a*uyz-r)QB2yfHhCFky;p zgCI=XnZ;$kS!=BbzzREMnU^!`w?%cH-^YJ%HTT;ha4OPDcWPLB)aaoR#K23(3S%Z1 zGHN2%KUBSz4^F^j(_AdVRN>5H^M*^u|Q3#w@o%}swsMdBO-n3?DrHD-?i%nXIK+Qs*RamR}u7@Tb z4YO%YDaF90>kv!ngVU~V5Mdqw&D8SLvIs#u4e-E!m022rb|a(+K}y5TZBOqWe5`|) z;A*{=FM+^HkP;}j(uSlbP%>LtosXQv#!M^j1Tof^4_MI}{BSrge2O|F+8EbE?gXh1 z2~z_uf+X=SLP;$*Td3efTZ2J61c`N}(zue=(;zw26|~(~5mdC$*Heb8NfP1weBBN~ zJRP;lZWsZ6(3Ui&d4ib0H|}gC9ZyM*tZlIoP{jxm561*49Y7B4#Q{^n$adO!RbXPv zEH1-RA6T85q~q=~4NtmO5g(%n`f8y+3gxIDRW!9+0&AQgdLp83W?eI}m!?omQI%kf zTM^be#x{h_MtCKeBB&Hq-EiZ*&om7VoFIN`yGx!r%g1#-Qk|h$h|(>nX-W`H$J_!K z>9EvT)^e~9cD0Q@F9X=(ttLprp@Sn;Sb5Lp8V_;Y7mb!662#NBjUuzE<&MA-NKGV& zJ63B0D*`+O3bD(WAm@^43VCM~GUtLUk0t)4jS1qfaQ`g;2+;Le1_H6pq#cF{B zDGBcRk+GP?CEZA2M?#-GLEO-?L5CxSQ+AGL6b6kz?q;W(A1IO2QW-rET(>PSg9shQ zz?M;zt&FE^nljuFp-J^A<&PGI#`zG$$Ajil{X@b+Wh|_q4N4gcU3T{nIZaDXiy#Gk zV&vMgfh1CT8I%>77OiwfXR+)+D#Hv(eTa9O*cQ0PvR*ZdfG>22{Hl!hE?z0y<1lF%(bl+O?lWF zRZHY+n3sI}_N|+r)Og$p5_1+z$gi%hx)mzgvox3Q^zHtIjBzWxAK5&bGX)`o+}_^O zLPb(4bIG1NL1OxzMD~z4B3efgu8OKs^(!>lWsmRQzjsT*l1DShDozj>OTyga`Sa%! zTQ$H>>uMxP;6LFyjX()80~rLCe@j2b2r^&|OS#wA*Hb$aj(FNWg@->6iV0e2INNQH z+KW=l$t~?$fJGVzeCQ}C6Y$@^e|IFI?2lR6P>di0pa95+4C25LaXXkAtoS;GHBAuZx!Tl(W0wZf*?}u zdxA)7(=phWG$V+h?X#=G^((i$5uhaqB2{&tL3V2kyE{~*;_!M)CrG6j!hv0I2@ydG zrE~HS%L@Oc6T}LKRn7qc5kU$8*dRgRC7OqD^Zh0~KFM}YRoE5knN&J@RW5A%cx7|( zlXNSe)XE^k5+ZC$bsJM#_-DJ{u(Gl*C8u!gd7HzRpBbBaWDu*NaDy2nbj!OI%e(_A zUc7h_;13**gq{3h=N5j4y%uN>c4}cM@pxC)3Tl2#ol6Z5f>>cEB#1m{x(sslzU#eH z&*Q^mxVhEsgFx_)-&D*UXBdbCZ?M7cJrIU+{K3izxEwj&xNO@J5>4A8$dK!MON0cG zgX%lP>WzX-0q>eX){s0v5;$VbKh}^MNJ+v*qIqj|Xm6j0!iQ$ zDgA+Su(=r)T~djXv_RKtk|&CqAdW_Cu0QUMnlLb+^$T%KPXv{lb1ezaz|ZpB(lsp z>X~d$f^=9Z6weYwAvfv6Tm~6%;}8V)HQ)s->!H=y0FVtYaNXSA7J7}yj{+@9b|;9! z=*4G{H*el_t5*CaSsrR2AKphGuWEVpE<%~wVFnK=e(9AUBg`!4AP}@4KYr|X$GsoO zBEuzS-fi{r<7^Oeq>Rc!Ce8^G6XUfHk_P4kHVT0lKoB&0q#Q?fD4gHwC+l$ijOTE! zOeBw6sZY8386+JDiymUZPWj(|{~h|ziKLINSOnd$KlA0wm&FhSIt~avzzJ?mZ{dm2 z(Uu^5!slu%mLTB#Vg6Cl@t;0@S_DCcy`laX`6k@m{RlsQ{xpG#9D>AxwgkxyQ1Rd9 z0JTjJcps!o4C55o|2G5xd{4x4c{dhKMF~P40v>A`3%c&M^a_`+VXRCOgYWDscc^S_^q-5G@iR_b>Mxc#Yu5y@cg1SCmi5@LrhRV!IviV2dh}hPK|)yaKg9#D%LFgc7L7DIdD8| zNRnxX!4i)-2#x@)1oDl-xRAK*geVLBadb)sp}bKDK>_#t(m$g>1LaWaU=t7o$N_I2 z<{ugkTurd@`5=qy)XJPBuKQGHN(S*je$g2Og2rtpeTFuBCmoAu)$hG>gNl;jWRJ^g=Ny#QbD4xkVM=R#nV#&4OB;4#EHemQvrz9= z6H9`Oha6U~-45@7s6OJu@x-odE(kqeEgq{{dQL*gh8;m*4kDds34GCI*6w!qf{(`# zYpnk8`YjB%&{Mt{yWvO%^rnLhuikU70@46)&Y^dxcuvwq74PgQnIMc0=;#sH4LxlL zLPtbQ5PB2c%GPi%7I)qNJr(qzt({q-1d&xx40DqBu@rq*F?S`!wz@+sz0E}5Y{JWz z{ahi}yL0CtvBrlU7j8R&Yyz1jMHXle902coz@OG`R+R2@5S=nDHi};C?3PG=q*D6? z*(n|Cq}kj__VoP^M;T;Seq7ChAoF1tWR>A=Uifby1ds^+4ebpiA!Qs!Hq!)AsW}Ix zqxYP||11_}VfuHcIY^pTvLP0grqpscU|J4HG#S^K&pEXE;1=ggsOBU{$EzoBWB`UsPWTg*CQHC9AH5o8@4!0<_iV30w$ti=R zwZb#V?gKj2zH+NX)S!CNIR~omfkj>E&?^W{?a)YI1|SxSu3Q+^y+-j!g)g0;6Cip)KbmS%U1~5)ZK`F_U51 zvIxR*BCCI4N%kmA=|w%-mCDo)w+{ZH*e)iB)WBUm0YNB~)XYJ!A(qnO2CKI<=b!_m zCrRHHk04OPdr|3t!JZ(c`dj@RB;vqQ%F|9-eOs8kxki*;6StzB5}M%_1&gQUy-|oeCzig-W{|OtSTa471#-Z# zdC=A4RonLG99+8ZI*HM%$s7qJg1~Y2<(}rHf25=yL2yEMnP9W&hCSmiV+($t4!3w1QG!4gitW~-b}IP{ z(&K!-lk|vxOH9(o%?@*p@vtftc2uX2>r>_&Ji5)b)79osjMEa}`p-ZApyDZ=$B7Zd z`nY=>V~(>@UW&~*FppA(51`wV(ozC6D9dg;4?j7=&g_c%lLe{VuDnVqE^t27+sWZl0`lStaO{xfDr$)D06`ym^ zBP2K6qV$T%tXA|e1tCg=MS6mKj#x9rn1a=b4YAUQ<_I#t<~;}D%sF~X;-opAxc8+g zbB?ss`8Y+u7COg;p-;;|nhesJFtQ^?5VDzyj`hTknjAY)GUv!f(I$lZpZz`wT&(x% z)#&3jyNYB-YQiyR6Xbh%e0)+j%$;+LVcdjG{w`P<=4zXk zBA_jT0BZc6U6w%<9-jZIFr)#*uSd~}Qik6$|NfPE8+5(Y z1Q|7DNe~Wdbu-AY$uaB5sTss(SjB;BL1i0AVpM`u-3LK(f(t=%eT-EGfftf4FE6`4 znvZoZDCC8z(tCVv1H)V+brUF+Ai8}JTl?mG!3h#=U#=8~AWx5v$y-=~6mQ?Y4VUjO zOJ3E=jiL6+56j_#*G#y^Pzh2lgYe@PCkPi6r2Ie-@psa96yFo%^3qtt2E;}D$agJn zhlk9`{O@c}^JcNnUn$ z2#*hs;RgB2ZS6S-&+79mP0b+jRjes>&4*YNmuxK$D-y|z5+u+*!B&(YtR9_JnBt~I zl!;kQB?vi#eEHffPR9-id7<832B|<0FK`zT**hgYFrX5o+&&23BP&7pn5{L42pkBK zr{7AD5umgo)B;5l;iw5| zC%vSFD46&wr0egY~Y>C$~D5rU0lK$q+n>vRT zSH96=ZLF46bBL9?0K%RiF*pvbTM{G*Jh^Kj7d&c8UK0zK z^ZWhfi`_fv8PlumgP854GkjWvAfOM{S$ae`)+Pg|r5BCDo4|*XK^8&~eN?3hGN88! zkB_j5b(3AiT6zG9^w+~LYSz0_5rPOiuYQs)tSkYpSO&=sicU1rBo5)!ae}P~K?L{m zb_0?49E8ajMsf8EQ~4_n7O;V3-F=T(ogXW0tUW&_pUofMFEEn$Qh66 zn=xIgNWLD#31p8Nqlqd6fq4i_$}Tn+>2Cl^v8FTXxMYnsHTpW&Z3T|h@T!D@yHi!SH1@2`iaEki%+bS=4}f|v%Rc>er(H))5ZJ_<>yqIE)z)8m|8QhKH@)&i_p!7_jCn6NpEr3@TM zpRiE`pEB@%81D8~WtBfe0O9~P1b_Va5ubD9oJU&SCKZ}!g=Y}HOp)WEr-1ng5Ctah zFzi~+QwXHx0K(D~d=JF9zrXKJPn3Vs%*zvm>vwhcyxniG16iKI1b#hgVjnMDzuIfC zmpG7P7)qs&7Fj9HlY?iF5jZ^2j;N+Ys|i{`=dQ_G$hHBPh4mIPV&30ef4q+00qD?tbW*-9+5q6Y!8Op#>`4`>8|FBQO73<${J zP80$ptVU3Ic|~xLmuFK88b@%Y5#(h011~RN5xcV63;DTR%oAKa)CA!+I4z$r=LF)( z+EF^3p|(b&1v$i6RR%#~0Bbz}s4*QG&GS{5)_3jib>+sMngu zTG3|@ofn1?xn51>rV#kmqZPEO9RwYj&d_c{+}Y@9(qE>oMl8U=7-EeVhnZL5u+cK~ z)GEpyfm3#`j39f+=g`ohnlPJQ&DYu5?#5TU=A^gcHcwzw1UUzQJi+f|Hv?jAMd-Z~ zy`n&&`gIVVoCAUUItuZNjG7u}OC1ViYA?gcWR;AeiQ^zk9NTqWJj*A_Wy) z85yPrg2?LYbZ(@!%5+ub7ytt~Ym=1VoCT;zup(O|nL((wo5zRNqLZn=EM%9ZEj>tV zhFA+hhe~=nd<~Zr7#pu55Y#X%T-6K+QkfllKq)bOHpa2YS5a0#qr`L~E#0 zGpM!RjS*zIo|pDe)(&0e%@9yJ1}DgJW44)CQTnJEJL)P@ClGOhAgF-z;Q{sQKXpLl z*j-PF#8Tt?eGNiGfu2+~~bV50KO+RbP62#n&(+e+i zh*p6r1Qt#ZmF Date: Thu, 18 Nov 2021 16:02:47 +0100 Subject: [PATCH 3/3] Updated styles --- front/core/components/field/style.scss | 4 ++-- front/core/components/smart-table/table.scss | 6 +++--- front/core/components/table/style.scss | 8 ++++---- front/core/styles/variables.scss | 4 +++- front/salix/components/summary/style.scss | 6 +++--- front/salix/styles/misc.scss | 2 +- modules/entry/front/summary/style.scss | 6 +++--- modules/monitor/front/index/orders/style.scss | 2 +- modules/monitor/front/index/style.scss | 2 +- modules/worker/front/calendar/style.scss | 5 ++--- 10 files changed, 23 insertions(+), 22 deletions(-) diff --git a/front/core/components/field/style.scss b/front/core/components/field/style.scss index c611773e3..399122b1d 100644 --- a/front/core/components/field/style.scss +++ b/front/core/components/field/style.scss @@ -226,7 +226,7 @@ & > .container { & > .infix > .control > * { - color: $color-font; + color: $color-marginal; &::placeholder { color: $color-font-bg; @@ -235,7 +235,7 @@ & > .prepend, & > .append, & > .icons { - color: $color-font-bg-marginal; + color: $color-marginal; } } } diff --git a/front/core/components/smart-table/table.scss b/front/core/components/smart-table/table.scss index 21ac20c81..b38ca7d82 100644 --- a/front/core/components/smart-table/table.scss +++ b/front/core/components/smart-table/table.scss @@ -6,14 +6,14 @@ smart-table table { border-collapse: collapse; & > thead { - border-bottom: 2px solid $color-spacer; + border-bottom: $border; & > * > th { font-weight: normal; } } & > tfoot { - border-top: 2px solid $color-spacer; + border-top: $border; } thead, tbody, tfoot { & > * { @@ -67,7 +67,7 @@ smart-table table { } } tbody > * { - border-bottom: 1px solid $color-spacer-light; + border-bottom: $border-thin; &:last-child { border-bottom: none; diff --git a/front/core/components/table/style.scss b/front/core/components/table/style.scss index b1ff51d6a..28d5a4f36 100644 --- a/front/core/components/table/style.scss +++ b/front/core/components/table/style.scss @@ -14,7 +14,7 @@ vn-table { & > vn-thead, & > thead { display: table-header-group; - border-bottom: 2px solid $color-spacer; + border-bottom: $border; & > * > th { font-weight: normal; @@ -32,7 +32,7 @@ vn-table { & > vn-tfoot, & > .vn-tfoot, & > tfoot { - border-top: 2px solid $color-spacer; + border-top: $border; display: table-footer-group } & > * > vn-tr, @@ -119,7 +119,7 @@ vn-table { vn-tbody > *, .vn-tbody > *, tbody > * { - border-bottom: 1px solid $color-spacer-light; + border-bottom: $border-thin; &:last-child { border-bottom: none; @@ -197,7 +197,7 @@ vn-table.scrollable > .vn-table, vn-thead vn-th, thead vn-th, thead th { - border-bottom: 2px solid $color-spacer; + border-bottom: $border; background-color: $color-bg-panel; position: sticky; z-index: 9; diff --git a/front/core/styles/variables.scss b/front/core/styles/variables.scss index bd00c9a07..c79a8590f 100644 --- a/front/core/styles/variables.scss +++ b/front/core/styles/variables.scss @@ -108,6 +108,7 @@ $color-spacer-light: rgba(255, 255, 255, .12); $color-input-underline: rgba(255, 255, 255, .12); $color-input-underline-hover: rgba(255, 255, 255, .6); $color-shadow: rgba(0, 0, 0, .2); +$color-border: rgba(0, 0, 0, .3); $color-hightlight: rgba(255, 255, 255, .15); $color-hover-cd: rgba(255, 255, 255, .1); $color-hover-dc: .7; @@ -129,6 +130,7 @@ $color-alert-light: lighten($color-alert, 35%); // Border -$border-thin: 1px solid $color-spacer; +$border-thin: 1px solid $color-border; $border-thin-light: 1px solid $color-spacer-light; +$border: 2px solid $color-border; $shadow: 0 2px 2px 0 rgba(0, 0, 0, .3); diff --git a/front/salix/components/summary/style.scss b/front/salix/components/summary/style.scss index 2db3d961e..6f93a61bf 100644 --- a/front/salix/components/summary/style.scss +++ b/front/salix/components/summary/style.scss @@ -65,10 +65,10 @@ ui-view > .vn-summary { text-transform: uppercase; font-size: 1.25rem; line-height: 1; - padding: 7px; - padding-bottom: 4px; /* Bottom line-height fix */ + padding: 7px 0; + padding-bottom: 5px; /* Bottom line-height fix */ font-weight: lighter; - border-bottom: 1px solid $color-main; + border-bottom: 2px solid $color-main; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; diff --git a/front/salix/styles/misc.scss b/front/salix/styles/misc.scss index 55de5eb0c..02bfd9f17 100644 --- a/front/salix/styles/misc.scss +++ b/front/salix/styles/misc.scss @@ -60,7 +60,7 @@ vn-bg-title { font-size: 1.25rem; } .totalBox { - border: 1px solid #CCC; + border: $border-thin; text-align: right; justify-content: center; align-items: center; diff --git a/modules/entry/front/summary/style.scss b/modules/entry/front/summary/style.scss index 1e3d3d482..1d5b22e30 100644 --- a/modules/entry/front/summary/style.scss +++ b/modules/entry/front/summary/style.scss @@ -9,13 +9,13 @@ vn-entry-summary .summary { } tbody tr:nth-child(1) { - border-top: 1px solid $color-spacer; + border-top: $border-thin; } tbody tr:nth-child(1), tbody tr:nth-child(2) { - border-left: 1px solid $color-spacer; - border-right: 1px solid $color-spacer + border-left: $border-thin; + border-right: $border-thin } tbody tr:nth-child(3) { diff --git a/modules/monitor/front/index/orders/style.scss b/modules/monitor/front/index/orders/style.scss index d9d50360e..64d6497c9 100644 --- a/modules/monitor/front/index/orders/style.scss +++ b/modules/monitor/front/index/orders/style.scss @@ -11,7 +11,7 @@ vn-monitor-sales-orders { color: gray; & > vn-td { - border-bottom: 2px solid $color-spacer; + border-bottom: $border; font-size: 13px; } } diff --git a/modules/monitor/front/index/style.scss b/modules/monitor/front/index/style.scss index 9eda945b5..2b193ac88 100644 --- a/modules/monitor/front/index/style.scss +++ b/modules/monitor/front/index/style.scss @@ -6,7 +6,7 @@ vn-monitor-index { padding: 12px 0 5px 0; color: gray; font-size: 1.2rem; - border-bottom: 2px solid $color-font-secondary; + border-bottom: $border; margin-bottom: 10px; & > vn-none > vn-icon { diff --git a/modules/worker/front/calendar/style.scss b/modules/worker/front/calendar/style.scss index d65c80833..d92c54806 100644 --- a/modules/worker/front/calendar/style.scss +++ b/modules/worker/front/calendar/style.scss @@ -11,7 +11,7 @@ vn-worker-calendar { padding: $spacing-md; & > vn-calendar { - border: 1px solid #ddd; + border: $border-thin; margin: $spacing-md; padding: $spacing-xs; max-width: 288px; @@ -38,8 +38,7 @@ vn-worker-calendar { } vn-side-menu div > .input { - border-color: rgba(0, 0, 0, 0.3); - border-bottom: 1px solid rgba(0, 0, 0, 0.3); + border-bottom: $border-thin; } .festive,