From d6dc60f33ebd576f7a2be8f53cb5a46fd3b9c6d6 Mon Sep 17 00:00:00 2001 From: UTKARSH-PATIDAR <utkarsh.patidar@acquia.com> Date: Tue, 28 Jan 2025 12:37:15 +0530 Subject: [PATCH 1/5] Changed the install button's css according to gin --- css/pb.css | 10 ++++++++++ sveltejs/public/build/bundle.js | Bin 297852 -> 298749 bytes sveltejs/public/build/bundle.js.map | Bin 272084 -> 272946 bytes .../src/Project/ProjectStatusIndicator.svelte | 15 +++++++++++++-- 4 files changed, 23 insertions(+), 2 deletions(-) diff --git a/css/pb.css b/css/pb.css index 4b9724a9e..7cabb660b 100644 --- a/css/pb.css +++ b/css/pb.css @@ -1109,3 +1109,13 @@ .views-bulk-actions__item-gin { color: var(--gin-color-text-light); } + +#project-browser .project_status-indicator-gin { + background: none; +} +#project-browser .project_status-indicator-gin { + margin-bottom: 5px; + margin-left: 5px; + font-size: 16px; + font-weight: 700; +} diff --git a/sveltejs/public/build/bundle.js b/sveltejs/public/build/bundle.js index 5cfe970d1bd668fb2a2e64351ac7a2cc9a8df694..892e2491b4d985ed732db4ab9f9f3f27087ede66 100644 GIT binary patch delta 605 zcmew}P3Z4jp@tU5Eldd+lNa3-n(Tjud-A$7eADwXm~<IUr$0E#7|Up~{Z|H438RR< zR#It6Nq(MBVp3|3b53G$acc2&K`|zg>D_^hqLYm;%1z&q#U#M3proL!08u=7;cel` z0+;xv_Xjd^Zhx4?^qi5=aJt}gM(yc*rx+s`O{PzH&gji(GX29NMuq7;0xar`Cfgt6 zGWjr0zIa2!71<^&eFY0mg=#JZ1qB68PEO9ml9D2g;)29HLmdUBWRPo=bfC6kI#GD~ znK_JnllgB;2!VV6b-b3of{B8f+T?{dg(pkhRKezYmFW#B%$$?uPH{{&z9=+(?;B>G z>G7P*{L>YpSZubJ=QEvVoc_OniF2~{1739nTLpD>YlsVTQcDytgA1%;vfxMk>G_3B zhZ#+#>qxNZOn(2!hDAY5O<{8PV;Oc^TU!NnL-pwjTr3hIMmkVKpe_dKpS~fBNrFu` zJu^>TbNa$M7BNX<m@4G(f-B{VkIw<c7(|ElWX2~d1az=Nbxf~UWt5zp@PuP}dJ&VT aBE&mTmteE9y{d?*y{d?LdsPt&lOzB>Zp_aB delta 161 zcmex6SLn|)p@tU5Eldd+)Bj&%6q$ZLgNbK)Lo`#%bd%XkO4H?HnF6N&(`6Q&z9N(9 z@$|b{Op?>*mNKzVuMcEYntm^fNdm-@+^(I?^qg_~wRom@#>oq|vP>7KW>%j*H;?Jo zbo(qOw#m|4IH#Rqve_<Q$aI=<`n(h-@#zl5OgE>$Ol9JqzFV3_ZhCzL6UX$UrA(sj Re@mI#|CTZ@|69r;2>{qHJ-Gk? diff --git a/sveltejs/public/build/bundle.js.map b/sveltejs/public/build/bundle.js.map index d12b193f55d82ab6fae62b40b29726e517643db7..2c6c043ee074a929bbf423eec389b23d9cd3613f 100644 GIT binary patch delta 756 zcmca|R$$W=frc%Ni|*+tDCDG;C?u7Zl;r0*=Oh*vrxq*NDyXYl$K)YP`6MQ#=1fm4 zVicb4QN<`TJ*<S$-dRCSO(CVIv>-7jIJKlCGcUbZFFi9)FD0=kJ2yWiRl(NQRzclR zT~nbNWSD}20;WCF@84sTP|;1#%!Am7Pz1IS$wgq5BJuG#AeSI(sGS~I$|xd$RXqn( zz54WqQbw8S7w$2t3n)~h__lWX_j`<6MWBMnrqs5dzR$S*^nIpZ>zH$$lBOFrG0RWy z&t>A6{;rQXkIg#W+0os5`n?Iv3Ou<kj*c15I_{2+*-q0xaxhD=X1hBE_)k}mWtN)$ zfQy-%v1EF8KXW=~v5Stgqobpa@AN=bX36Ov?3snwj9eYP@?21jkD1<ZoLQ6A%oS>d zB2T^xk`)IznPpgWz2H`S_`%FMJ>Uhi0K0X#W0q5u^Yja=n5CxcPh^&>_jGj5a)Q|E z39>rT(J>L^Qg<C!M@Lt%gte!ma}KhaY$uRU&{bJOfVZQ&p_8?BsH3a5j<=(uw~nWy zqo+=?qhm4>%h}Np93Jk|Z;LX^GG(|<56EGbQb1U4;pFIO0ksnpBp^3fI)hayBU@kS z?C4nN40a}%u(tMebTxDVD-=RjnCa~3nCU$Iqc^h}TcwM0xpT($!l}%bjN4aDV%C}h E09X6)EC2ui delta 186 zcmdmVMc~R=frc%Ni|$Q#sbbWd?*4#LeR|yk#;w!C9xzI<$H(U+CZ*=IyFX;y?*5SJ z*E*)ar0E|gGB;0mxWdfOX>Dzt?(FEE?lgUY0E@`<fP>83(-$0OW@GVp3^1M^Fp)W( zF?0Ha7tCVQ=gTtlOkd!~EWl=M<m%{UIsL;#=8a6~8u_OyOlD?dPO@~KE~v>YHQi-0 ev)uIkDa@?X^HZ6n*eYF|b6p~~Uzoz2G!+2%TS9CA diff --git a/sveltejs/src/Project/ProjectStatusIndicator.svelte b/sveltejs/src/Project/ProjectStatusIndicator.svelte index 2e812ce9e..4b7367354 100644 --- a/sveltejs/src/Project/ProjectStatusIndicator.svelte +++ b/sveltejs/src/Project/ProjectStatusIndicator.svelte @@ -1,16 +1,27 @@ <script> export let project; export let statusText; + let buttonClasses = ''; + let buttonLabelClasses = ''; const { Drupal } = window; + $: { + // @see css/pb.css + if ('gin' in drupalSettings && drupalSettings.gin.darkmode === '1') { + buttonClasses = 'project_status-indicator-gin'; + buttonLabelClasses = 'project_status-indicator__label-gin'; + }else { + buttonLabelClasses = 'project_status-indicator__label' + } + } </script> -<button class="project_status-indicator" aria-disabled="true"> +<button class="project_status-indicator {buttonClasses}" aria-disabled="true"> <slot /> <span class="visually-hidden"> {Drupal.t('@module is', { '@module': `${project.title}`, })} </span> - <span class="project_status-indicator__label">{statusText}</span> + <span class="{buttonLabelClasses}">{statusText}</span> </button> -- GitLab From 5359381738b851a3a23ce1aae1f7f9074e384579 Mon Sep 17 00:00:00 2001 From: UTKARSH-PATIDAR <utkarsh.patidar@acquia.com> Date: Wed, 29 Jan 2025 18:58:50 +0530 Subject: [PATCH 2/5] Replacing the green icon when in dark mode --- sveltejs/public/build/bundle.js | Bin 298749 -> 300864 bytes sveltejs/public/build/bundle.js.map | Bin 272946 -> 273579 bytes sveltejs/src/Project/ActionButton.svelte | 4 ++++ sveltejs/src/Project/ProjectIcon.svelte | 5 +++++ 4 files changed, 9 insertions(+) diff --git a/sveltejs/public/build/bundle.js b/sveltejs/public/build/bundle.js index 892e2491b4d985ed732db4ab9f9f3f27087ede66..64c5976f6178c06541fddf025fbb2a99b285c9d7 100644 GIT binary patch delta 981 zcmex6SLnbxp@tU5Ele-#7|pi7s$<IFpT4G-iGwG-C^a?DGq1QLF(+sGyB;Pf&g6{L z<m}wUqU`Atx|vj`ADP7@GCiV~NqxIrAJYt`>6eZ$iB2xq$v<89ITQQz3F6G$(-%x( z;+=l(8l(7hy@^bg(@(5n5@ohfF`Qobipg%e=~^b~={F`aontiGzI+msDbsZ44NSq? z^`|nK@UfU!85>W(Fq27P`m~))BGYFtW}3}xsbV-;@SHGHyb0I<rg+ooj0>4WCkvcq znZA4p(+ft^?Gu(V{b6J@oj%W(No@L?DNN4OH`FpJZU6I@NtS8)gAOLs>D?`i7SlKQ zGi{u1Aj!-&-R>ik-1PL-Owr6HR%X+)J(v}y8{{yvOn<qW$!Yr9vrHn>?bk4MPQSZ` ziDx>eHWN3a5y%OQ@zV=lG1*T~xWlABJ!LJ^Ge+a-^KLTcZ{M|!sgse>c(dZQ2*&LX z-Z5D+;<i<M3sVfUrIp3>jWd}wrZ3sWEIj>vI}6A3_eYr0w<~OAQfFZ_o$j%d$&b-; zy5S{ek?pH@GEHP<GBnt3x1Z@RGmE*Eq49Lb{Y)a$?>uHw-d=W?$&iuR0%qRhi%byn zw!c5Zq|Cx%X=P>!3DCJWm_(3l+If;`88f5l^n|lazSGT4GBs~EILFk^%wl3?XasTE zye&+^(|xZp8BFK7!j!cA-c_a+#_c>;m^c|(%&kn!Af~o2W)j)%dzDFsnaRRndiD(_ zqv@7cnOvryxW$wV)pFt%6Bi?+<#fCKOcK*y-)1VC-oKQIeLDL>CjQ9+XW6FL-eJ;a zG@HKi4wEOdxr)(bpR<aL#*+)qT2Aj<%EUG~^t{OQdLc%c>HTk+*rwY}W|Y|;|Bs2E z5o8MM_Tv9cQy7`d4Zx;v&w9WV#XLRm0h7e`JCB*RF-^a(#l$v!%S>j~>DMMe0)~CN z+;b*P#%X7moTn$mG4G%L{wkyB^z;7A+|w&wGO0}$xXQ%BVQOY&rm0Y^JXzqe^z^0@ zCXML_XEV!B*Iok&LiXu$&zXGLAX#O4&U2>Qc#WGr@flMaI6*NRsTfZdJSPH4MhE^d zNl(u%VRD!}`CQm`|8-2IjMFzTG4f64y~JoUy}*HK4r*czn?50fS#tXJmrOgRe_q4n VG<}00qh$MuS4`Vayka(80s!POZ?^yd delta 634 zcmX@GPU!Dkp@tU5Ele-#7!9|-s$<IF-~P9csfB5}`W$BA$pt(4r$;SeGMn!AiOGUB z-blq*XZppfOd``4t!1*GtZ<EWdi*;k(dn&|n9faBxW=|Uax#+v(`1Ef!Q1alWisJo zG?*^9gh_e&Bajx4B}}uKEmRCA3!W2ZjyH~-zHteY==8Itj2hG9?=!JY=fBG&I{o+; zX7TCSOPMZCPq@#-y4`UZ(+@^46C}+s{cSrl*Y<!FO!6#@2Ga}HFl9`Sf5jv+`R+aT z>GGeL^ruf)!W2ARWD=7ovx$lk$fD^RJ~25>&zi&}J^lAureBOk)92k}%-_CY8B-_Y z^v<bF!P7U?GAeDi|HdTCw7p?7(>z8-)9LbCnY5?(USblOKH(@+{`S*bnbcVr4X1zJ z$>cZPWC@eV_Rw8SlUNxIrsqCklGt{D=@~PNv6Z3m^ui}h=GzsIFc~s3nm`OGzQruE zeZo;DZ5B3DD>F+?g~=Ze$xRPC$JD$%=@ip4W=6y5oadN)r{7q^Bm%Z<detc=&FxI* znc|ok4W=hvV$zvjca%wJdcZ>_gYD-pF}-JEG@icyDwFbbx0_5Z+Z!G-y<uW9H=8bU zlgViM{gX^05S3jwnLaWxnoiGq!X!R@@*Sq~=?~X3=}ot|%OuHYIz8wvlP9Cu^tY_c zN=)%a(*@a>t){=*z{D{*;=JJWdLc%c?G0?qhKwLFw(V*6nI<z%&w0Wmxn1ZXQ#3Q9 z(e}J2OlO&<e|^K$3UV|1_J-$7nvB~GvY7=Lr!UyaBsu-U9%h#5CtfmXPQU+=>Ed+B XcT5h`HwZFHwsU`G+Rpu%*>nj2RI~BK diff --git a/sveltejs/public/build/bundle.js.map b/sveltejs/public/build/bundle.js.map index 2c6c043ee074a929bbf423eec389b23d9cd3613f..614b8aeeb00cffb7c5f4ab9a9ecf78e9d8a98f14 100644 GIT binary patch delta 331 zcmdmVMPT(!frc%NHqZDJ6w-@QQ}aCYic1o6a;ATH!YIX&oRONGots#+{lZhmEnH01 z%F`9^GdfRKjAas@zFw1wM;uv8YD$cfg1%i$o`S;kf>Vql(^qIR2~VH#fl*|7#5YEM zMw`hGnZ(<Vd|=#u<O37O5=OJ_XQwc4V`r{#j+*|kn^|i6f;r5Om_>XYT?<@vk{unB zbzB`C9j!ebouj6|o6o$Nv2^>Q1<ZVmj0Mv-E@ZySn7_S!5%WzBM%U?ytC<ZLy{9J% zGK)@MP{Ay_{m5$O62|EZJeg(LLLGCQjGd<Mo6Kx8U2Gw<?DPX!%(ASWj$S#g)9uzW zcQYBdPQQ4D*?oF~Fta#oxMP-w|8zl3W|`^x?3j7Chp%Iv$;6cHI{niI=3o|mH$&Iy c6UCUNrpHOJaBa`s$b6rX(Pg{uX6C15051J?q5uE@ delta 252 zcmZ2|Q()5-frc%NHqW--c*f|#HC@b*No4w=kBlPiPd_qlfBKP0VF^pQbB4=whZ)RM zx6hl#EXU5A=NvWN@HVsXblqNN_USqInK-8BmNSb?_bO)=oL<nw%sPF)7&F&&pLxt8 z)7R%Piy*|d`^;m`XP(~C&n(Lv>Ri6Pc@Z-oBTI&Bsq?fY%zD!gFJ@lCn7%z@3G+=3 zM$hR^Yncrg-KOhrV>a5pbS-lUBZsGBj+4HVj_Y)Xd(4W{Z>?v}U@CT<c7fS_`UNj$ zan^80b9evgAOAB;P5)}o%)kA@2IiSeOcpNFvo|vbGa7H-znPhhiP3ZWv8~Kc%K$CZ BTa*9* diff --git a/sveltejs/src/Project/ActionButton.svelte b/sveltejs/src/Project/ActionButton.svelte index 236564876..50aa8fb4f 100644 --- a/sveltejs/src/Project/ActionButton.svelte +++ b/sveltejs/src/Project/ActionButton.svelte @@ -53,7 +53,11 @@ <ProjectStatusIndicator {project} statusText={Drupal.t('Not compatible')} /> {:else if project.status === 'active'} <ProjectStatusIndicator {project} statusText={Drupal.t('Installed')}> + {#if ('gin' in drupalSettings && drupalSettings.gin.darkmode === '1')} + <ProjectIcon type="greenInstalled" /> + {:else} <ProjectIcon type="installed" /> + {/if} </ProjectStatusIndicator> {:else} <span> diff --git a/sveltejs/src/Project/ProjectIcon.svelte b/sveltejs/src/Project/ProjectIcon.svelte index 3af92e566..86df5fce1 100644 --- a/sveltejs/src/Project/ProjectIcon.svelte +++ b/sveltejs/src/Project/ProjectIcon.svelte @@ -35,6 +35,11 @@ alt: Drupal.t('Installed'), title: Drupal.t('This module is installed.'), }, + greenInstalled: { + path: 'green-checkmark-icon', + alt: Drupal.t('Installed'), + title: Drupal.t('This module is installed.'), + }, }; </script> -- GitLab From 5895085254f4b955ee808e1f4dd582ea418e8a3f Mon Sep 17 00:00:00 2001 From: UTKARSH-PATIDAR <utkarsh.patidar@acquia.com> Date: Wed, 29 Jan 2025 18:59:04 +0530 Subject: [PATCH 3/5] Added icon --- images/green-checkmark-icon.svg | 1 + 1 file changed, 1 insertion(+) create mode 100644 images/green-checkmark-icon.svg diff --git a/images/green-checkmark-icon.svg b/images/green-checkmark-icon.svg new file mode 100644 index 000000000..a5b5957f7 --- /dev/null +++ b/images/green-checkmark-icon.svg @@ -0,0 +1 @@ +<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 13"><path d="M2 6.571L5.6 10 14 2" fill="none" stroke="#42a877" stroke-width="3"/></svg> -- GitLab From 0eeac5bbcf1fa8f0c8d089128f5e49c252b7f1f9 Mon Sep 17 00:00:00 2001 From: UTKARSH-PATIDAR <utkarsh.patidar@acquia.com> Date: Wed, 29 Jan 2025 19:10:22 +0530 Subject: [PATCH 4/5] Removing use of #project-browser --- css/pb.css | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/css/pb.css b/css/pb.css index 7cabb660b..a1c710112 100644 --- a/css/pb.css +++ b/css/pb.css @@ -1110,12 +1110,10 @@ color: var(--gin-color-text-light); } -#project-browser .project_status-indicator-gin { - background: none; -} -#project-browser .project_status-indicator-gin { +button.project_status-indicator.project_status-indicator-gin { margin-bottom: 5px; margin-left: 5px; + background: none; font-size: 16px; font-weight: 700; } -- GitLab From b48fc0630343f3e0f6ccfdc02c9dfc779bb44566 Mon Sep 17 00:00:00 2001 From: UTKARSH-PATIDAR <utkarsh.patidar@acquia.com> Date: Wed, 29 Jan 2025 19:30:56 +0530 Subject: [PATCH 5/5] Eslint fixes --- sveltejs/public/build/bundle.js | Bin 299667 -> 299753 bytes sveltejs/public/build/bundle.js.map | Bin 271499 -> 271592 bytes sveltejs/src/Project/ActionButton.svelte | 3 ++- 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/sveltejs/public/build/bundle.js b/sveltejs/public/build/bundle.js index c0f8c5827c1503e159c1e4aab04266434b6d94e3..ad261c78bd9c74c2e219420dbd4837164b4abca4 100644 GIT binary patch delta 641 zcmbQdROsbWp@tU5EllqwF_{@`|1gP(lbOZB(9&r8->FOjOpF%W`DQScv#=W)SQ#5@ zDol6W%`CTl)f^@(4lZ*8D>F@nYURwd>4y6l<+k%IWtzvxXgvMg1xCr~N0u=Ou$#mx zsHrI^PA^=>Br*N-GA0Ek<Jjr<UNePm&sxr;#l~nl{p4OI?db>BGVPfDBa%gId*3>y zZH&`{;#fqd7aU=d06D~X`iA$+E!zc-GUYNd8yXsJ&)mf125}-tX4&)y)y&-6Q?@bv zVq`R%UU-v9Vte@xrl-t|#@l1}Fl93`nt&`hJiQ{4g=hMkyUZHf5A0*AW@NT7w4A>F zJ##C_<UB?;Q!6t|nD;^tF&Q(V+MUP9Xt=%p7*irx+z4bd)J<%L1_oA!M$=F4WzyWv ze45FSna$YB#0+Lu#5pEIW=6B^T^E_snWq=rWRjfDb(QH2qw(~$SDB=?3tnT22T2#+ zWGZ52Gy=I_eEaV^Oxu{4O{~l&pWdUn{qB9HekMkv>A8=X6a+!xnNn0*keCykT2hjk zm%e?$Bc{_#jE38Do-(yFn&@kx$ZF{;B$re~8-e2im)!IPkC?=!Yd&WRpB#Tmc>9Fs zOkv!NmeZ@!S>&hNrL#y)R=BOqXf|Cookf1~y&r7TGe0va$f8)IV5@+_-(LNh=>Q9p end#((_oSys{9tP4MUij6{DW!x<sZxkW&!}ZSLNdX delta 557 zcmaF4RA};2p@tU5EllqwF_~I!|1gP(lbOZDz|w5{->FOjOw8t1M$-=lF<Wo<p21|r z!fs$`Wo)deF#X~jX1VRF<}g`taG6<JnQ1CiD`%!nH{8c4x1DDx(>z8-qv_`^FiK88 zvW!W9-8fc3O-(^@df_rAiRqu0F)1(^#ZI>=Wt7~mx11@BjoHM?V)}tu%o@}8uVvcF zXg1wHibZsL-#Vskj7(;+lMjBCnErk$6Z`a<BTPIXr<rfJKfv^nk=fADV0-2!CO3$C zr`sQ3YME|h%*-?W{by#e=?PWL+}l&OG5um>G~FJ*gXu3bqtW)*Jxtk*%*HVLKJR6k z$!G$$Z+hQ4Ci(3L_c2v5g6yya+3|^y&BV&g66W2|Lrlg@AW5(TJ~1*HY_C7Yln53w z1F8SW$ZBb6WoQKU%y#C}Oh(LXMph<fnhMhuw=v6ak2=R>z|3g6z560lIy0lm^!Oc2 z64SY_GQD9mn!fHTlhk&hYfSOXjHY0T?OivSqL>*CK^*bzf9^1CV`4V8GJ}|X_de4E zCPu^Qd5@SBrhm_2(%ioF5z|&CMuY9yPnp^or@zW!GM{eyoGEO2;zh>n?YEaRaWPKc zcaqU-`hp{jL6iUA;Ml(YC6h1b^z-Q~3e#miGubklPLKM`<huRTXQoXoOvc8O7v7Ve UKJy1tbGzYBrtOA5nRm<t0P{V>^#A|> diff --git a/sveltejs/public/build/bundle.js.map b/sveltejs/public/build/bundle.js.map index 42b9a50d12391080b363838febf37d0398e9799c..e276c7a46dcac1f6455f0373cfef51ab24d22560 100644 GIT binary patch delta 240 zcmeA^De&T?K*JWsgvV+M3d#9-#U%<UMWqFaIl-wVC7F5Y3bv^H;^_)GjH=Tw%wlBQ z-tn069*dxYni{H-_R1HG+bdr%^{ittb24|H{xO<ac)QGW=9N5Z#ZHcno;vQ1j)^+X zAeOVEqa%prr~{I5gvfYKzqOb-jxl4p<r3z1%sC$Z({)Xmr8GPpoueRXeL=bsL58?H yI=bs5J31zVC9FLi-7THAdn{${VrH}UbT)7<nf`JEv*Pr<tC=;nE39PBt_A>y<57D6 delta 122 zcmaEHQlR^!K*JWsgvZmBa~PGTUzo+nwteGc#(ON&)2}gVwr_jExP99Trm}U6CfjwV zGw<h_zPyv!Z2Grr%sSIAh%@suJ9_0zFI>X>jxlR`!ct~ACikfAOO`TsF|&F)8#$Lu fciYIUI9+NDv&QrZcFerfXRl`7x7}kE^MWb>Ue7Sw diff --git a/sveltejs/src/Project/ActionButton.svelte b/sveltejs/src/Project/ActionButton.svelte index 7884ab9fc..09e352881 100644 --- a/sveltejs/src/Project/ActionButton.svelte +++ b/sveltejs/src/Project/ActionButton.svelte @@ -15,6 +15,7 @@ // eslint-disable-next-line import/no-mutable-exports,import/prefer-default-export export let project; + const drupalSetting = drupalSettings; const { Drupal } = window; const processMultipleProjects = MAX_SELECTIONS === null || MAX_SELECTIONS > 1; @@ -58,7 +59,7 @@ <ProjectStatusIndicator {project} statusText={Drupal.t('Not compatible')} /> {:else if project.status === 'active'} <ProjectStatusIndicator {project} statusText={Drupal.t('Installed')}> - {#if ('gin' in drupalSettings && drupalSettings.gin.darkmode === '1')} + {#if ('gin' in drupalSetting && drupalSetting.gin.darkmode === '1')} <ProjectIcon type="greenInstalled" /> {:else} <ProjectIcon type="installed" /> -- GitLab