From 06b5c5493fb468d0691d8893b1106ffdbe50c4a7 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 13 Apr 2022 23:17:36 +0000 Subject: [PATCH 1/3] Update dependency vanilla-framework to v3 --- package.json | 2 +- yarn.lock | 86 +++++++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 83 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index f91f9478..9644f0bd 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,7 @@ "postcss": "8.4.6", "postcss-cli": "9.1.0", "sass": "1.49.7", - "vanilla-framework": "2.37.1", + "vanilla-framework": "3.2.0", "venobox": "2.0.4" } } diff --git a/yarn.lock b/yarn.lock index 55d77066..29d18471 100644 --- a/yarn.lock +++ b/yarn.lock @@ -196,6 +196,11 @@ resolved "https://registry.yarnpkg.com/@canonical/cookie-policy/-/cookie-policy-3.3.0.tgz#99df0aad2bf01c43e0a6d524b062ebc6066a3121" integrity sha512-G4u2dr04t138BoIsdbnVsL5i2vBl3supgqkAG03AfvAIbbkt1QlIlodGtrv0s3sczmUTEiSNfmT3iC70GY0Suw== +"@canonical/cookie-policy@3.4.0": + version "3.4.0" + resolved "https://registry.yarnpkg.com/@canonical/cookie-policy/-/cookie-policy-3.4.0.tgz#0d6708da340df5867fd2cc9dbd95538c46f20cf8" + integrity sha512-cdVqxQmGu+j+Q86UobihWWVFzGzHlekFeMFxlbRpm+yqxEOUCrLkA9/t/RsMfLNDToP2ECPgsMbS20aPlA2tIg== + "@canonical/discourse-rad-parser@1.0.1": version "1.0.1" resolved "https://registry.yarnpkg.com/@canonical/discourse-rad-parser/-/discourse-rad-parser-1.0.1.tgz#a46bc527bdd07bbab5fc5a44f7620744723222e7" @@ -358,6 +363,18 @@ autoprefixer@10.4.2: picocolors "^1.0.0" postcss-value-parser "^4.2.0" +autoprefixer@10.4.4: + version "10.4.4" + resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.4.tgz#3e85a245b32da876a893d3ac2ea19f01e7ea5a1e" + integrity sha512-Tm8JxsB286VweiZ5F0anmbyGiNI3v3wGv3mz9W+cxEDYB/6jbnj6GM9H9mK3wIL8ftgl+C07Lcwb8PG5PCCPzA== + dependencies: + browserslist "^4.20.2" + caniuse-lite "^1.0.30001317" + fraction.js "^4.2.0" + normalize-range "^0.1.2" + picocolors "^1.0.0" + postcss-value-parser "^4.2.0" + autoprefixer@^9.8.6: version "9.8.6" resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.8.6.tgz#3b73594ca1bf9266320c5acf1588d74dea74210f" @@ -428,6 +445,17 @@ browserslist@^4.19.1: node-releases "^2.0.1" picocolors "^1.0.0" +browserslist@^4.20.2: + version "4.20.2" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.20.2.tgz#567b41508757ecd904dab4d1c646c612cd3d4f88" + integrity sha512-CQOBCqp/9pDvDbx3xfMi+86pr4KXIf2FDkTTdeuYw8OxS9t898LA1Khq57gtufFILXpfgsSx5woNgsBgvGjpsA== + dependencies: + caniuse-lite "^1.0.30001317" + electron-to-chromium "^1.4.84" + escalade "^3.1.1" + node-releases "^2.0.2" + picocolors "^1.0.0" + callsites@^3.0.0: version "3.1.0" resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73" @@ -457,6 +485,11 @@ caniuse-lite@^1.0.30001286, caniuse-lite@^1.0.30001297: resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001311.tgz#682ef3f4e617f1a177ad943de59775ed3032e511" integrity sha512-mleTFtFKfykEeW34EyfhGIFjGCqzhh38Y0LhdQ9aWF+HorZTtdgKV/1hEE0NlFkG2ubvisPV6l400tlbPys98A== +caniuse-lite@^1.0.30001317: + version "1.0.30001331" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001331.tgz#41048f2a5cf0c3c6198f40207cd323388b3d4399" + integrity sha512-Y1xk6paHpUXKP/P6YjQv1xqyTbgAP05ycHBcRdQjTcyXlWol868sJJPlmk5ylOekw2BrucWes5jk+LvVd7WZ5Q== + chalk@^2.0.0, chalk@^2.4.2: version "2.4.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" @@ -682,6 +715,11 @@ electron-to-chromium@^1.4.17: resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.68.tgz#d79447b6bd1bec9183f166bb33d4bef0d5e4e568" integrity sha512-cId+QwWrV8R1UawO6b9BR1hnkJ4EJPCPAr4h315vliHUtVUJDk39Sg1PMNnaWKfj5x+93ssjeJ9LKL6r8LaMiA== +electron-to-chromium@^1.4.84: + version "1.4.107" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.107.tgz#564257014ab14033b4403a309c813123c58a3fb9" + integrity sha512-Huen6taaVrUrSy8o7mGStByba8PfOWWluHNxSHGBrCgEdFVLtvdQDBr9LBCF9Uci8SYxh28QNNMO0oC17wbGAg== + emoji-regex@^8.0.0: version "8.0.0" resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" @@ -811,6 +849,11 @@ fraction.js@^4.1.2: resolved "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.1.3.tgz#be65b0f20762ef27e1e793860bc2dfb716e99e65" integrity sha512-pUHWWt6vHzZZiQJcM6S/0PXfS+g6FM4BF5rj9wZyreivhQPdsh5PpE25VtSNxq80wHS5RfY51Ii+8Z0Zl/pmzg== +fraction.js@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.2.0.tgz#448e5109a313a3527f5a3ab2119ec4cf0e0e2950" + integrity sha512-MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA== + fs-extra@^10.0.0: version "10.0.0" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.0.0.tgz#9ff61b655dde53fb34a82df84bb214ce802e17c1" @@ -1405,6 +1448,11 @@ nanoid@^3.2.0: resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.2.0.tgz#62667522da6673971cca916a6d3eff3f415ff80c" integrity sha512-fmsZYa9lpn69Ad5eDn7FMcnnSR+8R34W9qJEijxYhTbfOWzr22n1QxCMzXLK+ODyW2973V3Fux959iQoUxzUIA== +nanoid@^3.3.1: + version "3.3.2" + resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.2.tgz#c89622fafb4381cd221421c69ec58547a1eec557" + integrity sha512-CuHBogktKwpm5g2sRgv83jEy2ijFzBwMoYA60orPDR7ynsLijJDqgsi4RDGj3OJpy3Ieb+LYwiRmIOGyytgITA== + node-releases@^1.1.71: version "1.1.73" resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.73.tgz#dd4e81ddd5277ff846b80b52bb40c49edf7a7b20" @@ -1415,6 +1463,11 @@ node-releases@^2.0.1: resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.2.tgz#7139fe71e2f4f11b47d4d2986aaf8c48699e0c01" integrity sha512-XxYDdcQ6eKqp/YjI+tb2C5WM2LgjnZrfYg4vgQt49EK268b6gYCHsBLrK2qvJo4FmCtqmKezb0WZFK4fkrZNsg== +node-releases@^2.0.2: + version "2.0.3" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.3.tgz#225ee7488e4a5e636da8da52854844f9d716ca96" + integrity sha512-maHFz6OLqYxz+VQyCAtA3PTX4UP/53pa05fyDNc9CwjvJ0yEh6+xBwKsgCxMNhS8taUKBFYxfuiaD9U/55iFaw== + normalize-package-data@^2.5.0: version "2.5.0" resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8" @@ -1671,6 +1724,15 @@ postcss-value-parser@^4.2.0: resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514" integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ== +postcss@8.4.12: + version "8.4.12" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.12.tgz#1e7de78733b28970fa4743f7da6f3763648b1905" + integrity sha512-lg6eITwYe9v6Hr5CncVbK70SoioNQIq81nsaG86ev5hAidQvmOeETBqs7jm43K2F5/Ley3ytDtriImV6TpNiSg== + dependencies: + nanoid "^3.3.1" + picocolors "^1.0.0" + source-map-js "^1.0.2" + postcss@8.4.6: version "8.4.6" resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.6.tgz#c5ff3c3c457a23864f32cb45ac9b741498a09ae1" @@ -1849,6 +1911,15 @@ safe-buffer@~5.2.0: resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.0.tgz#b74daec49b1148f88c64b68d49b1e815c1f2f519" integrity sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg== +sass@1.49.11: + version "1.49.11" + resolved "https://registry.yarnpkg.com/sass/-/sass-1.49.11.tgz#1ffeb77faeed8b806a2a1e021d7c9fd3fc322cb7" + integrity sha512-wvS/geXgHUGs6A/4ud5BFIWKO1nKd7wYIGimDk4q4GFkJicILActpv9ueMT4eRGSsp1BdKHuw1WwAHXbhsJELQ== + dependencies: + chokidar ">=3.0.0 <4.0.0" + immutable "^4.0.0" + source-map-js ">=0.6.2 <2.0.0" + sass@1.49.7: version "1.49.7" resolved "https://registry.yarnpkg.com/sass/-/sass-1.49.7.tgz#22a86a50552b9b11f71404dfad1b9ff44c6b0c49" @@ -2229,10 +2300,17 @@ vanilla-framework@2.25.1: resolved "https://registry.yarnpkg.com/vanilla-framework/-/vanilla-framework-2.25.1.tgz#fb3a30bc832d1ffc3b1b909a87dbe8f7a03b8618" integrity sha512-jZeyUsjNqUI9LW5A5UUS8X/asMOlKwMbD/HoSnxegAUH0fil7XUzB+F1A1IqRSGdgonWxFehAZA2qIzmKtOnIA== -vanilla-framework@2.37.1: - version "2.37.1" - resolved "https://registry.yarnpkg.com/vanilla-framework/-/vanilla-framework-2.37.1.tgz#4063fb21aa3b9c99e0ada4a052326b24df1ee06e" - integrity sha512-GEV/9BHfGnCeTpycdrT976uX0WGdKHnDOAwtaTuZZW6zwM+M/Za+E2q0yTpvoldzWtpksiFIIAk2VCuKjfjaqA== +vanilla-framework@3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/vanilla-framework/-/vanilla-framework-3.2.0.tgz#179f19fed3c3e90e09d7b351d6a4d8f576654988" + integrity sha512-o9TJDDSpjdJ85OKBueJnn27KRUgNQWi1F3BtKQPpV0yVrzVtbz3PnVt/KUqHlpQcncf8OCIrAvV628rDa0mUmg== + dependencies: + "@canonical/cookie-policy" "3.4.0" + "@canonical/latest-news" "1.3.0" + autoprefixer "10.4.4" + postcss "8.4.12" + postcss-cli "9.1.0" + sass "1.49.11" venobox@2.0.4: version "2.0.4" From 06e3d3a6366491f7603c105204c5030a348e28c1 Mon Sep 17 00:00:00 2001 From: Huw Wilkins Date: Thu, 14 Apr 2022 10:08:16 +1000 Subject: [PATCH 2/3] Update to work with Vanilla v3. --- static/sass/_layout_docs.scss | 2 +- static/sass/_patterns_contact-modal.scss | 12 ++--- static/sass/_patterns_lists.scss | 2 +- static/sass/_patterns_modal.scss | 2 +- static/sass/_patterns_sidenav.scss | 4 +- static/sass/_patterns_takeunders.scss | 6 +-- static/sass/_patterns_tutorials.scss | 4 +- static/sass/main.scss | 12 ++--- templates/500.html | 2 +- templates/blog/index.html | 8 +-- templates/contact-us.html | 4 +- templates/docs/document.html | 2 +- templates/docs/search.html | 4 +- templates/how-it-works.html | 14 +++--- templates/includes/footer.html | 40 +++++++++++---- templates/includes/header.html | 38 +++++++------- templates/index.html | 64 ++++++++++++------------ templates/thank-you.html | 8 +-- templates/tour.html | 8 +-- templates/tutorials/index.html | 12 ++--- templates/tutorials/tutorial.html | 22 ++++---- webapp/doc_parser.py | 4 +- 22 files changed, 147 insertions(+), 127 deletions(-) diff --git a/static/sass/_layout_docs.scss b/static/sass/_layout_docs.scss index 388c20f9..a6747a3a 100644 --- a/static/sass/_layout_docs.scss +++ b/static/sass/_layout_docs.scss @@ -69,7 +69,7 @@ padding: 0 $sp-xxx-large; @media only screen and (max-width: $breakpoint-navigation-threshold) { - padding-left: $sph-outer--large; + padding-left: $sph--large + $sph--small; } } diff --git a/static/sass/_patterns_contact-modal.scss b/static/sass/_patterns_contact-modal.scss index f67ded91..e3da0365 100644 --- a/static/sass/_patterns_contact-modal.scss +++ b/static/sass/_patterns_contact-modal.scss @@ -14,19 +14,19 @@ .p-modal__dialog { margin-bottom: 0; - @media (min-width: $breakpoint-medium + 100px) { - max-width: $breakpoint-medium; - min-width: $breakpoint-medium; + @media (min-width: $breakpoint-large + 100px) { + max-width: $breakpoint-large; + min-width: $breakpoint-large; } } .p-modal__header { border-bottom: 1px solid $color-mid-light; - margin-bottom: $spv-inner--large; + margin-bottom: $spv--large; } .p-modal__title { - margin-bottom: $spv-inner--small; + margin-bottom: $spv--small; } &.thank-you { @@ -39,7 +39,7 @@ } } - @media only screen and (min-width: $breakpoint-medium) { + @media only screen and (min-width: $breakpoint-large) { .u-align { padding-bottom: 70px; diff --git a/static/sass/_patterns_lists.scss b/static/sass/_patterns_lists.scss index 03cd29ea..471420d5 100644 --- a/static/sass/_patterns_lists.scss +++ b/static/sass/_patterns_lists.scss @@ -39,7 +39,7 @@ min-height: 2.3rem; padding-left: 55px; - @media (max-width: $breakpoint-medium) { + @media (max-width: $breakpoint-large) { padding: 0.5rem 0 0.5rem 50px; } } diff --git a/static/sass/_patterns_modal.scss b/static/sass/_patterns_modal.scss index 8697a64a..12a3718c 100644 --- a/static/sass/_patterns_modal.scss +++ b/static/sass/_patterns_modal.scss @@ -86,7 +86,7 @@ top: 20px; width: 100px; - @media screen and (max-width: $breakpoint-medium) { + @media screen and (max-width: $breakpoint-large) { background-position: top 20px right 20px; } } diff --git a/static/sass/_patterns_sidenav.scss b/static/sass/_patterns_sidenav.scss index 26e5a7b0..859160bd 100644 --- a/static/sass/_patterns_sidenav.scss +++ b/static/sass/_patterns_sidenav.scss @@ -1,3 +1,5 @@ +@use 'sass:math'; + @mixin maas-p-sidenav { .p-sidenav__toggle { background-size: $sp-medium; @@ -10,7 +12,7 @@ // Fix p-sidebar-nav to understand // h3 headings, and not require any classes on the