From 2fe66d0abb55d32aebea79c78626d8ad71e6682b Mon Sep 17 00:00:00 2001 From: Chris Wells <8843-cwells@users.noreply.drupalcode.org> Date: Thu, 9 May 2024 20:43:11 +0000 Subject: [PATCH] Issue #3318726 by earthday47, chrisfromredfin, rkoller, tim.plunkett, dww, fjgarlin: Reposition the card centric spinner for the Svelte UI for install controllers --- css/pb.css | 8 +++++++- sveltejs/public/build/bundle.js | Bin 339320 -> 339948 bytes sveltejs/public/build/bundle.js.map | Bin 310950 -> 311367 bytes sveltejs/src/Loading.svelte | 9 +++++++-- sveltejs/src/Project/ActionButton.svelte | 4 ++-- 5 files changed, 16 insertions(+), 5 deletions(-) diff --git a/css/pb.css b/css/pb.css index e54c0909d..be6294989 100644 --- a/css/pb.css +++ b/css/pb.css @@ -298,7 +298,10 @@ .pb-actions { margin-inline-start: auto; } - +.pb-actions .loading__ajax-progress { + display: inline-block; + line-height: 0.75; +} .pb-actions__icon { color: #228572; } @@ -386,6 +389,9 @@ .pb-project { padding: 1em; } +.pb-project .ajax-progress__throbber { + display: inline-block; +} .pb-project--grid { display: flex; flex-flow: column nowrap; diff --git a/sveltejs/public/build/bundle.js b/sveltejs/public/build/bundle.js index d65a4166b55978b0c1cb57afa3a850b4abfd8b10..26a4c3329307c1e73de2934f1325852d21aa87e4 100644 GIT binary patch delta 897 zcmb7CT}YEr80MV!=>DhX+??)X-{y2VHf<S1I^Ce4pdvwtD2&2BYcb~9W_ZzH6k!*E z#(}-zjY4%7<i%vmE$9b|>P9jOLe%@LEFvN!`o2xc3n@Amhxd7ZpXa>i`#aOhl4-g% zkC6qYVQ0b@cc5QOUHo9)fm6-Igs~Z-vMBzxq%@M;I}}Yy(WKZdIv-Ct@zFd8#K|Y~ z79<l;uTt{7qT+CwyrQGs6OKm0QOVOT4kSlT`1>(kBzFEjZ!V>C<Lqv1+(`|xq4u3W zJ>rYSht9^OM8fAA9F9a1193@;I=5`}`6vtW$@|+dl&5O^=q3hCUIPzCJE*?0JQb%A zgnv`2F*7H3&erm;_xn&VGxO$hg_-w%nBn+k66UvNuk!R0T}6oquPNNoX~Kizc6SM* zznj{uey>=jDZi!5B@2%w+REVzi?o41D^#o2Gw{YDwec^7+v<%HOs|3CO13zfEs|We zNFSWUiAFG?Ex-(!Wy&zB13emE%GbgesY0`sT8&y!J{patG^&%Qi*>ch_^`Cmvr|-% zh!0<}AWjBAg{uLupnaa1u~!cwUe8et?ze%1ul=aQeG7CC53N*VM1ZD@iB_RtfF>NT zWOd3)ta#j2;l^Gn|DaSOG2@Z|Hsa6y6rh#x*lRV09CCbBA{G?iFelC#!JW(6L1n`= z4K-k(Pu}QE7g+zQz`lio)Vk1AYnK+kb%7tBsw+A+Nji0jwkXhrp9*x>9|8IlZNf+p zYVc4u)Z>^Si#~D}jCk)k3t)c_wBX!ZVpJ>@dU~K4dylaY{#p;{GKUFMkP2VO!OS^& f08@4l$|9@VL5tHtXuw1eY@^FT$Snui%@4l;f}kwm delta 546 zcmZvYKWI~76vg?z`^Cikk9|o>w68BQRWeu~wTPJbnq;br9Yp#^S}Ka5B>FH_2Qeu) zw3Al9;S37a!9g6%mOPU@MV##9YOr>2R8qu2(7_i94#n-BdoG9Hx!=AhzdkATOcP%% zO3Arq5|6tS^e^TvUAd)QEM2HnPCc>)nI@T)_8RZjb4MM+SVZBBQ00sjbDWP>0{MuD zOS|Qf_pMRfQP?q=eI13aibHrRm{$(BF5}2N4`VyaPRp70D&8!yJu=W)MP{5uWUmv( zv*)D9{q{?UCRgwE?3JF)8a<nL7NGy&A!+_jz-N$xcG7j&t(iBjo0XHYZbz|ZkU(LU zP4XojU6nG(&a)`$RUSbp<=Tq}D#g&6b#}E)UczRJe8|Rl2-Oop!RQ<d<JANmg!zGv zLz`v-nnq(xZ=BUA!?1jwrO_SXaol|`eAxKR_F=0)LojqF(!55Z;Z2d}0LBa&!0mG^ z0DpgSK%;0Il*W`n>VJ_lSo8BiEKE3Qffuw3I*P3-AMdld`zIa@<SBvrh6rP_##8^G zH4HywLHtR$a##*<H!1}h!P}n{?91|wT%TegXi2)c6O}JIuiSpZ;%HvwL%aH{l#A3T I7e(#+Uop425C8xG diff --git a/sveltejs/public/build/bundle.js.map b/sveltejs/public/build/bundle.js.map index eddaae107e0da4f4f521bcc86d116484df1f949f..e9f466004062fc3dfc5eea36c75f7a18c218d2cc 100644 GIT binary patch delta 543 zcmZ4XSLk?yaKjeH=MmF27cug(X6EH&=1spH!Dv6-B$82+LqQ=qC$YHLYPxhJqa=@Q zwIWzSYHdv3^uTkB;?wgZ8O8Zxlw$G}fB>o#BsP6sBqI+WvU&xD?Q0?#Szb)v;KC#c zwda5flj!tij!g2?uevZD+P=++X&dA8l`c#Q$nu#kOt$Sn`R!L-nA5a4tgX#losC^R zrWY({7MZRvmxY_n+Q`Mxr(n8cKC>cguB)T7D?)Dihegb+Y=+J{zK-G3*9Wl}GI~!J z+{mKLX5s4SQSOXT2sGE)1ZIpfn{_^#IR=}Uxmi3N1I(wN%V#!Y^>lQuaGL(%DYMk{ z>$8ExxlU$*=@YIpo3VsDd!}snFJNA_bGm>n3yVvJQ<jsCyQ8C{jyH&Kg%jycaHglD zqo+=&qhqKJm<3V;bPgC~J3Bh(OmEa;QJwCj#bPnNMvKLVIV!_>x?Kc|!S>%;EZ-Q7 ztvww>{7JK8`odMr;?o<pGs|=PJNjk00K><z&~^F)4HmuW4fC0Kwm0drs7wR^7~81k delta 335 zcmX@!AiV6aP{S6+=MmFcBN>gQ6cV!%D|8Er^3#h_i;H!2(@Jx4ij#{{Q}d=<L^5h} z+QsB4DA=TAmQ9}%$*91nF#S{{qcT&B()Qnxj4Usv+c+_aPCw?tq`ckLiK&HYdf#eB z-sw}7nfRwGxiZOtWu^mV&P}g9%g8g`!I??EUDu6iyRI8^r6#+Pi*uG+mh<#PeHO9l z3DcQ*xcnX6a-4O19sPZ$KNM!snZBTanT0VDp<sH#7G_QsPe-4k>3<5C&8FX;!E7+S zp^#aOHQd>|!fARyA+yx>^M%YkJGl*99MiI#bUYm$J*W3?Vv*ps&USWm@zQa3bc~$t zsKz2c{e(7)#q@vLEPjj;+kJIdG?=)6dV>5BTBc8^WmcW8aGRNfJrCq6$HM6kgjsY! N!hGA6^;uLV0st@jYRmut diff --git a/sveltejs/src/Loading.svelte b/sveltejs/src/Loading.svelte index c2c3f86e5..8d6525ec0 100644 --- a/sveltejs/src/Loading.svelte +++ b/sveltejs/src/Loading.svelte @@ -1,13 +1,18 @@ <script> // eslint-disable-next-line import/prefer-default-export export let positionAbsolute = false; + export let inline = false; </script> <div - class="loading__ajax-progress ajax-progress--fullscreen" + class="loading__ajax-progress" class:absolute={positionAbsolute} + class:ajax-progress--fullscreen={!inline} > - <div class="ajax-progress__throbber ajax-progress__throbber--fullscreen"> + <div + class="ajax-progress__throbber" + class:ajax-progress__throbber--fullscreen={!inline} + > </div> </div> diff --git a/sveltejs/src/Project/ActionButton.svelte b/sveltejs/src/Project/ActionButton.svelte index 85c8f83c2..b71951961 100644 --- a/sveltejs/src/Project/ActionButton.svelte +++ b/sveltejs/src/Project/ActionButton.svelte @@ -188,8 +188,8 @@ <span> {#if ALLOW_UI_INSTALL} {#if loading} + <Loading positionAbsolute={true} inline={true} /> <LoadingEllipsis /> - <Loading positionAbsolute={true} /> {:else} <AddInstallButton {project} @@ -213,8 +213,8 @@ <span> {#if !PM_VALIDATION_ERROR && ALLOW_UI_INSTALL} {#if loading} + <Loading positionAbsolute={true} inline={true} /> <span class="pb-ellipsis">{loadingPhase}</span> - <Loading positionAbsolute={true} /> {:else} <AddInstallButton {project} -- GitLab