From 18706aa5ebeb5cbf49b93936ee606d34c96c2a4b Mon Sep 17 00:00:00 2001 From: Jani Kraner Date: Wed, 21 Feb 2024 13:36:54 +0000 Subject: [PATCH 1/6] Update SVG crown in the header Replace with the new Tudor crown --- lib/source/layouts/_header.erb | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/lib/source/layouts/_header.erb b/lib/source/layouts/_header.erb index 0493287f..9bb7bd0e 100644 --- a/lib/source/layouts/_header.erb +++ b/lib/source/layouts/_header.erb @@ -7,21 +7,19 @@ <% end %> <% if config[:tech_docs][:show_govuk_logo] %> - - + GOV.UK From 2b88e2e5cdbdd4b7b115dd7030fc924e495d091f Mon Sep 17 00:00:00 2001 From: Jani Kraner Date: Wed, 21 Feb 2024 13:37:20 +0000 Subject: [PATCH 2/6] Update favicon Replace with the Tudor crown from govuk-frontend assets --- lib/source/favicon.ico | Bin 4598 -> 14254 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/lib/source/favicon.ico b/lib/source/favicon.ico index da3760d3b661b46891cb92fc48f1f9f7b4cce929..20129a0bbab925707308d7681e4470f62a010b51 100644 GIT binary patch literal 14254 zcmeI0ziVVw6vt0+6|-0b3+spqTLxFH18O0Q5Lg9KSR?ocq_7pHv6Q5+m8215n>6I5enMr2Eci_%_@7{C1=jT1|y@}Y07h-2;C+BE&lPW~T1ub)NSPXqq^H0jHT zcOHKG?BV;d{l)hmKl}Z+lUJTUdGyO4KmHo=`41ocl&p_W?w@VHd$#@c(-#k(K01l` z?B&UKAb#-LSKlzlho5v)yz%zUyd}GDZkPKdPP;kwa}dvt>I$a0H;yp|8&d;$E~j~3 zr+I$6kv(FtZOBL-EHGQ^JkNi&iaKTAm}U>D4)*#8%vSx`ulisXUI(*9KXJnkM)t`r z4^o{ddU|@=?Q0!g*4TqbMBKp;UP~SodvYgxiMQKNF0*e-O?U12g%=sgg9WwZ z0Q(vFEa-IN6ZSKs6HNBGMhAmy*4RUrWbhwbzyd=&va6isyW&YqOF~8j9z*1NS_6Xt zCNwJs;=%5G9(Ml72K;0l|KL-u(Jz15g9ly+S!@D}bqLwgZ{6$ME6%LTChCZLc&H=p zMO?F{8ql8W0uvj=Bc1bR>F~ILfsZ~MS9wHs9{#+2;)@?GXGd7@B7>~fT4v;^Rfw5; za_aeL!GQ-EWNVmx81OrB-^U9sab|Gc$2SBMo1JF)P3}cp_vs&k35L#!&L4F}-7?%y z>DDa$@Q7bENsO>jnBr}j-A|ooQjEbYCU~;#Fin_ zeINgAtm_$v4P4)bj#-%0x%!OP|16ntFYY`~4KYua^%4J5?BzJjv8Deh-preS(OGF9UkV=&ghSOaUT0lu?%-{zf!_YuDPW_`ac+Oxm}Tkk*UT!kKgpVND#&wOL? zZL`SmZ#Bo%^(x*U`JZcDCdVJje(iTfr0td6$oi))4p*x@+Iv z>=AG2WQI@o<#)W+org6rAnh}w8$QLLjF0p7T~jL%|Dm7*dx!}=O}3G5XmW*ohAC(Fs3F19gq1@A(*=x0}l@Cm?;YXMH zCb=1^&vUBWg4b%xvV7{b(#?!bt+?fx5>Bf;eCPv*F+?}AH3Fwqzus>ghZBA7aT6u|AN#(OZ{oMIVo?0A+oUvAWOTL=@Wq&5; zC6#qhv;Qu7bj>zB+uT>Lq1xG{zMThu%lBEwTje!A@IFgTcz>Y728br INb8EgUlZ|}Qvd(} literal 4598 zcmc&%dr;146n?+%CG@$pwRDqpn~{ykrQJe>YQhdORzqtgOLmmY;-BSDv>Q8PGrP5` zrL3@0w6>CrE|YCB6iJy?gN7muBF>)Y=>4WK)oN#FdS~9><^0Zj&ikJ8oacO>QU+zF z92^|@ZlOjPlp3a#a(7q!?ye3xC>74K5iH|JmOyU7SEas|>zfO{VR()9R_<<|iip&@ z_zkMLxmiUok5LOF7O9MkBPwK8m`YCmNhN-}OV!oYtBQ(BRZ>!_PM!Kg`AzXx#?FRW zO-)U;htcSFW!;SMBBL?4JmqS2zR@u&XG__QDO+9s4z~N*$MsVGT~W@voSeP;d+taL zNgC_z5L^4>)gLMiMz^i|M>#day31NzI~i|I@!zkAlRM7*J7N5I3JwaQF>ck`j9T`n5^^ z{P}ar%gdwV$B)y^n>S7J+}vE+xN##@R#u8^*36j_gO2FMd6`p5c@ z{QT(IvuE`Eo;?&36GL-m&!*Yo;l#a*1`iq}YkkIzqZQH7@?2hCPQM;JD9@WWZKC1B zhRHK9clYjHnm%nBEsThu&zCKuv;zmI`QbzQVCYb(FT_CSU!V2x;luRm)hodr)-^RX znPOSOdH5zFfhJF$EV6z3_DOD#r{8mOWZ&?+ckf;*E-EsutGIH7qL(k1cf{+v-MeLv zz@he!vqvsoEIJ4F@24ZY4_nShIG??$s!D7(G&E3rd_2tv4i-Js!efqoU0t0CBZv)R z2i+GhUeMXIXUUIaidxLh%95JF;;8`v#M~?X!NKq!7#K*%PweW|QUmyo+&_5mKyrz? zfF5`uz~7&Ie0*eI@b5BsFwLJgkH)hMIuj>Olo;05)KLF^{RB%Nju}J95o&d;x3}ow z{H)(NZR%9Y;{7EjCzGd#hkS#bc*Z{l_TcX3CR~OZbsRX5s;jHz8!koX&IvDqC$SFv zr3dl|87A_Rk&!{!+1aAQTqXX&8G3xVW{pXI>5?TP{)=%2UPg_8TU}jTC?q6={6GF! zVi6h|O7A;6lXY7S0q?hN-IBFI99QjsH|Jgta2LzPe^OGC77N}Hd(ZCe2xm_|lMN{@i=HVn`>#su(s;=~Eb zwPjn+gDvD0Jw;;xacIwTs7?4s%sht-5uZ3S*1|vb4NPFKIb5sIL66n=!};1{;49`# z#7pA|@j)K$-@i}WwrwNqt?Jq}Q!LLh{@@Gv1!tg!QQxou+qnP2oTx`iN{YyE{m_MJ8pEJxY5epVj;PmPG6Fp=OgRg|0J54fhyql}5=^YQFMvkNn>(|S^mvGF1 zYdzxDt`+|r1BpMlrf;7C^h53=??y7G^29sOajI@}yv`{qGxX16a3z z>x}>A|Lwiv9kziJOmP0wr%#24(dWU*9j)m~rt{yGPDkGm=a>~MB<{F`G8aSEk#1Kq z?H}jr&a`3t0Q0C5UteG82at8g26Q$5Fb4>~cjvCLrtjTZt95xT`cIGk|78C?{r{V{ H&~xJ-O}#sY From 9c82da1a111efafc0c95ea0187a7457696aae5db Mon Sep 17 00:00:00 2001 From: Jani Kraner Date: Wed, 21 Feb 2024 14:49:19 +0000 Subject: [PATCH 3/6] Supress IE8 mixin deprecation warning --- lib/assets/stylesheets/_govuk_tech_docs.scss | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/lib/assets/stylesheets/_govuk_tech_docs.scss b/lib/assets/stylesheets/_govuk_tech_docs.scss index 3080ec35..8e1de93e 100644 --- a/lib/assets/stylesheets/_govuk_tech_docs.scss +++ b/lib/assets/stylesheets/_govuk_tech_docs.scss @@ -1,3 +1,10 @@ +// IE8 support is removed in govuk-frontend v5 +// but as we still use IE8 mixin and generate a +// separate stylesheet, we'll supress the warning for now +// https://frontend.design-system.service.gov.uk/sass-api-reference/#govuk-suppressed-warnings +$govuk-suppressed-warnings: ( + ie8 +); $govuk-assets-path: "/assets/govuk/assets/" !default; // Include only the bits of GOV.UK Frontend we need From 8622d62082c2af01fa80374cf106098150f9065e Mon Sep 17 00:00:00 2001 From: Jani Kraner Date: Wed, 21 Feb 2024 14:55:12 +0000 Subject: [PATCH 4/6] Adjust Tudor Crown alignment manual Tudor Crown spacing adjustment from govuk-frontend 4.8 --- lib/assets/stylesheets/_govuk_tech_docs.scss | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/assets/stylesheets/_govuk_tech_docs.scss b/lib/assets/stylesheets/_govuk_tech_docs.scss index 8e1de93e..4006d118 100644 --- a/lib/assets/stylesheets/_govuk_tech_docs.scss +++ b/lib/assets/stylesheets/_govuk_tech_docs.scss @@ -27,3 +27,9 @@ $govuk-new-link-styles: true; @import "core"; @import "vendor/fixedsticky"; + +// manual Tudor Crown spacing adjustment from govuk-frontend 4.8 +.govuk-header__logotype-crown[width="32"] { + top: -3px; + margin-right: 2px; +} From bf5e01c293bcd7af7bd18950bb70541f07c6e7fa Mon Sep 17 00:00:00 2001 From: Jani Kraner Date: Wed, 21 Feb 2024 14:57:26 +0000 Subject: [PATCH 5/6] Upgrade govuk-frontend to v4.7 V4.8 contains SCSS source maps which the compiler here bundles in and then fails to import any other styles, resulting in a visually broken site Solution for now is to bring in v4.7 and the minor crown svg alignment --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 60d5b363..f656391b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7,7 +7,7 @@ "name": "tech-docs-gem", "license": "MIT", "dependencies": { - "govuk-frontend": "^4.4.1" + "govuk-frontend": "~4.7.0" }, "devDependencies": { "standard": "^14.3.4" @@ -1053,9 +1053,9 @@ } }, "node_modules/govuk-frontend": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/govuk-frontend/-/govuk-frontend-4.4.1.tgz", - "integrity": "sha512-Jm1LUWiH9vy47b6HSH/ksSb4ueBrtTTgyLBk+3X2qqAmmFUc1AXWLSYHid07YYu1tvn9RnodWk5Bac5Ywqk6tA==", + "version": "4.7.0", + "resolved": "https://registry.npmjs.org/govuk-frontend/-/govuk-frontend-4.7.0.tgz", + "integrity": "sha512-0OsdCusF5qvLWwKziU8zqxiC0nq6WP0ZQuw51ymZ/1V0tO71oIKMlSLN2S9bm8RcEGSoidPt2A34gKxePrLjvg==", "engines": { "node": ">= 4.2.0" } @@ -3508,9 +3508,9 @@ } }, "govuk-frontend": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/govuk-frontend/-/govuk-frontend-4.4.1.tgz", - "integrity": "sha512-Jm1LUWiH9vy47b6HSH/ksSb4ueBrtTTgyLBk+3X2qqAmmFUc1AXWLSYHid07YYu1tvn9RnodWk5Bac5Ywqk6tA==" + "version": "4.7.0", + "resolved": "https://registry.npmjs.org/govuk-frontend/-/govuk-frontend-4.7.0.tgz", + "integrity": "sha512-0OsdCusF5qvLWwKziU8zqxiC0nq6WP0ZQuw51ymZ/1V0tO71oIKMlSLN2S9bm8RcEGSoidPt2A34gKxePrLjvg==" }, "graceful-fs": { "version": "4.2.6", diff --git a/package.json b/package.json index 63ed809a..7326e95c 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "lint": "standard" }, "dependencies": { - "govuk-frontend": "^4.4.1" + "govuk-frontend": "~4.7.0" }, "devDependencies": { "standard": "^14.3.4" From 5bbf88d9d6b9ccc0187672e7310ef36442de0785 Mon Sep 17 00:00:00 2001 From: Jani Kraner Date: Wed, 21 Feb 2024 15:24:14 +0000 Subject: [PATCH 6/6] Update CHANGELOG --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b781e661..5f0b831e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,14 @@ ## Unreleased +### New features + +- Update the Crown logo and govuk-frontend + + See [pull request #344: Upgrade govuk-frontend and the crown logo](https://github.com/alphagov/tech-docs-gem/pull/344) for more details. + +https://github.com/alphagov/tech-docs-gem/pull/344 + ## 3.4.0 ### New features