From ee4a7d7a6f4f30d5e9a5e3e8b6229f93b1321299 Mon Sep 17 00:00:00 2001 From: Alex Kriuchykhin Date: Mon, 13 Jan 2025 09:39:25 +0100 Subject: [PATCH] Hotfix/1.38.0.2 (#8130) * Update Office icons and labels to match to the latest branding kit [SCI-11430] (#8125) * Fix office icons allignment [SCI-11449] * Bump version to 1.38.0.2 --------- Co-authored-by: Anton Co-authored-by: aignatov-bio <47317017+aignatov-bio@users.noreply.github.com> --- VERSION | 2 +- app/assets/images/icon_small/docx_file.svg | 61 ------------- .../images/icon_small/excel-document.svg | 10 +++ .../images/icon_small/powerpoint-document.svg | 10 +++ app/assets/images/icon_small/pptx_file.svg | 62 ------------- .../images/icon_small/word-document.svg | 10 +++ app/assets/images/icon_small/xslx_file.svg | 83 ------------------ .../images/office/Excel-color_16x16x32.png | Bin 1490 -> 0 bytes .../images/office/Excel-xlsx_20x20x32.png | Bin 1543 -> 0 bytes .../office/PowerPoint-Color_16x16x32.png | Bin 1488 -> 0 bytes .../office/PowerPoint-pptx_20x20x32.png | Bin 1499 -> 0 bytes .../images/office/Word-color_16x16x32.png | Bin 1448 -> 0 bytes .../images/office/Word-docx_20x20x32.png | Bin 1531 -> 0 bytes app/assets/images/office/ms-excel-active.svg | 16 +--- .../images/office/ms-excel-inactive.svg | 16 +--- app/assets/images/office/ms-pwrpt-active.svg | 16 +--- .../images/office/ms-pwrpt-inactive.svg | 16 +--- app/assets/images/office/ms-word-active.svg | 16 +--- app/assets/images/office/ms-word-inactive.svg | 16 +--- app/assets/stylesheets/application.sass.scss | 1 + app/assets/stylesheets/my_modules.scss | 4 + app/assets/stylesheets/office.scss | 23 +++++ app/assets/stylesheets/shared/assets.scss | 5 +- .../shared_styles/constants/colors.scss | 6 +- app/helpers/file_icons_helper.rb | 14 +-- app/javascript/vue/reports/renderers/docx.vue | 2 +- app/javascript/vue/reports/renderers/pdf.vue | 2 +- app/utilities/wopi_util.rb | 4 +- .../wopi/_create_wopi_file_modal.html.erb | 18 ++-- config/initializers/constants.rb | 4 +- config/locales/en.yml | 26 +++--- public/images/office/Excel-color_16x16x32.png | Bin 1490 -> 0 bytes public/images/office/Excel-xlsx_20x20x32.png | Bin 1543 -> 0 bytes .../office/PowerPoint-Color_16x16x32.png | Bin 1488 -> 0 bytes .../office/PowerPoint-pptx_20x20x32.png | Bin 1499 -> 0 bytes public/images/office/Word-color_16x16x32.png | Bin 1448 -> 0 bytes public/images/office/Word-docx_20x20x32.png | Bin 1531 -> 0 bytes public/images/office/excel-document.svg | 10 +++ public/images/office/ms-excel-active.svg | 16 +--- public/images/office/ms-excel-inactive.svg | 16 +--- public/images/office/ms-pwrpt-active.svg | 16 +--- public/images/office/ms-pwrpt-inactive.svg | 16 +--- public/images/office/ms-word-active.svg | 16 +--- public/images/office/ms-word-inactive.svg | 16 +--- public/images/office/powerpoint-document.svg | 10 +++ public/images/office/word-document.svg | 10 +++ vendor/assets/stylesheets/sn-icon-font.css | 9 -- 47 files changed, 143 insertions(+), 435 deletions(-) delete mode 100644 app/assets/images/icon_small/docx_file.svg create mode 100644 app/assets/images/icon_small/excel-document.svg create mode 100644 app/assets/images/icon_small/powerpoint-document.svg delete mode 100644 app/assets/images/icon_small/pptx_file.svg create mode 100644 app/assets/images/icon_small/word-document.svg delete mode 100644 app/assets/images/icon_small/xslx_file.svg delete mode 100644 app/assets/images/office/Excel-color_16x16x32.png delete mode 100644 app/assets/images/office/Excel-xlsx_20x20x32.png delete mode 100644 app/assets/images/office/PowerPoint-Color_16x16x32.png delete mode 100644 app/assets/images/office/PowerPoint-pptx_20x20x32.png delete mode 100644 app/assets/images/office/Word-color_16x16x32.png delete mode 100644 app/assets/images/office/Word-docx_20x20x32.png create mode 100644 app/assets/stylesheets/office.scss delete mode 100644 public/images/office/Excel-color_16x16x32.png delete mode 100644 public/images/office/Excel-xlsx_20x20x32.png delete mode 100644 public/images/office/PowerPoint-Color_16x16x32.png delete mode 100644 public/images/office/PowerPoint-pptx_20x20x32.png delete mode 100644 public/images/office/Word-color_16x16x32.png delete mode 100644 public/images/office/Word-docx_20x20x32.png create mode 100644 public/images/office/excel-document.svg create mode 100644 public/images/office/powerpoint-document.svg create mode 100644 public/images/office/word-document.svg diff --git a/VERSION b/VERSION index e7bab31e8..8537f605b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.38.0.1 +1.38.0.2 diff --git a/app/assets/images/icon_small/docx_file.svg b/app/assets/images/icon_small/docx_file.svg deleted file mode 100644 index 004bcb798..000000000 --- a/app/assets/images/icon_small/docx_file.svg +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/assets/images/icon_small/excel-document.svg b/app/assets/images/icon_small/excel-document.svg new file mode 100644 index 000000000..44729839c --- /dev/null +++ b/app/assets/images/icon_small/excel-document.svg @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/app/assets/images/icon_small/powerpoint-document.svg b/app/assets/images/icon_small/powerpoint-document.svg new file mode 100644 index 000000000..250bccb56 --- /dev/null +++ b/app/assets/images/icon_small/powerpoint-document.svg @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/app/assets/images/icon_small/pptx_file.svg b/app/assets/images/icon_small/pptx_file.svg deleted file mode 100644 index 28409939a..000000000 --- a/app/assets/images/icon_small/pptx_file.svg +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/assets/images/icon_small/word-document.svg b/app/assets/images/icon_small/word-document.svg new file mode 100644 index 000000000..114389b0e --- /dev/null +++ b/app/assets/images/icon_small/word-document.svg @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/app/assets/images/icon_small/xslx_file.svg b/app/assets/images/icon_small/xslx_file.svg deleted file mode 100644 index 13973e3e6..000000000 --- a/app/assets/images/icon_small/xslx_file.svg +++ /dev/null @@ -1,83 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/assets/images/office/Excel-color_16x16x32.png b/app/assets/images/office/Excel-color_16x16x32.png deleted file mode 100644 index 5d4f705c4029814368d624189d9c0a97c254e492..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1490 zcmaJ>ZEO=|9KQxLfo)+944eC~^9Ukw?Y*?!dY2W}URxNU+uW9{(a3ted)i)h?VWem zt;~e2H0TzG3_>E1&_pwX`=FUAi83W@7LDKw24gS=c~Rp`)XcZANH*$oT|4%HaLIG` z+;hL*@Betf0%ly>X0V zXaS=4Ik9D@0{#w^l~sV+ErgjT8VR(Kw2)R?Q&Up|N)aT16BJHTX0nN~QVc<$#S4Sh zR3XfCdVED&@Xd)ubzNa_d|+U}GGMjHY6K@~nl>~j$_x=^ZGT+nlIFO!rKI2i8n23q zF3NG#P~<{#LU&@&)8!Ciir>E?9M_78f+@q3oPv`U0*}RvxC&@Z?*#YVcpzHq-md_> z6KHZm@L_!o8yN4niG-ac$ZlA|Zk~C>^IqWpyv66Pe!8#0MhQMkfJh2Fn>$Z}PMwiXX z(moqWdP%pViFA8mwS2VOkSuXqy zvVyW*cC<%~3-W+wRI%tMP{n>A_*6ND7Rtbg53ugFu@0Y|rM(1PB#heUV`+zvg~8ix zByGcrTwztZN>Njk&F*%)NGr+O4X%r#S%=F8L$^C@Fmo6Voe_9O7j+2~`_m=q#hoM? zJ;F#_JOYzp7C@LwNIJHoM^=Sif^5c(=95H-F6@?x_$s-=@v3euA>jxZ+m+daFDugv z;&5bDIGZ2bRYwrSlxp?3x|83Bq-ZpVq`WuV6>2f^_1*mZ1u~b^m<8OSt?U1XtEq(jPT;0WUE#AGaaZBgUS6s{d z00IX>b-CZJ%-8JssCw=6@U!QxmY+D5n%p#&`n7&+ss3^p$TUD9 I>kc0L9~hPn1poj5 diff --git a/app/assets/images/office/Excel-xlsx_20x20x32.png b/app/assets/images/office/Excel-xlsx_20x20x32.png deleted file mode 100644 index b6f6833725fb08328b0091223398c0dfd52d296b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1543 zcmaJ>eQXnD7{5}$xfCNGF&oNu90t+R-pBfNXS?m%>!4;GrIf4)=&pBfyUW_UdUv(m zBALUuWTN80WI?8b1S2ugp!gZbVDe!J3jT{*rXv{q7~w0DAQ*hFTgU!DFS&c4_s#SB z{hsG}pXYkR&1)8vFD*w9WI=E(7lG>%<1L#Hzi;#|TL70zJrL73C<#5ss{mm|B@WPF znooiV;Khy?P6H2un17R^F+CP)Vgw~^;|(8MKAnMR1o718GrZ6abTkfXC(l5FG|+i8pH9gdllNjpUIyC6F^-`{ z7rot!O$8MTg;Bqv0@Pt6tODUAP$y|4Ywa$VYc)y{B!LqYPEuCV#ne&^L7>wQ2GvwC z!9=*mX)U<(Vr{yfVQ@T`%h__ZHbqV1Bu&!>2Sr(-hgIv4bv|#EwG|}>4rqcZWpqiA zQG=0>D_Px(!APf4NM}N!8Dd$RE)*;op64?-X(RA-+Q_Tut?3bPFO2(oYtfDjz#~9Y zvZ?^@Be9|c7KIs|Ojb=5!xse{q(BB_yVk>gbm7?&dUNYL=CKT4@>+nmhr2A*A+FYD5+AbgxeHd(b|*@ z>fhi%TO?Uja+-0AQ;Bjwm0kp5qpGCQ;x#bRebikAg)nVJLtJTa$f^3S8D=w9T+ zw}rp=R21gMFI@QJ625hEF14+Dcu`O9VYDW)`r41l$l}P}L+uY9-<`uN-y7;Wow@w` z)}C|q!_?T7^WFR^yn3*r5cYewg~Q!P&K(R-4p*=G06FP46^?B>oEW+Fl4r=WaD89v z&5t&JSur#=wwUG1)&1tL$IqVqe*57Y*KgFU3=I?zb)qY77j94t()skVs-C__p0lKv zcUW#-?zQY3uS>dP^dLX_{&CB@n=g$xKC6zEC0m#i!c`WjI&)@S%KYft6BXsofx#X9 z{HfuMk3V33W_3>9`yJu<;+>JDZA1Z7AMIk-TeNw$x}NS)TU8=|@vi~4Iksprt~c!J z=O@apKUDygZ}Q?v&)BPX20WHu$AiCQ%#~&FSGM#{rgseuOe{Hd_1b8%r}Fmlg{IdY zdu#v3_LY4X!B^e;);2U_`!4$X`g=_$I&UGLoZopcHb3#?8ZZA=?w96#0sH&*6YmLR%~^QLGb^zLcz=-o*NeWB2VG6E>X5$W~rfnK=wy6aWC z#SAtg?nRxtshBN_8Cjw(!X^o3xG5Qf>7vf)mn|_kjM)@3e8c&nSf48`TB}z9?ZiqEZQ=o;?a;dg4Ps774MN-( z7CK=g6r^1{zkn4OX1XCax9Y9_I$l)67Qw(+65%LfV^~FHA}WYoP{)I?Q;s-@`SH&P zT$UU}3*)E!Q8x_9wYxRgw7b4p+}$N|5>dGguSoDnK^W=+o(Ljcby? z(-6JOK`c4d>Tkf^ss?e!LY0YBIfa)43$W34yS)^*Qh*{UD+#P+z|PyOJVoJ|hd|ae zse^Cycr&)p$w7p4J<5}0cXzj?+h$RarTa4UIxjjq45qdAbxrIO_K=D~`l6i9#tO6GD^(7K#jqjkwb2nBEBQxN%o>ta(=y zl8rE?#x)Vuqho89jBJys$^TGA*AYR zETl$pcN2rR$Pr2Hju}?9sht89q|tnejL>OmiAb(cm%d)ntyv@*0YhA#J#<)} zUKl|mtD)K4KDTZUhUN75JkI9CwV)CT1+cxZ9=Xh=Y*Yv&Q))6**=Jd8x_Y(>JdA%e zGEvh1TF%jod40NX zhq+GKgbVd0bW_ng{tv`|wOfz(^`0y2>peoY-SWP)`9i9vr|A5%+b;e-G`6Z>|E1hy zYVp|hAO3m6JTpHN{1Ke#2)y-r&CYV0o$PO+T>US!@84S-dUAF0lfwlvKX7W@hdF~)XWO@!%!g(IYSrw9 zRiov{O%LtcG%_Gy=ArqqVPdY&6gVop{Pdaca=iHYwky+7$M;8XK9Wp*qpn{#6e{cu zV)@B^kN&)X7jF2nZm#si$c-uHWPx+!H#2hyI~ad&p!nShEGHLR_sp?^uV1WLWBg-% M)%Bi_T!DT61HnKC!~g&Q diff --git a/app/assets/images/office/PowerPoint-pptx_20x20x32.png b/app/assets/images/office/PowerPoint-pptx_20x20x32.png deleted file mode 100644 index 2fdb3cb5fdf88330e627eafdfbd92db59fbbb82f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1499 zcmaJ>eM}Q)7(XoOn1Z0P4Hlf2BN-!<-bZ`1ccDPrE7*-cv%W=X)04ak5VxpA z0P2tO?H~krapy}Dpc+9;*QIc?-W+IT1tn_b4U9DvjYBqqRM)2BywC-7Gy>YCmcJ14JP11s&4H9u;iqX$lKHT>>LwwKZsUiiHNEK2C0^aWQgtV7r1ERH9WNo&$(Rn&HzWEjS3pg(rj=$aa6l7O zDXvRO3^gqB5hbC!FsO7PglIevSTY>b783VF?#csB$_^QNV!=q9CSgP!yR~1eLR!R0$p+FLR2J zFuwXZ7nVp!B1>}=;bbT~WAoH=9+G58yW2@K1ZN{@!s&Gy&I|*~iEzg%LayCM+o&oZ z$8emJBz>gQ#}RI~*F!s;1m|X$4A&pibUr2k!>PfQ?sL5l<+5HC@VcUg6-CaJO0YxG z6|F;wquwnvx=o6SN>VdUaZx8wrEVbBt4b729|J2rz`KvK*W0~bilZ6MN5ZIW9&f$f zMiO3!kM!7~@&&HAEM1wXIm$y)l-tYr7>~hqdkA{%5y=Lw9KUj_=;fcj{O0tTC(6y#_rXmY3d60l z$B?{>`QZq3;ep)FH>aqaAA5*h&XcCnlA$b1BabMb-?=kGZdY#2&8_J^6#BQCxZ8O_?wdXS z*$n;d^z{2q{MC_x!83Jz<>lpTstPvL<>T@zH;*)gEha5*``AHC!!yN0SHZ5|@-Ln? zjkeWBTE=rKT6?E|c_d^$Q8OQS{oKSR(Q*i?T^1# eHS{R5A{Y7di=1cwDCn9pez$&K6Zfg7b?^VjGYGH% diff --git a/app/assets/images/office/Word-color_16x16x32.png b/app/assets/images/office/Word-color_16x16x32.png deleted file mode 100644 index a6b7889c868d53c0fe571e7b2f0f01c3ff23111c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1448 zcmaJ>ZDtTQf z;$jr^0#P1%>pEyb5ZgVaKWGNKIyp&?J46fP$ix$njUX+1GYL@|1ST2=QAP7$e_olv zP(}7&156jumEb{4=@>RZ-*9)oG(0G=GPbuBZOL#@K^&MOnu)7glFN9ooL&yf)-{fy zIfyyv!PcD$cJ-jVZUB^V5O#@ZCeUWmK{{!d%k?r!5hQ^V6i!lh(#1I`jv&zdgF$PC z9N~Hef8G{6d9aviCO8~Vr_+wK)1eztoMc(n(m_#nh_EMzG*isjwPaI4g8-6}p(IR2 z*HBBN7}is!2ZNrjhY(M6b!{ltlKDizl;IgMfs+mbkH@XJa_FSl3m&`iM0B!$C;{+Z zkknI#1nUuLDv)9Bo^GfBl%)+^B4wz#IAsY3Du@HkOhTu~oJY`e?tr1d0*b1jODXGX zK=5Fxlp=GCKoM@1qFJZUFZf83C26mlVF|%WGK8CVTgEH}n~CtoAzNJ9D>S=kfoJ^; zNw$-2N)WsZ?ep_4H^Dah3*3N~G(}AUmQjnVJm&IG<#N0ML{m5VbzLpAN>5BT^<+#> zpnM;L4k((er;}C{^L_$Dc^k-nLyx1mGH}WhthY0~+t2W9I{_C7qxSoG*6rtE@C;3| zG?wSeo6=Q?nxbgN=ktqLB$y4>}qZY?0;2w39A?7_pv^a2fz ztN~}UsIB%sf)ot|1aE)l=dc=!g^ur;( z$0v%mgkC%J`nx-9wjRc8pl57XxlwzZro=_sbQ6-{31XkW~(J^bK1BBJf7 zv3)#ps^rqC6YmA9xo1ARJYA|*)zmc2Ubt{9G&(oeSAX~Bvki3Z(T2&%{rheg&%QWX zj;%c!JG!;5?4{GqcP7H2sI=!sNdjMPT^af2R?kO^H&^aeH9q*Z>g>!~ICdso8%4wQ ziC-6ADc!nd_xM*AcT!g~G3Tc@D#&Fvbv9FXx47}-_BXFi#eN6lR}TE*{Biqra_R5o z7ZytH{4p~+y=0&L;gCMEFk!pKcyy5s+PADsVWeku|jL2O9>>W6Q1 T-hS?c_3sR{cMFrg(2@TEuifxU diff --git a/app/assets/images/office/Word-docx_20x20x32.png b/app/assets/images/office/Word-docx_20x20x32.png deleted file mode 100644 index 69e8ab3d179832311f8601dde0d912721be544b1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1531 zcmaJ>eQXnD7{86N0Bd2!i5m(WhsYn$-bZ`4-euir?^@Sn-O4uIAPBqOz1z;Uz4Lmd zEioAxUrzZL1_govF)Ds#86jfK5}9tua6w31TvYs+5rxDE_(5i1!S}j$><_{vcklDQ z_xnBH&)XfUeabp-(L4k}tbuBw9#EY&Y%~XJI7yA#MH6FBMK#Dqkcz65CQ2Q^K*OL-iMg@s{bw*# zk=5y0%tExmRQXEte1%`;GqLEmfOS!R(UJlCUF^-`b zh|%H3rkrXHhEQJB0ZQ8mn?x`K%8+)_;VdsNUyV`(N#F#9la!4t=NuGA5NP(npfz1? z&Xy1Q3^WMKcsN zhMF41u$nO381!^1gs2t_PAiVZvx$N!!&9P$lXe1+M$Nb~=(tf2?zwSabi6UG0lXf> z)r2m=dbBRjkzwv0Y$ykmrD>d&&?A{RWeEon5Ct(K4xJ)19zoB!I$ePU6eEHvCCtA8 z!Hp#nipGZg0mJl2yO}KcMY0OkGlL$}jGUPhFg3C)e8P@Az zNzzAp7!Sn~w4W9jlID4DjvI)@4KXGG)2PW+?s4e{ayecHqM_=Isv60)N~m2m)Ofq9 zp?m|4HYqV#O~%bCX8i=ZvKh#JU5%odGH}X$tb4q?&p|VMxxjjTBuTnFq)*@(pNDpl zK9=!dS*|=IUAd@v%I7F2d?f3i;(BQ(<71o*LkNDBr)Ug^&d3sHC`JTi`_mIKvQk7b zdxVRKu{M|tn+#gTM8v=JZgyWpf$)qp#l&am%N);W*BlbgfGJK7AKXlj zFNndJ)!}fiJ@*p4De~S62%g5&ci}sC?^eyCLTf`c5<34*{x27jOD=c5jLoBp%T|r7 zdTVlJzVn;0pJu-wM8cvxS!0p&^YZfE{`;VPbN=B^*KC?QIJB=-!)UwLX+h?_Onj8FZ-Kn3SyLi++($f?|3#rji-O`fAmg}bw>$eLI zG;IwRK9gR#^IFHnaN_Cpi?CGZ3%3j3N&hzyvVhU+loj!Sz9Ne{F z>7TaseSL?Ym^C-=jiRqV6Nk@Tn7?r1pMO`@GIP-W;-=76Yt1c3%cc4fP#yjL^Gipr ze>re&@QdP&AMHI}d3Nvk`48$WlOuKE_MzDWg-g!-wSC#px`+S3Y%3n>+rGPW>9!rc zPX6Xlhjv!zzcF;>goQZRwV@#Y_?n`gE7kh4n&rcn6J$cu~Lz2bec<@Jp zP!ktNii)Uhd&(XUmXy{wR|N2}VOz_|yq=8 - - - 1DBED704-6E88-4AE3-B2F9-3410F58D52C1 - Created with sketchtool. - - - - - - - - - - \ No newline at end of file +Excel_32x \ No newline at end of file diff --git a/app/assets/images/office/ms-excel-inactive.svg b/app/assets/images/office/ms-excel-inactive.svg index 82d34f527..6ee8f4898 100644 --- a/app/assets/images/office/ms-excel-inactive.svg +++ b/app/assets/images/office/ms-excel-inactive.svg @@ -1,15 +1 @@ - - - - 4C8BB196-A5E9-45E1-A350-99BB0AD162B7 - Created with sketchtool. - - - - - - - - - - \ No newline at end of file +Excel_32x \ No newline at end of file diff --git a/app/assets/images/office/ms-pwrpt-active.svg b/app/assets/images/office/ms-pwrpt-active.svg index 7d8cec25e..105a24e45 100644 --- a/app/assets/images/office/ms-pwrpt-active.svg +++ b/app/assets/images/office/ms-pwrpt-active.svg @@ -1,15 +1 @@ - - - - 20B71793-99D3-4CCE-9F03-A003272E0F54 - Created with sketchtool. - - - - - - - - - - \ No newline at end of file +PowerPoint_32x \ No newline at end of file diff --git a/app/assets/images/office/ms-pwrpt-inactive.svg b/app/assets/images/office/ms-pwrpt-inactive.svg index 27ae531bd..22c726f54 100644 --- a/app/assets/images/office/ms-pwrpt-inactive.svg +++ b/app/assets/images/office/ms-pwrpt-inactive.svg @@ -1,15 +1 @@ - - - - 7D86E2E5-6A35-46CC-B7FA-7880CD9FA8DB - Created with sketchtool. - - - - - - - - - - \ No newline at end of file +PowerPoint_32x \ No newline at end of file diff --git a/app/assets/images/office/ms-word-active.svg b/app/assets/images/office/ms-word-active.svg index e9a0450be..bd2384dde 100644 --- a/app/assets/images/office/ms-word-active.svg +++ b/app/assets/images/office/ms-word-active.svg @@ -1,15 +1 @@ - - - - 58A7CABD-8C13-4F38-A224-E58B3FEF6D9B - Created with sketchtool. - - - - - - - - - - \ No newline at end of file +Word_32x \ No newline at end of file diff --git a/app/assets/images/office/ms-word-inactive.svg b/app/assets/images/office/ms-word-inactive.svg index 166bbb5fd..d4fe2c927 100644 --- a/app/assets/images/office/ms-word-inactive.svg +++ b/app/assets/images/office/ms-word-inactive.svg @@ -1,15 +1 @@ - - - - 31E0F97F-2288-43F7-8844-5D70AE3003E4 - Created with sketchtool. - - - - - - - - - - \ No newline at end of file +Word_32x \ No newline at end of file diff --git a/app/assets/stylesheets/application.sass.scss b/app/assets/stylesheets/application.sass.scss index f7ac29dd3..7212f922a 100644 --- a/app/assets/stylesheets/application.sass.scss +++ b/app/assets/stylesheets/application.sass.scss @@ -141,6 +141,7 @@ @import "steps"; @import "system_notifications"; @import "tiny_mce"; +@import "office"; // Addons diff --git a/app/assets/stylesheets/my_modules.scss b/app/assets/stylesheets/my_modules.scss index 9e03bcb64..19a45e133 100644 --- a/app/assets/stylesheets/my_modules.scss +++ b/app/assets/stylesheets/my_modules.scss @@ -106,6 +106,10 @@ html { border-top: 0; } + img { + width: 32px; + } + label.btn { background-color: $color-white; color: $color-emperor; diff --git a/app/assets/stylesheets/office.scss b/app/assets/stylesheets/office.scss new file mode 100644 index 000000000..58998981f --- /dev/null +++ b/app/assets/stylesheets/office.scss @@ -0,0 +1,23 @@ +.sn-icon-file-word::before, +.sn-icon-file-powerpoint::before, +.sn-icon-file-excel::before { + background-repeat: no-repeat; + background-size: 1rem auto; + content: '' !important; + display: inline-block; + height: 1rem; + vertical-align: middle; + width: 1rem; +} + +.sn-icon-file-word::before { + background-image: url('/images/office/word-document.svg'); +} + +.sn-icon-file-powerpoint::before { + background-image: url('/images/office/powerpoint-document.svg'); +} + +.sn-icon-file-excel::before { + background-image: url('/images/office/excel-document.svg'); +} diff --git a/app/assets/stylesheets/shared/assets.scss b/app/assets/stylesheets/shared/assets.scss index 90aa4a179..7dac2be0d 100644 --- a/app/assets/stylesheets/shared/assets.scss +++ b/app/assets/stylesheets/shared/assets.scss @@ -510,9 +510,10 @@ } .asset-icon { - display: inline-block; + align-items: center; + display: inline-flex; font-size: $font-size-h2; - text-align: center; + justify-content: center; width: 24px; &.fa-file-pdf { diff --git a/app/assets/stylesheets/shared_styles/constants/colors.scss b/app/assets/stylesheets/shared_styles/constants/colors.scss index d2f8679b8..1dd534a62 100644 --- a/app/assets/stylesheets/shared_styles/constants/colors.scss +++ b/app/assets/stylesheets/shared_styles/constants/colors.scss @@ -82,9 +82,9 @@ $brand-complementary: #ffcf26; $brand-warning-light: #fbebd3; // MS Office colors: -$office-ms-word: #2b579a; -$office-ms-excel: #217346; -$office-ms-powerpoint: #d24726; +$office-ms-word: #1759BC; +$office-ms-excel: #0F7B41; +$office-ms-powerpoint: #C33E1B; // MarvinJS color: $marvinjs-color: #29999c; diff --git a/app/helpers/file_icons_helper.rb b/app/helpers/file_icons_helper.rb index 7c01548d3..3a4d7e3dd 100644 --- a/app/helpers/file_icons_helper.rb +++ b/app/helpers/file_icons_helper.rb @@ -3,6 +3,8 @@ module FileIconsHelper def wopi_file?(asset) file_ext = asset.file_name.split('.').last&.downcase + return true if ENV['WOPI_TEST_ENABLED'] == 'true' && %w(wopitest wopitestx).include?(file_ext) + %w(ods xls xlsb xlsm xlsx odp pot potm potx pps ppsm ppsx ppt pptm pptx doc docm docx dot dotm dotx odt rtf).include?(file_ext) end @@ -37,11 +39,11 @@ module FileIconsHelper def file_extension_icon(asset, report = false) file_ext = asset.file_name.split('.').last&.downcase if Constants::FILE_TEXT_FORMATS.include?(file_ext) - image_link = 'icon_small/docx_file.svg' + image_link = 'icon_small/word-document.svg' elsif Constants::FILE_TABLE_FORMATS.include?(file_ext) - image_link = 'icon_small/xslx_file.svg' + image_link = 'icon_small/excel-document.svg' elsif Constants::FILE_PRESENTATION_FORMATS.include?(file_ext) - image_link = 'icon_small/pptx_file.svg' + image_link = 'icon_small/powerpoint-document.svg' elsif asset.file.attached? && asset.file.metadata['asset_type'] == 'marvinjs' image_link = 'icon_small/marvinjs_file.svg' elsif asset.file.attached? && asset.file.metadata['asset_type'] == 'gene_sequence' @@ -64,11 +66,11 @@ module FileIconsHelper def file_application_url(asset) file_ext = asset.file_name.split('.').last&.downcase if Constants::FILE_TEXT_FORMATS.include?(file_ext) - 'icon_small/docx_file.svg' + 'icon_small/word-document.svg' elsif Constants::FILE_TABLE_FORMATS.include?(file_ext) - 'icon_small/xslx_file.svg' + 'icon_small/excel-document.svg' elsif Constants::FILE_PRESENTATION_FORMATS.include?(file_ext) - 'icon_small/pptx_file.svg' + 'icon_small/powerpoint-document.svg' end end diff --git a/app/javascript/vue/reports/renderers/docx.vue b/app/javascript/vue/reports/renderers/docx.vue index 78b19a837..587235fb3 100644 --- a/app/javascript/vue/reports/renderers/docx.vue +++ b/app/javascript/vue/reports/renderers/docx.vue @@ -21,7 +21,7 @@ class="file-preview-link flex items-center gap-1 docx hover:no-underline whitespace-nowrap" :data-preview-url="docx.preview_url"> - + {{ i18n.t('projects.reports.index.docx') }} diff --git a/app/javascript/vue/reports/renderers/pdf.vue b/app/javascript/vue/reports/renderers/pdf.vue index 15e6302f0..07992e172 100644 --- a/app/javascript/vue/reports/renderers/pdf.vue +++ b/app/javascript/vue/reports/renderers/pdf.vue @@ -21,7 +21,7 @@ class="file-preview-link flex items-center gap-1 pdf hover:no-underline whitespace-nowrap" :data-preview-url="pdf.preview_url"> - + {{ i18n.t('projects.reports.index.pdf') }} diff --git a/app/utilities/wopi_util.rb b/app/utilities/wopi_util.rb index 74da50292..4d3e756ba 100644 --- a/app/utilities/wopi_util.rb +++ b/app/utilities/wopi_util.rb @@ -108,9 +108,9 @@ module WopiUtil def create_wopi_file_activity(current_user, started_editing) action = if started_editing - t('activities.wupi_file_editing.started') + t('activities.wopi_file_editing.started') else - t('activities.wupi_file_editing.finished') + t('activities.wopi_file_editing.finished') end if @assoc.class == Step default_step_items = diff --git a/app/views/assets/wopi/_create_wopi_file_modal.html.erb b/app/views/assets/wopi/_create_wopi_file_modal.html.erb index 4ceb162bf..5b23df17a 100644 --- a/app/views/assets/wopi/_create_wopi_file_modal.html.erb +++ b/app/views/assets/wopi/_create_wopi_file_modal.html.erb @@ -30,21 +30,21 @@
-