From ab3bc1b667c1bb657cd248a06d280834e4330d8f Mon Sep 17 00:00:00 2001 From: Alex Skrypnyk Date: Wed, 21 Sep 2022 08:09:14 +1000 Subject: [PATCH] Reconciled navigation into a single Navigation component and fixed logos. --- .../contrib/civictheme/civictheme.theme | 1 + ...civictheme_logo_secondary_dark_desktop.png | Bin 2957 -> 6006 bytes .../civictheme_logo_secondary_dark_mobile.png | Bin 1549 -> 2957 bytes ...ivictheme_logo_secondary_light_desktop.png | Bin 2957 -> 6489 bytes ...civictheme_logo_secondary_light_mobile.png | Bin 1549 -> 3297 bytes .../00-base/_variables.components.scss | 174 +++--- .../components/00-base/base.stories.js | 30 +- .../components/00-base/menu/menu.utils.js | 36 +- .../01-atoms/select/select.stories.js | 4 +- .../components/02-molecules/logo/logo.scss | 142 ++--- .../02-molecules/logo/logo.stories.js | 10 +- .../components/02-molecules/logo/logo.twig | 89 ++- .../02-molecules/search/search.scss | 50 +- .../02-molecules/search/search.twig | 7 +- .../03-organisms/footer/footer.scss | 8 - .../03-organisms/footer/footer.stories.js | 14 +- .../03-organisms/footer/footer.stories.twig | 21 +- .../03-organisms/header/header.scss | 17 - .../03-organisms/header/header.stories.js | 32 +- .../03-organisms/header/header.stories.twig | 32 +- .../03-organisms/navigation/navigation.scss | 563 +++++++++++++++++- .../navigation/navigation.stories.js | 16 +- .../03-organisms/navigation/navigation.twig | 58 +- .../primary-navigation.scss | 421 ------------- .../primary-navigation.stories.js | 32 - .../primary-navigation.twig | 51 -- .../secondary-navigation.scss | 105 ---- .../secondary-navigation.stories.js | 31 - .../secondary-navigation.twig | 49 -- .../side-navigation.stories.js | 1 - .../03-organisms/slider/slider.utils.js | 20 +- ...tarter_kit_logo_secondary_dark_desktop.png | Bin 2957 -> 6006 bytes ...starter_kit_logo_secondary_dark_mobile.png | Bin 1549 -> 2957 bytes ...arter_kit_logo_secondary_light_desktop.png | Bin 2957 -> 6489 bytes ...tarter_kit_logo_secondary_light_mobile.png | Bin 1549 -> 3297 bytes .../config/schema/civictheme.schema.yml | 48 +- .../contrib/civictheme/includes/constants.inc | 33 +- .../contrib/civictheme/includes/menu.inc | 29 +- .../contrib/civictheme/includes/search.inc | 2 + .../civictheme/includes/system_branding.inc | 4 +- ...k--civictheme-primary-navigation.html.twig | 17 +- ...-civictheme-secondary-navigation.html.twig | 17 +- .../contrib/civictheme/theme-settings.php | 111 +++- .../civictheme/theme-settings.provision.inc | 28 +- tests/behat/features/menu.feature | 6 +- tests/behat/features/theme.settings.feature | 60 +- 46 files changed, 1206 insertions(+), 1163 deletions(-) delete mode 100644 docroot/themes/contrib/civictheme/civictheme_library/components/03-organisms/primary-navigation/primary-navigation.scss delete mode 100644 docroot/themes/contrib/civictheme/civictheme_library/components/03-organisms/primary-navigation/primary-navigation.stories.js delete mode 100644 docroot/themes/contrib/civictheme/civictheme_library/components/03-organisms/primary-navigation/primary-navigation.twig delete mode 100644 docroot/themes/contrib/civictheme/civictheme_library/components/03-organisms/secondary-navigation/secondary-navigation.scss delete mode 100644 docroot/themes/contrib/civictheme/civictheme_library/components/03-organisms/secondary-navigation/secondary-navigation.stories.js delete mode 100644 docroot/themes/contrib/civictheme/civictheme_library/components/03-organisms/secondary-navigation/secondary-navigation.twig diff --git a/docroot/themes/contrib/civictheme/civictheme.theme b/docroot/themes/contrib/civictheme/civictheme.theme index 8c278eb1d..bbcd49876 100644 --- a/docroot/themes/contrib/civictheme/civictheme.theme +++ b/docroot/themes/contrib/civictheme/civictheme.theme @@ -240,6 +240,7 @@ function civictheme_preprocess_paragraph(&$variables) { */ function civictheme_preprocess_block(&$variables) { _civictheme_preprocess_block__civictheme_banner($variables); + _civictheme_preprocess_block__navigation($variables); _civictheme_preprocess_block__civictheme_footer_menu($variables); _civictheme_preprocess_block__content($variables); _civictheme_preprocess_block__civictheme_mobile_navigation($variables); diff --git a/docroot/themes/contrib/civictheme/civictheme_library/assets/logos/civictheme_logo_secondary_dark_desktop.png b/docroot/themes/contrib/civictheme/civictheme_library/assets/logos/civictheme_logo_secondary_dark_desktop.png index da031efa87f4a0801681dcbc3b6263b40c28bb20..f8b5fc5b1fbb8560f5355805ab60dfe51c0db5b2 100644 GIT binary patch literal 6006 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 W-_jkwQMnA0QyA!(>Q?JG$Nmp~3+HG6 literal 2957 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 diff --git a/docroot/themes/contrib/civictheme/civictheme_library/assets/logos/civictheme_logo_secondary_light_desktop.png b/docroot/themes/contrib/civictheme/civictheme_library/assets/logos/civictheme_logo_secondary_light_desktop.png index da031efa87f4a0801681dcbc3b6263b40c28bb20..8866583dc9c75e27c63b9daadd2908beb587a6d7 100644 GIT binary patch literal 6489 zcmb7JhgTC%v_?QBD9wOK2N6N4Naz9*B&akIX#xV$dy|CFLP?MoiiO@nklu^*B1nxt&8&Qa%|L}e#HZbVF zL0wKZ5&FwHDS}@O7FQ-e1O(!L_+6{sB~EE3FsT~w^J;mp9MoomN$1A~P3ql#wsenN zaYEi}LTu!cLvx6!FP2t!yl;4Jem-}fgAGgsp5XuW38_2`J6*Sxic;qgvstij=;2%c zpwIOHLq>{c-#WRLQ&b(f{B7#T(sOg|yYQv!*B8V%{R9>U{R*as4esj}b0uHcmtXti z>o;qMjP#Y=&5rNQil%7N$U8igvLEjzRa+nawmi3!ubp5=PmD}u0qW0R9V~})rbr%y zGu=is$c%YCD=bUjyJS>fHIBY#{Pp1(VR2V6g~8)GDu}*(oT_C^F>L+3by^hqjiMJ9 zH}@^o1n54mZ1cu*VWUkynH?pVCN)*P3e7QBW=k4At3e=v$s1JBpo;{)d+e4x$wbXj6`VrMk?%6Rld^z?()qOiq+5_<)>-#;vhUx8ci6+j` z4eP2FwzkZAmIR94a)_>cg{vxCfOU@=6GDiwM`-f;Rz6+7$ee^v&?@c%SXTXYT5qk0 zwdwW#Oim3G;4j@+5ZD(!Eg;dj83;Y7q}Tmp`meZ2HuqWbo%{}cV7ckqtiP*V9yUg& zyO+(D#(L#`T_|KM+BN5EdndmIvY^by9D*K}{jMTV*IXv&jb0=5nqW1AlF2n(&d7;(eH16NE3yA`6mMM3J-^VPnD8YWN#+ zGnV=8`Q}|m)Tp>(BK2s40+L5z6T489O$x78T;QlVzJgX*R9_nG@AFQW;0a!Rsky&B z1E!UYxy8ZqQ=XB#%*Jv@8*(ot*j}B~R`Xk6xdk{srT;4WmQbwy0-h1G-k*0j0gKdUdXL4QEtcnC8eL{24Fqt2%%UR|v1^EaDtWiMqw}=voUPv%s%NS} zt)?iQ@-v$+Ygb<))9e@&k_Nd0jt#jBt}eZ>s1_Xl&>04HSP#6YE!pOj2d{vIAf;v- z*qLaJUd!1SuL!rGjJFWIcmsv)bk7NmILHM=4I?8j%oVo%0x%^RPd|U-=u6i@b<4+j zZ1#Yl$wT^K$gnSSIF~HITbBXqbGW>AFfnM8Hcz(v1tQ%P$F{3A=ZaCjQV~q{47i}} z{z1mB5qRu)KEcPrW_Ii~DeWhaKDJ=(-T3jfz9oTMXTs$BQNf}!J|`f(&EZ34b~`=* zzNVc8eRBw`gLHb~8QY7*6>xu+TU_lgBUmrTb2^Ip>z|r6g8Vo#q%nuB!SKaWY=nH< z7u=5M9ee+^iPNc={*hCqMM&hV*h&(m;1@{o>+_i>d*r>+60m8eoUSywu>EfJFW`^V z!E4f=2^T8>6D|=|@*ltB+Sx=j!;w(7F`?CA9vpQ)pzEw}SzOeWt4?#Eo|Tme;b>5K zY_UF>)BI-mxKO;10cPH&Gu4qtZdkQ2#}jk3GtH12t@EgMdbb;jHbwe8D%9GWeTO0d zCP6fk;abUlYH#Nrk=_r6xZC)yHzVO)LkIVIvul>aPW{iUVSlx1UqvU&TB&zYO;)CT zcljUV!+Bb0g~pe z*UI*PIj7d;Wj}ff5%d$qoh&x$<)1YF;f0j;jCvHkir1QyhPYljAZKR??@fnExAh9z z`5Tf~0m&}ba%i0zprCec6@#oV{lo3i!&KYR*pC;Ecj=O3SIZ@~YS|YjPHkCgkO?(= zwftfP*-W~lxS^*nB_rMv9{InDhja8ImqR91>m(v0{yiC5+yjSUC6{FKHB)v2A zgL#v)VNZuKVNq-hEs)-L)v?vGw)Mtbp+s8~O4*@X|6ugaEM*%UPR&TJ!_ecqUe8Vc zNo=|eZtxr|`P|ITaqm0FFN{WsCq84qfj>XL-4h6R4AoMLs>?qVp7I5;h*nC#aPyRM zUEAdOVxP8bQRk&K+J3kbNwdS{)fcT%MWWght`c>sE@P@Cl!`LKo5#AqK=f%-hX2sF zzaR=-{>~3gX$1;%NdZHO+A5(~jn#2uFbs5~+Hoj>_t`;qdJoY^wJRNGhbS8>p~w&%*Fbb2{gS6vMHiN@b0 zJJ#L|+}(ZdTsA(>&;|b}LFG8(QEK+u8&5yh!9>6cGXJQ^)w{geZ=8{AjV1({7>=ds zP3X}2nPaD?ifd|RAp4QV4$f-+`PuTmm#!J3G*Mqc#{E_Dcykrc)=O!v6ONSZt0?I{q_UcwIq1jLgx=&pD7?sAN4U<#j38Tc0gh0iai z%?6fK|7{PhniSWbdLay7zwM)GEOB&YImyyS=;YkIDkhubPWw!oW!M;J%s4ExQ&bD+ zS{hTh_fTC$usgzG#(-h#Q3{4_3hozpj7jhs1QkG2>ppPI-f>#F9f?oNHHCW6X3p*Q zH7QaNd@Pi&e}>s#8an2c$`Ed8!^Xh^>btJbblBC&$g|J;ooTi-Qs#jWzWoZX%?Vc) z*7?Y0+Fs4h1#~K;^e}B~!ZBz&QZw7bl@KX_2cHfXzts%HjTE%0E9nhy0=nv$zEI6P z5v*!`rYKtfWXd^mfG_qNZTBh+czP=(uRgSAR_HdA9MD07GVDZOy2e935R;1#zwc6v zM(g7(e?Q{YvNN^G=0Cf)=;;+g9K+)^MJ28n5xgIJ$t!wr<0s&24a@GDK2lvXzT8bRGwpK{51G3q2}Nm6 zw?h#k%8SP7OxX-(E*=q1*@+t|N40OXp&s1pw3B;7R>yTcwy0VvCj-oW(nG9nXOpGj zj|XjTo-HjH*wPr4Nj(^wf#6rSjCAt(3Zl;>NGLO3kYVw9T&qH!ql*8iCZgj!K(b?%*gE%N~vRMjR5hnfb+i zF|*Bs1DnkIj~OFf${Sg%#pb+<9DOh4#%?S z8YC-u8M`7)W=}^ zZxshZU=vy=x+I0f*R)fZnBA?drDY>UT4;O9BcCT<&nT29N%)Pu(X|nO3kKmV4>zB_0{GUi6mdeJ0jP# z780}%XeR@jYNilp+8SiSJAEmd;_@5G+t?hUZV{vh2r@w0``Lf!}DH`QOmSGM}S8h|?rkB|?) zU#tEg8SfY$K2-0I5r2$tZM)C%wU$3PWSshA>Xmk$W#p32>~aQ8`NZY z*Eh?FM{{GxIw7=s4%C2`7YXPVKWI^w`1xOgmrT<~COMQ3{S*%+yu;iQy41Rube}lM zo7wBbN3VkVKDMX6_z`fjLtn-|(^$+jfdA2Q1qQz`6FZfW`X%<#PkfoR-I3`AD_2z! zJJ#-bqkV52Z2yZLqw}QT>Sz!{k&mjDeUYX!5gsj)H4K*0x!=~KgzYF+S{X(|ZzLcg zI!Y?%Q1#`ZYPdDth+1y(IDsRsbNuh zLY-49faT93u)9$8*3sJy^ocdd zZvDpHYWX)~ZlNv5RYpnoFzx(x#O$3YlSlLnxK!~P?+v8vQzzgu?=fF);Bzr63Bm4( z4c8m0!*51HSj!H4w;u}siet(Uyh|OEjowl2x$2y8g!7j7^F_JQ<0=`a-lxax6KcbK z(2sLNTajnti6$n|t27JF)l;92(g<)TLY9k3l59hj9u>j%9*y3Bke7nIEC!&;9lkBQ zVkTg*y2QI;`4n7Q@8)pE&f@NN{ns23veZt4#*JMBgm%O9Kf#VkAG6DKbx-6l;9xd! zW_*26E3TKKaxq#0Yx6&O?{;;I0sE9z*d9$kS+YD$Y>+0zB6an+3qP3gfZFr`x6~X3 z#D25rqU%+h2H6oC#@atIf%2B;+#N;63d?34YHS(xR!i-de~_ZkC39Ik_X}%!IRHs3PEbQPnRjpuv6zX%QmoN!r_9$k-1~c#EcV-C>;7yAd{?2S!%3xy zU4Ny#NX-39;03m8XF1EhG1iW|{fFX83*(_;6=OcXi+syI;buOYEGmBXQ!6=v3qi^D zqd}(d@`KIKaS<;buW}TFmVOHHwJ28VdxUI#JQlEunmK~?u|QGv8H1P6HH+1xci7$Y zY&0i*BUVcd!vMSS$_!S%^hZHEPp}&C@~~DGNy%QNtdoRIfzK)-OF04NRk_oHmW=qp zR0%A@oM=gZ>;NDw$_kiu)w3gTI>@)@w!-HSJTG=^?w*Z5Ja0SN6Q26LZ4|O4Q{67{{_a625m-y6dOFj&pIbBx?ooZH*5!D6ihR5sX0ND4jl-`NC9LrX@b~7{U+&j1S zDq^9jj<*AtO;Bw}s+|hD9Ag|R*YPa7TAyndnm+Y4U5d8X0ER5bv}b{GCYrWE?f)?GiEEeesEf+E?Wp2H2uq0vY^e1!m;SUrb zaZvz9aLVPM&j+1uL&T1maGSDWVm~UC3T~~knK)AqE(`?w@O_e+?=nXL@} zzH%8%)QWK9e)r{n;k}xouLcE)4iXEO1O zJ%hOLtRhe8Q5!u-URO%eUY@uNYPY$UThHcOIwks?bv8YEwUW&sP2BYnsjB|%JtGj+ zvADO!+Z~LYQVp(l{_dz~&cU=XL6`j^|J`WPM-MG8I)Jvel*rr24%%%cGuI&Rt%>3# zhFWuEMsv>e03GH*adu9JZ(2R8?aDqf-%$#){EvLPG?*bn3T>C&BSf!~`UR?u1p5*^ zP>s({Isr=3SKf31JQd2){Z5!w>l#}N_gT@dWEsDK5q~*#|16Hi^xA>xC_hIZPn0Z_ zuxb?VGUJ@M5l+A|!#vcq=s(az_jl{5CyksH^N$FRaF6atgXNE3qZjSzy$dfBrSSGU z#1#*RSomADJXLJOzQdf}aIzTzy^CNx#SXB_TK?>Hr$DT$i280@1$q(bZ`!eQRx9+v zL17~@;+zFEJu_%>Fmr3%F~p}K1m~Z%3d#90q`BH72aD+)e?D&)UXAgE^&6anfmyP4 zMS(lMidPB(iSNqTBFI;@)RAtrPl}2Md`?m!zhbN{2+Rqd+BF!^q}z<7t4(68C=Oxw zWCdL=%O7wUhd--}>QS~`-1iOnq*NGvjp!4S)l_?a?>%;bafE(elP@(hhO-#hSSxd! zxy)+;XXfIV{DyFTYt*s4$0zq*(xD+8bdbOh*6j}D@Vh$-T(i3FV|+)fw+@?D?#l!k zxTGswCBIn63H}F~!bCGz$i}6l&peG`Ys~Mbte`m4!-?jhmN7NFd}&4lF#L8F4wR?W ziLxGQR&bgd>rr1PJ{PeFHrej>-^bjbE%IH)+1s5*Ni!M?&YyMA9L(Kx51rE;PnlPJ zaKEF}!eRiDN%J0?C44LMY`T+r3{J{P)V4zltLk$0NVBY=5AP~4AEKRZWKOSrsr|30U8&wp0=IyH< z0)ZRAg%nHcIKp3lPEe@z(*h?e80O|}|KOavd*AIAQ0cVrRDnn4?aMmOcf1+ax-Cozyr{TB&i# zVAD({g;l6Faa6;K=kRwS=29&EO(#Z;QVC_RC9NNnQtOxncCR~~NU2eQHn>Bqb!VBG z)#qzmc^_5YX*N-fU4-$<=)0}bL319Hd#ZRFHGX1Drc)zR?8!q4z{BrP8#R$Ef?9QP-+Y?p;hnyHW|&4%B{u!To<32d6{@l#_MyfDS?A*Lg4zean=&mr9WNaC#`c9g~p^>SC)^!!R=5_#|G zzE=~Le}5MXW-i4VRr+Dkv@&Dx>(JR1D#I)krw3>E!(rX(7-{Z6oenp!JVcHJZWtj2 zMLlfBZh8~KIKh0((kpi+*nOBYY$=Z>C2UgsjIY$=8carGb_{HOQ@)dol9mpx0CTSj zns=|VvU0DfQKAY%MnOHPE`ytQFY-d2O*kh~{@3-yyz3k1w{J*+%3klO8Vw=JI122k zVHt<#ZbA4JhSKwx@2R3_xR!qlZrG93_}6@u-u1+@pVo_Mv|Az;H?mwG<9ub!y?CYa zRm-JLNpiShTDM}ih2~*Z&PD@`Bae))ljN=<`M3?YC=z>d%o5i1hF19Wy$8=$?>#7* z%-`<)GsV>*hMiNWAbnD(^FPn{gPD_f6@%6cm=oXa|K-Tjk1M%&`wfJ<*VQsuwwK4pg`~&Mzwm z{v^z$Sfn83ux-D_%6vF}xrR%m{Lf4mE4ONQZm3hWaYYp}DAu2xx#w7cMr5Um<^oq@ zA{|&hUtmG3e*54E7oi*`mc8F2Tt5!5#64+&tI5I?i?$r$Viq`zy{9`&0m`a#q1p*6TQF{d!&uB~4CxbxX3Nqi8rvJS>pj{UDjHqI`v4q_hfxukM zzoqH;MXK!Kzk1X~PuVv2imFgMOWJ@Nm>t^Dpr^ReE!BRYytH>z0K zxPWpQb^6IJwGY2MzxAZ}wCLsR7{n1NXcrw_nIJ@{fXe_rPwo#5cD1T_L9_3kG z8PWbe+0I1&@x5mE%Rs|!b1K-RurkUSwOPWMx*h7W7cU|@vQH;_&GCQxb1K(p<1G#I zM&HZ$@^q0$@SDitHha?XhXnRqRf_RFfy*MraurK98qWeLN(#G+p7N?!6K2n|qe@MU zCsp=kk`EH&Auq z58w_*W}e#)$Jb{WC4NcMX2lQ1N0m%@ZhT}Hf8?dh4|5&k=@ofXzR$e(1};xy&+ULs zToYD|@%-+v8E{yV)*S7~VDonuE+3oH_yfoPJ?uHXz9$bnnHIL(ezuiohMwz8sYXv9 z=N^tM5;>m!kgrndGuUAbrJFKaJ~|VzTe8#aCxv@;*Kh{XO zCV$6Zbn5sTt@3Huj80)IhP1E=T&0p8Vh`gj;9ZRGAzbCF@!nA-yAQ7g3tv}RHKsEuEfVjC8at6~-E&9x32cKk zZ4}gos1jceTSi?>|HK?MOq4e2wZ@M72gRBVIq}=8yw5NlIXO%PLBkkQ#BD4Vswf&x zzP7`oN#V75S4Db14fpL3LGm=4;NSnOL4C+|~6M(S&z043)3XCN2E? z@#%_P1~<7EzfUn8^79Dizd9wy>#N^3ks(&h&j)b%P46VX6I=|6XP?8CvvUdD+*p)e zV?3YenaV>}nDcw;sr*(~3arELXh@{tDq03tkOvrF1=OCL+6zM}e+oBWIDtEQKk(9~G2R3C zVdWTy{L$P`7FhP+T53NWUw)y_e!HGr#709r(opSq;YxnfLct;2XA{JK$4f(1ehrs* zV7~(n(|1SqRAwg}_WVG0 z!U^Jek<;R9xWG2o;Xai{ z+{P8h|2>Kml{SViV6}FNk}8d?q$)duC*bG=f=(d%1OuHw!xLzD0#PR*vP)GgbGV4C zsw~*@1w6JZu9RFH1aI&jyMX~Pm@klG`d0-3)BXCpU-v_^(E>akkH_Qjcsw4D$K&yM zJe~>^t`L2{uhBy||1pCx?Wg^HJm88!QC&%FPKfyeWI&hM}xT8F{x&d<-4QU}@07@%P`)PH{bJe?tK6K$$~ zdzIby7Cg$caEe5wpFQ&mT}!~1!S>M{_XN%9YkrN8+SIxhuN$f72=>-xOeNMU?yjBY45jlegE-O>>lbQ zBhb(Q{Fq&Fc8&R&1{ICnqO{!f{i(P+h#{@aI6QNx~&SbDi&;jg)kzev47xG5cRW_$sz3eGIW; zCr(p!sd#fGZ!nY79!6UC1MC(W#gF-UioC(2>^kK8E9@4NU1v-DP08)=$n!nL_MpL5 zbG&3RB_)6IqmI3g+!`WzQj$2kK4jNjmYZ^Z+suxprR))>8N-(O4d-DGt3z>|;R;z> zNp-&;D22w^E1OYW|J6rw<%H>djFw0TxYHZpYDoAVmfUI3pfYI3O~aar0fz}1{52W| z!iqG@>63CiK~Z@nU5#dRg`8`?(mlqalE&w#vUPR0tZo7{*ZJ02e2s&otaHZr?F^WBu(PWetV?2z4Q zL?^S0Ot6^!PMtW!|0VMBi@6$>(xh2x!10^{mF*#>+PM?|fa46DVXs1XhFk()Ye3_Bwb zKOye~-yrW4(ji=P&Y-^2z2P`1?mnvDmrN^Fj4hWetT++zHFepfN^nLKBBr zG(Y=jhrwc551o91^Y;zQmHW?Y*!rdX4A72N)aG^#(QWIwk9|HyYK z<385I@V$+t5~65rJVNz*nsmTvje8Srm;kFW;_y^5Kw+ldnFj-Oh{NWNs@#-MsZ$(_ln+?y~?IE~eyaBn!B81+^}P>O$w)&Ima zMy{my_%3mZ@*8Y-v2ATOQqsBNqzj7@pcz)pF7{ldG5?-SGT9@v$1Kc@zrT2ND*K)XRi>N#@UG;IAnb>iu4wrpbKcT)5H+v5-K-riF)wWp9~ zO4NH~{`GdRa#s7pg_sx3C`=VDo|NM-lgZS)dwY-#0QYEcm|wqMe9^IjYQDRj;u-8a z%u9BYj!KFf!G_1ytg5>a%YMzj z=}v=VQWJMocq)I0y!=!K&A%mXpnA|s_J|&Sr?ergwdtEk=zirZQOJz%qh!7 zHECms`&LotnE9r9bt_Km|9oTS3i@u+X4LMQK8o)`)Yu8Ef@*f3@HJq0@*g{LC$I}J z8n%N75sITbJsbW#aPAt#zujsS7dsN?w{hZ&YSMKHYSJjz!7=L1LhZycEu~kUQQdf? z&dd_os`?fA5Je>-#XEEI6|wv=ii2l_V%?O}HYl#lfKxIOJx``$L6!1llpR!N`1<5|Mmdv{66=3DftNau@0 zdrjfll#Q_}cYYqExK;T#Dus_P){3)RIx&$vH;0Wk*n3vOeTOB;in!7(XP)cN&Xx4; zgU2bh04++Hci)ZiX(R7I9#3ohOxhlr1z*GC=@_r1?V(w44<1j)?0WC6$K%YyV9l`V0)QftJ8>qn!*v&hsLSH}l>wN3p7G_%`U)0c+z!d5LSBGqMq)tTxQ;b|W zX>&Jy$=}D-660#nSpSeNs=F9=KXOG8Nu*168-U&%P=Kh}rS_x}>2J0j$r{=DRV!tT;QLq{fdo(C)^hiHvZJkymL z@JHCw2}Hq&&`CQ+@f_K5o?Kaa9y{swVb7A)75N>(9zqs6;XP>B3DxaKD zES$4{6$k8>HpJ`3opSu4lkXEp{+wk4ES^m)Wsvr1T4P8{;j8i*ab7fRpNUI(KXJm3 zQLO*V_&fhQX)jHar9$caKW{SlH2IwG5$x#!(pd8CBS9m%fi>@*^8Ewf11uit;SwW1 z`Xfd&26m<=-k^96uXf@y&hHRK6L!M!d}zp16(c7fa*xpNwV+AH)VNc*5){AlrFck* zG`mT>PfKCPuru~utWV(NC4jB#rZ`P0ETQQizb$b47!(iD3Xz+6a(Y9#=Cs5DDP=;r81cc2)T{4_R$ zX5M~9d}evj%h@o%qEh#rc## z$YK~R0LbW{An#nVEHCDkpi6gY+=%ZXimQKZM|PRTS3yifH@{KKc-#S~$^<@k@+EgM z_1nZP=iClUenV7$^dRMzOH6yo$8*Oo!gio?hsf(NX1CbM%YG?;?z1lCg`NxTzLl9& zrP*kq(pAla)krVKO7)Uz&kKWYpvIsIH~gCxKxm~MzCiF z({qD(o0`)q8-VDIGfbh)_MlCCF!&mt3|Fu&bqyP_66{=ZVsK;>1IB zL`q7FU`L#%ekl(I)@1Et(d0gG(v-GMIi2HDzA2xwK_f(74*~3-koGxz%=vlBaz`vn zzsCw4L;q7+3iYZ{C`Iz&`?q_znS}6X9PJ8H7K8Q&Wq%TQbJyd!=6EIT7BY3j45iWj zx^B++6p3KX&=5BWzq;Ek^qzBoUpw;;c&=&W9C`%_~j6~mN)lW7qlVH(*2?MWbo2FP}OkMoz@X7hbGh0uJrkvIHP?kD;#GUEZxXd%m``aNwtPV zdpzC(^Vso;&u*X%mLDR2no~H#b-6!a8Ft=JxxF&VjoP2+`BihpMwA<)z8=mXl8mnZ zbFNkB7pMo?@qeL7RvsyW6rwnfO`^Gw5)Ov&$4pz;oP*8MV%agbNp7Px1T23a<*){h z;64+I^BXM3p6nt*9*^i(IA7$xgx4ie1Eoe)d%wj3dXsukkw+`E0#gy(iOjgnkTaeQPxQ=3$CUoN>Y1?I_aBfONdD_ z?%cq@$6}o}!BF0#R;pB-q8g+f7I|e@BSy%SpKy{m{mpE{U6~Tjn5ic-DU4~`Y`@A+ z>*N#{X@C50tQ;|h)8^sEFy=c|DFs^pDSM{1FH+{(GX}uFwV!NoAv65Mnf_jWI5bPH+y;81-6i z@F7tC`rUo?OlTC{5mm-Bcr+ckm$A@#^N-!F4u7g6@X}?5#OXN(INK+r3;}Ace|+p$ zXvHNdXXaPT_mUnwYB()Yp-um_Po$n0_>|C&VRKp?IMP*tI{{s7%Dp0NrZ7{7WL%hwz*ex1Cc@1PLfQ|K0MX;9*B_n zsejAJf(F*_T;eiCbXK`O#XR&Pwtq0tP18m82_PBP$0Wa!B0rCjDTh3P*elO*-v-Nw zS>77wEtVmXDP18mUX{NJlvGQW%LH+bN4LP^IbkAGY0O^&l;w&+JfXpb?<*~kO;>n{rDYwJz zZBH)2`iuTrLu3)I&}&l|J?AO7AjoUxTjR2gYyssFB!2Q$LE(V-7wh5kHYX*_hErI_1e<{Z2}i&B#`o>!aV#9a+dI^WPiR0 zE=<}g$b7bnx70z_Y|y4rsV^TTL5=bSCNk4nB o^a)RKu?X?;po<0#8Z^k^f6ev0%ODbaAOHXW07*qoM6N<$f`~Bh `
{ type: inputType, attributes, required: options.required, - value: typeof options.value !== 'undefined' ? options.value : randomString(getRandomInt(3, 8)), + value: typeof options.value !== 'undefined' ? options.value : randomString(randomInt(3, 8)), }; switch (inputType) { @@ -222,7 +222,7 @@ export const randomFormElements = (count, theme, rand) => { export const randomDropdownFilter = (filterType, numOfOptions, theme, rand, itr) => { const filterOptions = { - filter_text: `Filter text ${itr + 1}${rand ? ` ${randomString(getRandomInt(2, 5))}` : ''}`, + filter_text: `Filter text ${itr + 1}${rand ? ` ${randomString(randomInt(2, 5))}` : ''}`, filter_group: 'filter_group', options_title: Math.round(Math.random()) ? 'Options title (optional)' : '', }; @@ -233,9 +233,9 @@ export const randomDropdownFilter = (filterType, numOfOptions, theme, rand, itr) required: false, description: false, attributes: '', - value: randomString(getRandomInt(1, 8)), + value: randomString(randomInt(1, 8)), }; - options.attributes += filterType === 'radio' ? ` name="test_${itr}"` : ` name="${randomString(getRandomInt(3, 8))}"`; + options.attributes += filterType === 'radio' ? ` name="test_${itr}"` : ` name="${randomString(randomInt(3, 8))}"`; children.push(randomFormElement(filterType, options, theme, true, count++)); } @@ -253,8 +253,8 @@ export const randomOptions = (numOfOptions, optionType = 'option') => { const option = { type: optionType, selected: false, - label: optionType === 'optgroup' ? `Group ${i}` : randomString(getRandomInt(3, 8)), - value: randomString(getRandomInt(1, 8)), + label: optionType === 'optgroup' ? `Group ${i}` : randomString(randomInt(3, 8)), + value: randomString(randomInt(1, 8)), options: optionType === 'optgroup' ? randomOptions(numOfOptions) : null, }; options.push(option); diff --git a/docroot/themes/contrib/civictheme/civictheme_library/components/00-base/menu/menu.utils.js b/docroot/themes/contrib/civictheme/civictheme_library/components/00-base/menu/menu.utils.js index 3a28245fb..02c12d60d 100644 --- a/docroot/themes/contrib/civictheme/civictheme_library/components/00-base/menu/menu.utils.js +++ b/docroot/themes/contrib/civictheme/civictheme_library/components/00-base/menu/menu.utils.js @@ -7,28 +7,37 @@ /* eslint-disable camelcase */ import { boolean, number } from '@storybook/addon-knobs'; -import { getRandomBool } from '../base.stories'; +import { + randomBool, + randomUrl, +} from '../base.stories'; -export function generateMenuLinks(count, level, is_active_trail, title, title_prefix) { +export function generateMenuLinks(count, levels, isActiveTrail, title, titleCb, currentLevel, parents) { const links = []; - title_prefix = title_prefix || ''; - title = title_prefix + (title || 'Item '); - const active_trail_idx = is_active_trail ? Math.floor(Math.random() * count) : null; + currentLevel = currentLevel || 1; + parents = parents || []; + title = title || 'Item'; - for (let i = 0; i < count; i++) { + titleCb = typeof titleCb === 'function' ? titleCb : function (itemTitle, itemIndex, itemCurrentLevel, itemIsActiveTrail, itemParents) { + return `${itemTitle} ${itemParents.join('')}${itemIndex}`; + }; + + const active_trail_idx = isActiveTrail ? Math.floor(Math.random() * count) : null; + + for (let i = 1; i <= count; i++) { const link = { - title: `${title}${i + 1}`, - url: `http://example.com/${(Math.random() + 1).toString(36).substring(7)}`, + title: titleCb(title, i, currentLevel, isActiveTrail, parents), + url: randomUrl(), }; if (active_trail_idx === i) { link.in_active_trail = true; } - if (level > 1) { - link.below = generateMenuLinks(count, level - 1, active_trail_idx === i, link.title); - link.is_expanded = getRandomBool(0.5); + if (currentLevel < levels) { + link.below = generateMenuLinks(count, levels, active_trail_idx === i, title, titleCb, currentLevel + 1, parents.concat([i])); + link.is_expanded = randomBool(0.5); } links.push(link); @@ -37,9 +46,8 @@ export function generateMenuLinks(count, level, is_active_trail, title, title_pr return links; } -export default function getMenuLinks(knobTab, titlePrefix) { +export default function getMenuLinks(knobTab, titleCb) { const generalKnobTab = typeof knobTab === 'string' ? knobTab : 'General'; - titlePrefix = titlePrefix || null; const links_per_level = number( 'Links per level', @@ -65,5 +73,5 @@ export default function getMenuLinks(knobTab, titlePrefix) { ); const activeTrail = boolean('Show active trail (random)', false, generalKnobTab); - return generateMenuLinks(links_per_level, levels, activeTrail, null, titlePrefix); + return generateMenuLinks(links_per_level, levels, activeTrail, null, titleCb); } diff --git a/docroot/themes/contrib/civictheme/civictheme_library/components/01-atoms/select/select.stories.js b/docroot/themes/contrib/civictheme/civictheme_library/components/01-atoms/select/select.stories.js index f3ba2bdba..b2024dfc8 100644 --- a/docroot/themes/contrib/civictheme/civictheme_library/components/01-atoms/select/select.stories.js +++ b/docroot/themes/contrib/civictheme/civictheme_library/components/01-atoms/select/select.stories.js @@ -1,7 +1,7 @@ // phpcs:ignoreFile import { boolean, radios, text } from '@storybook/addon-knobs'; import CivicThemeSelect from './select.twig'; -import { randomOptions, getRandomInt } from '../../00-base/base.stories'; +import { randomOptions, randomInt } from '../../00-base/base.stories'; export default { title: 'Atoms/Forms/Select', @@ -12,7 +12,7 @@ export default { export const Select = (knobTab) => { const generalKnobTab = typeof knobTab === 'string' ? knobTab : 'General'; - const numOfOptions = getRandomInt(3, 5); + const numOfOptions = randomInt(3, 5); const generalKnobs = { theme: radios( diff --git a/docroot/themes/contrib/civictheme/civictheme_library/components/02-molecules/logo/logo.scss b/docroot/themes/contrib/civictheme/civictheme_library/components/02-molecules/logo/logo.scss index 24aa5a32f..80074f8b2 100644 --- a/docroot/themes/contrib/civictheme/civictheme_library/components/02-molecules/logo/logo.scss +++ b/docroot/themes/contrib/civictheme/civictheme_library/components/02-molecules/logo/logo.scss @@ -8,104 +8,88 @@ line-height: 0; img { + line-height: 0; flex: 1; - max-width: $ct-logo-image-width-mobile; - max-height: $ct-logo-image-height-mobile; + } + + #{$root}--mobile { + display: block; @include ct-breakpoint($ct-logo-breakpoint) { - max-width: $ct-logo-image-width-desktop; - max-height: $ct-logo-image-height-desktop; + display: none; } } - #{$root}__divider { - height: inherit; - margin: ct-spacing(); + #{$root}--desktop { + display: block; + + @include ct-breakpoint-upto($ct-logo-breakpoint) { + display: none; + } } - &.ct-theme-light { + &#{$root}--default { + padding-top: ct-spacing(2); + padding-bottom: ct-spacing(2); - #{$root}-type-inline { - &, - a { - display: flex; - flex-direction: row; - flex-wrap: nowrap; - align-items: center; - } - - #{$root}__divider { - border-left: ct-particle(0.125) solid $ct-logo-light-stripe-color; - } - - &#{$root}-dual { - &, - a { - align-items: unset; - } - - img { - max-width: $ct-logo-image-width-mobile * 0.5; - - @include ct-breakpoint('m') { - max-width: $ct-logo-image-width-desktop * 0.5; - } - } - } + &#{$root}--secondary { + display: none; } - #{$root}-type-stacked { - &, - a { - display: inline-block; - } + @include ct-breakpoint($ct-logo-breakpoint) { + max-width: $ct-logo-image-width-max-desktop * 2; + } - #{$root}--hr { - border: ct-particle(0.125) solid $ct-logo-light-stripe-color; - } + .ct-image { + width: 100%; + min-width: $ct-logo-image-width-min-mobile; + max-width: $ct-logo-image-width-max-mobile; } } - &.ct-theme-dark { + &#{$root}--inline { + display: flex; + align-items: center; + + @include ct-breakpoint($ct-logo-breakpoint) { + max-width: $ct-logo-image-width-max-desktop * 2; + } - #{$root}-type-inline { - &, - a { - display: flex; - flex-direction: row; - flex-wrap: nowrap; - align-items: center; - } - - #{$root}--hr { - border-left: ct-particle(0.125) solid $ct-logo-dark-stripe-color; - } - - &#{$root}-dual { - &, - a { - align-items: unset; - } - - img { - max-width: $ct-logo-image-width-mobile * 0.5; - - @include ct-breakpoint('m') { - max-width: $ct-logo-image-width-desktop * 0.5; - } - } - } + .ct-image { + width: 100%; + min-width: $ct-logo-image-width-min-desktop; + max-width: $ct-logo-image-width-max-desktop; } + } - #{$root}-type-stacked { - &, - a { - display: inline-block; - } + &#{$root}--stacked { + text-align: center; - #{$root}--hr { - border: ct-particle(0.125) solid $ct-logo-dark-stripe-color; - } + @include ct-breakpoint($ct-logo-breakpoint) { + max-width: $ct-logo-image-width-max-desktop * 2; + } + + .ct-image { + width: 100%; + min-width: $ct-logo-image-width-min-desktop; + max-width: $ct-logo-image-width-max-desktop; + } + + &#{$root}--secondary { + border-top-style: solid; + border-top-width: ct-particle(0.125); + } + } + + &.ct-theme-light { + &#{$root}--stacked { + border-top-color: $ct-logo-light-stripe-color; + } + } + + &.ct-theme-dark { + &#{$root}--stacked { + border-top-color: $ct-logo-dark-stripe-color; } } } diff --git a/docroot/themes/contrib/civictheme/civictheme_library/components/02-molecules/logo/logo.stories.js b/docroot/themes/contrib/civictheme/civictheme_library/components/02-molecules/logo/logo.stories.js index 639898ea5..29a8fac87 100644 --- a/docroot/themes/contrib/civictheme/civictheme_library/components/02-molecules/logo/logo.stories.js +++ b/docroot/themes/contrib/civictheme/civictheme_library/components/02-molecules/logo/logo.stories.js @@ -10,7 +10,7 @@ export default { }, }; -export const Logo = (knobTab) => { +export const Logo = (knobTab, doRender = true) => { const generalKnobTab = typeof knobTab === 'string' ? knobTab : 'General'; const generalKnobs = { @@ -28,7 +28,7 @@ export const Logo = (knobTab) => { url: text('Link', randomUrl(), generalKnobTab), title: text('Title', 'Logo title', generalKnobTab), attributes: text('Additional attributes', '', generalKnobTab), - modifier_class: `ct-logo-example story-wrapper-size--small ${text('Additional class', '', generalKnobTab)}`, + modifier_class: text('Additional class', '', generalKnobTab), }; generalKnobs.logos = generalKnobs.with_secondary_image ? { @@ -65,9 +65,7 @@ export const Logo = (knobTab) => { }, }; - const html = CivicThemeLogo({ + return doRender ? CivicThemeLogo({ ...generalKnobs, - }); - - return `${html}`; + }) : generalKnobs; }; diff --git a/docroot/themes/contrib/civictheme/civictheme_library/components/02-molecules/logo/logo.twig b/docroot/themes/contrib/civictheme/civictheme_library/components/02-molecules/logo/logo.twig index ac0b194e3..c5bda5108 100644 --- a/docroot/themes/contrib/civictheme/civictheme_library/components/02-molecules/logo/logo.twig +++ b/docroot/themes/contrib/civictheme/civictheme_library/components/02-molecules/logo/logo.twig @@ -7,7 +7,7 @@ * - theme: [string] Theme: light, dark. * - type: [string] Type: default, inline, stacked. * - logos: [object] Object with 'primary' and 'secondary' keys: - * - visibility_type: [object] Object with 'mobile' and 'desktop' keys: + * - breakpoint: [object] Object with 'mobile' and 'desktop' keys: * - src: [string] URL for the logo. * - alt: [string] Image alt text. * - url: [string] Optional URL that wraps the logo. @@ -18,64 +18,47 @@ #} {% set type = type in ['default', 'inline', 'stacked'] ? type : 'default' %} -{% set type_class = 'ct-logo-type-%s'|format(type|default('default')) %} +{% set type_class = 'ct-logo--%s'|format(type|default('default')) %} {% set theme_class = 'ct-theme-%s'|format(theme|default('light')) %} -{% set modifier_class = '%s %s'|format(theme_class, modifier_class|default('')) %} +{% set modifier_class = '%s %s %s'|format(theme_class, type_class, modifier_class|default('')) %} -{% if logos is not empty %} - {% set processed_logos = {} %} - {% for logo_type, logo_values in logos|reverse %} - {% for visibility_type, logo in logo_values %} - {% if visibility_type in processed_logos|keys %} - {% set processed_logos = processed_logos|merge({(visibility_type): processed_logos[(visibility_type)]|merge({(logo_type): logo})}) %} - {% else %} - {% set processed_logos = processed_logos|merge({(visibility_type): {(logo_type): logo}}) %} - {% endif %} - {% endfor %} - {% endfor %} - {% set logos = processed_logos %} -{% endif %} +{# {% if logos is not empty %} #} +{# {% set processed_logos = {} %} #} +{# {% for logo_type, logo_values in logos|reverse %} #} +{# {% for visibility_type, logo in logo_values %} #} +{# {% if visibility_type in processed_logos|keys %} #} +{# {% set processed_logos = processed_logos|merge({(visibility_type): processed_logos[(visibility_type)]|merge({(logo_type): logo})}) %} #} +{# {% else %} #} +{# {% set processed_logos = processed_logos|merge({(visibility_type): {(logo_type): logo}}) %} #} +{# {% endif %} #} +{# {% endfor %} #} +{# {% endfor %} #} +{# {% set logos = processed_logos %} #} +{# {% endif %} #} {% if logos is not empty %} - {% for visibility_type, logo_values in logos %} - {% set visibility_class = visibility_type == 'mobile' ? 'show-xxs hide-m' : 'hide-xxs show-m' %} - - {% set logo_class = logo_values|length > 1 ? 'ct-logo-dual' : '' %} - -