From 76509781ebb4079303cfa5d3fb5cd387a3112818 Mon Sep 17 00:00:00 2001 From: Harrys Ravalomanana Date: Wed, 12 Jun 2019 11:06:19 +0400 Subject: [PATCH 1/2] PHRAS-2386 #adding fix of feedback block #time 2h --- .../www/common/images/icons/basket_push.png | Bin 1071 -> 1122 bytes .../images/icons/basket_push_unread.png | Bin 1302 -> 1344 bytes .../common/images/icons/basket_validation.png | Bin 1010 -> 1286 bytes templates/web/prod/WorkZone/Macros.html.twig | 5 ++++- 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/resources/www/common/images/icons/basket_push.png b/resources/www/common/images/icons/basket_push.png index 97e038241c4a5fe6bd9f1a48550229f78c3b687b..7137a58251d6d7fb22d600d8df95514423790faf 100644 GIT binary patch delta 1089 zcmV-H1it&P2;vBkFns`ZaHZ3+0|gZ0rA1wpJy)2c1O3hIj}*kT2-P|S;i1=lJT4{g#I8DQ_60!Vkcr~8h_wpuRYt0xIt zHl}bPUrYDIR32ac-NSLxp|u!$#+GkMYCUaAB0pUGt(BafX?rr2+C=vNl+$Y2`p^#?xkVdt0_R!#nuNYO?uiHK;(Z^Uubz zC!Eg>x7|ybBgY&iX=V4wvS7^0>3R-yfx(1?!ys0pdAdRiXgK1@r9H-FpRNwG^iOf zTV7Vy1P;u}pGqh!Rd6xCj7xLN$o{beV-+Zw!tDOG&t0CGW97Uxrn?PgEUr|bm<%GS znQ2;KQjFX@?F>bkIkxg9kv?cm2=cVlI3E}@kbggrz9#2uhO!ZnQYL)wRkE}j%Ije` zV51uKoC5(jj`Ei5WHpT5tvjmSZg7}6yfA=d@-!*G+lCdc-v5h4LVgnm7|tOG9+NcW zhKrDkILaWrE|drvvYmHoJbO<9T!H@-1{^16D){u55D8y1fZQ-a=}>N8`XEVPD?jm> z<$uz+sF?R(?`Xl@9gI(docq&YYmbJ1qg)r}N_cdV8FN#&Yg5t*#9?)(=7#=A0A3UJ zD&&wR8#z-!@`m5*+-%pGP}}=7#^MugzYA9q!Jh%e3CDe}BW>cGpXkZ5bS#?X!-!t7TM{=JCq?DWv@f@14y<^B^UjaUx74M3g|& zhE8~?c6Jt=Peyj=SLWinI?4dx=O&pBgD?S1SOv-8;s{9n8?L0sk8?t+S?0}d89ImV zCH|~)SXas_!#noU4s-g zr1Qw6nS0N1?Ql}b%%h}2m`BgGGe1Biqm;1>=$(zk@{%w_? zkSW7*)lZOl=cfJgO2w+o$SrHCb5UH+*^1==ObBQXT4KY6c?7f9G5KrXZVtDsxi${5d!?bCww#r`DnyW=p6Wf&WdX#s!q+*K?E#9|T|+Irrw-_eC9 z^K7NbBv^19 zWk+vrVXu^DjiG#j(?NNDp?JKrkISYNxbvKil}zm;!hbx@g+IvlG^@=Ehzu9l^Ir80 zs&z7Yb?5iNqbV<|lu^qmWqFwsXU%BEiZz^$t+u*ILvRq*T$KR;`-pRtzH5XSdw0{8quZvFRl{;3=*$b8vd0UoLZKY+e{FEL76^V6v{r?*PHod-Kmn7@?xAbtH3t|XC@`XfM$8+ozGQXR~FF)AexHcO(`50HFiUElvC;XJT^EpHT(99$YxoJ>v{HQ zGpz0*+#Y4^11!1Qfy-57&3G6FpH2Vp-9_YwNZYkpvb*sQwmAfKqxDQ!00000Ne4wv IM6N<$f?`4i1ONa4 diff --git a/resources/www/common/images/icons/basket_push_unread.png b/resources/www/common/images/icons/basket_push_unread.png index b09552bcf767a0712e082f8c159d1af5c1eb1f72..a55080d4ba0887edbf8a58c679a346b66a620b41 100644 GIT binary patch delta 1312 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 diff --git a/resources/www/common/images/icons/basket_validation.png b/resources/www/common/images/icons/basket_validation.png index cddaac1db1eaf25f1b8c1a4cb6704cf48a2f171a..dbf618043a4b4d60b585719a127e882c8eb71042 100644 GIT binary patch literal 1286 zcmV+h1^N1kP)Px(z)3_wR7ee-ReemAWfVW}``%CJ5}z%$k`R$U!ez_c6kS+KT&%Q4TiBY5velNB zO9zz1D4P&9*RqvTthp7fxjx(yf^r3`P21c|{fDTg;c^MIAb|__-nZZHygYZ;vaNN- zx#xM#=X1VZ90BanBO2W3a}Zm>G53 zzlyrj^6A?BWI$4AQH)CxRFX+ok_lI0lXG?S93peas?SK|<$)T>$O&|-1@2*B9xwo$ z0*(O@NyOh<4-5Cn+<47%|uN{FB+Zrq^e8d>uW*%g)tDq_(_OTs!~}wqvox zDV_)!!ECX8>d8<4IdCr`E&kHf7}a4|-ye$8LRB`i5SY+9fY2tLFFV+meRcdUBYG``V+&%8W9p1q~Yt4l?!mZKdeuS?V$Zje@|)wzn$oyZ*+j z-^4iuiG+Kuv9f0s7!$xL8W4;jo9PFVlE>=I&0_*oBY>*Vx_|qM;IezOyBy2D3wit+ zpGmefRrP)dxsHi3Q15L=YdRdiY^ODo_NWr+e55BdJgkv4g0uTbRc$ch`@j=>1}=OW zLlyxgWu9|P*q5$+L-sB5`0|6Q3?-dZ8a98l<^ky1G+>e`xU+PdM1uKx-}7a4ihos3 zuo)MJ)gY!||96|!yY|9cA?*uZRR|?DFr}3TZ`vz`k;N%v?gxRLo|%sK@l5YYY}8rX zv5MY1sYN1Rf!#K6VC#vkIJ?YY4#}-Bf-BKK$7c_W42^N=5^8|M6qaBC$KdYC_F2ke8<o8~>OMZU4;rP))L7o0AnR(4dpCQF-IrhrD3Q!Iu<;u`EQ! z93hwDhhJLu&U0(~HdCAm;P=~6)xW|||L{JkTEw{%`5YfNzVy(k7N(+sbfdr|pXKuT z9QtDOlMDd1*!aL*upFxd=M?ztfZSYox0L3ul%UW1CRP+}lKjjfIdT55#FMjHF4F_` zL~HoMFDJ`l0D?O-oQn7<#5_^~P&UBb^ldU%2qYiq!+*kk2i{s1DT9WFf(PmYtyI*V12o@bV8&<OV07*qoM6N<$f>G^-?EnA( literal 1010 zcmVPx&tVu*cR5%fpR9$FPM-)CY_paIagTZR?_i43-svsI-DX3{QF}u=|`ct9eYkUyu zgRF@dB~>9NyFU1$D6|ODhZ<{Is@bF^xHS=?M5<3>;;N7s#l)b3P2=7>AJ@?FazH`1aL&PK59lMKFUM!EsOB<|$;b>=-bwV1iM2Vi*k1i}F;d!LpDVm-< z8zk{NcBR^SuMJstbJ<_R7lx{(wbW46NfUp2InU$Wo3^pn4>O7v%-U6YCaYSmMrEt- z8Pbj>*HK%jIUNNLJDz`+P(HpSPr*D0{^j5+UT4eejwk;5!_9{qhIg*Z_S%GOvy7>vvP2}<^Cdh6;< z_+)%b>U3Xi==rO`*Fem&@lfm!I`DG^aa5^{TjT&SBOH0VN~Ei6j8YdTadcFsZf)u# z{+`nTae(~tpP{qLsxR3-tVlKNU30k=-!KF*aW&Rrtc_1XLu~$yUr9M!6{|VqS8xJh z4?I~YaK!}g@VaVW5TOm6>dI3RqVRFJy^=zljMlVWqqZnd;W%|;2YF^f(4{nvJ|Y_C zg`jh{_RzhtURv_OXXNT4vK$F2@tiM?;El0!#R*FFAEynG-SS_t!jO^U{ia&FqxXzw zBS<1rvYKXw=hC%-3*1XeqyxvldWMRCrJDbY8gP*bz8p>(f}OeflJ%db_T_^TI&;7> zXkq7&v0LgYI@-V^a1>7X4=Jsq5=<-tV~}Xz5Ufg5M)@`#FYovzu)#e5RIFmNs0eGm ztO6$0DcHiVQY3x^#c~{t-mVuw^vsL#!8?)$0|8{~^6zNz?6S!y@BABhdV_wtb&woX zTI0Y_rY}ACiADoTdb!$3A^!_3Gj^R$UjK&1#)oLhhh>B_f;%Bse2T0rUv$<*H*=~G zT~amgbWuR8y+28JM$+{4vL>2Uyim;OU8tuVs7N^0U$|VcVg8D<^WNxtbdk~zzNe5A zrm#DmzWub7-;3Y#3k(cB?DC^QDSI9vSUI^1P#>gJx?r=+U_;@0_i=CTE<|r}4N*tq z`G-VhIf8uZp)N#`y9NEvb5Y51dN_K!5GyYNgD_Yi3i)>H{>sj_w{63RTTQEo9YgE< zzqV1yn - {{ choice.getParticipant().getUser().getDisplayName() }} + + + + {% if choice.getParticipant().getCanAgree() %} {% if choice.getAgreement() == true %} From 771bac78252b02ce13e2144e0d20cfb99cb1d46a Mon Sep 17 00:00:00 2001 From: Harrys Ravalomanana Date: Wed, 12 Jun 2019 13:50:46 +0400 Subject: [PATCH 2/2] PHRAS-2376 #comment fix icomoon regression on admin page #time 10mn --- resources/www/common/styles/fonts/PhraseanetIcomoon/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/www/common/styles/fonts/PhraseanetIcomoon/style.css b/resources/www/common/styles/fonts/PhraseanetIcomoon/style.css index 9869ae9201..fad297b2f2 100755 --- a/resources/www/common/styles/fonts/PhraseanetIcomoon/style.css +++ b/resources/www/common/styles/fonts/PhraseanetIcomoon/style.css @@ -1,5 +1,5 @@ -[class^="icon-"], [class*=" icon-"] { +[class^="icon-"].icomoon, [class*=" icon-"].icomoon { /* use !important to prevent issues with browser extensions that change fonts */ font-family: 'icomoon' !important; speak: none;