Merge branch 'main' into add-cypress

canonical · Jul 18, 2023 · b86e540 · b86e540
2 parents 7476509 + b83daa0
commit b86e540
Show file tree

Hide file tree

Showing 8 changed files with 48 additions and 47 deletions.
diff --git a/.gitignore b/.gitignore
@@ -72,7 +72,9 @@ bzr-repo/
 .venv
 .dotrun.json
 
-cypress/screenshots/**/*.png
-
 # JS modules copied from node_modules
 static/js/modules/*
+
+# cypress
+cypress/screenshots
+cypress/videos
diff --git a/cypress/videos/apiDocs.spec.js.mp4 b/cypress/videos/apiDocs.spec.js.mp4
diff --git a/package.json b/package.json
@@ -39,7 +39,7 @@
     "postcss": "8.4.20",
     "postcss-cli": "9.1.0",
     "sass": "1.57.1",
-    "vanilla-framework": "3.14.0",
+    "vanilla-framework": "4.0.0",
     "venobox": "2.0.4"
   }
 }
diff --git a/redirects.yaml b/redirects.yaml
diff --git a/requirements.txt b/requirements.txt
@@ -1,7 +1,7 @@
 canonicalwebteam.flask_base==1.1.0
 canonicalwebteam.blog==6.4.0
 canonicalwebteam.discourse==5.4.1
-canonicalwebteam.http==1.0.3
+canonicalwebteam.http==1.0.4
 canonicalwebteam.templatefinder==1.0.0
 canonicalwebteam.search==1.3.0
 canonicalwebteam.image-template==1.3.1

diff --git a/templates/blog/article.html b/templates/blog/article.html
@@ -1,6 +1,6 @@
 {% extends "base_index.html" %}
 
-{% block page_title %}{{ article.title.rendered|safe }} | Snapcraft{% endblock %}
+{% block page_title %}blog | {{ article.title.rendered|safe }}{% endblock %}
 {% block page_description %}{{ article.excerpt.raw }}{% endblock %}
 {% if article.image and article.image.source_url %}
   {% block meta_image %}{{ article.image.source_url }}{% endblock %}

diff --git a/templates/index.html b/templates/index.html
@@ -526,7 +526,7 @@ <h4>Monitoring</h4>
 <section class="p-strip--accent is-shallow">
   <div class="row u-equal-height">
     <div class="col-10">
-      <h3 class="p-heading--2 u-no-margin--bottom">Learn how to configure and install MAAS</h3>
+      <h3 class="p-heading--2">Learn how to configure and install MAAS</h3>
       <br class="u-hide--medium u-hide--large" />
     </div>
     <div class="col-2 u-vertically-center">

diff --git a/yarn.lock b/yarn.lock
@@ -2857,10 +2857,10 @@ [email protected]:
     sass "1.58.0"
     yaml "1.10.2"
 
-vanilla-framework@3.14.0:
-  version "3.14.0"
-  resolved "https://registry.yarnpkg.com/vanilla-framework/-/vanilla-framework-3.14.0.tgz#c5b94d7e2e3ef2d3c9f24091b7efc4abf8054cf9"
-  integrity sha512-06Vr2nhjU72N9IivwCLcd7FgqFNopkiHfzANJUCNdvs8FkbTjIB7fcsFgJ6O76KnOBsEiAoJAssRkTh9x3a2jw==
+vanilla-framework@4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/vanilla-framework/-/vanilla-framework-4.0.0.tgz#a2fee9bd9763ebd6932b764f9d66484dc177d4cc"
+  integrity sha512-fiPnmaTUe15l5MRNJ6IsiJ8qiunfmgtLETOFltaYiE/bQKL7xTI+riBak2iygBKeF1y0Gi/GxUNt4hyb6xDPKA==
 
 [email protected]:
   version "2.0.4"