Merge pull request #246 from localgovdrupal/2.x

PR ahead of 2.0.0-beta12

.github/workflows/localgov_microsites.yml

@@ -1,6 +1,3 @@
-##
-# Managed by https://github.com/localgovdrupal/github_workflow_manager
----
 name: Test LocalGov Microsites localgovdrupal/localgov_microsites_base drupal-theme
 
 on:
@@ -219,4 +216,4 @@ jobs:
           mkdir -p ./html/web/sites/simpletest && chmod 777 ./html/web/sites/simpletest
           sed -i "s#http://localgov.lndo.site#http://drupal#" ./html/phpunit.xml.dist
           docker exec -t drupal bash -c 'chown docker:docker -R /var/www/html'
-          docker exec -u docker -t drupal bash -c "cd /var/www/html && ./bin/paratest --processes=4 ${{ env.LOCALGOV_DRUPAL_PROJECT_PATH }}"
+          docker exec -u docker -t drupal bash -c "cd /var/www/html && ./bin/paratest --processes=4 /var/www/html/${{ env.LOCALGOV_DRUPAL_PROJECT_PATH }}"

css/base/fonts.css

@@ -1,3 +1,23 @@
+/* lexend-regular - latin */
+@font-face {
+  font-family: Lexend;
+  src:
+    local(""),
+    url("../../assets/fonts/lexend-v19-latin/lexend-v19-latin-regular.woff2") format("woff2");
+  font-weight: 400;
+  font-style: normal;
+}
+
+/* lexend-700 - latin */
+@font-face {
+  font-family: Lexend;
+  src:
+    local(""),
+    url("../../assets/fonts/lexend-v19-latin/lexend-v19-latin-700.woff2") format("woff2");
+  font-weight: 700;
+  font-style: normal;
+}
+
 /* roboto-italic - latin */
 @font-face {
   font-family: Roboto;
@@ -944,13 +964,13 @@
   src:
     local(""),
     url("../../assets/fonts/inter/inter-v11-latin-regular.eot?#iefix") format("embedded-opentype"),
-  
+
     url("../../assets/fonts/inter/inter-v11-latin-regular.woff2") format("woff2"),
-  
+
     url("../../assets/fonts/inter/inter-v11-latin-regular.woff") format("woff"),
-  
+
     url("../../assets/fonts/inter/inter-v11-latin-regular.ttf") format("truetype"),
-  
+
     url("../../assets/fonts/inter/inter-v11-latin-regular.svg#Inter") format("svg");
   font-weight: 400;
   font-style: normal;
@@ -965,13 +985,13 @@
   src:
     local(""),
     url("../../assets/fonts/inter/inter-v11-latin-800.eot?#iefix") format("embedded-opentype"),
-  
+
     url("../../assets/fonts/inter/inter-v11-latin-800.woff2") format("woff2"),
-  
+
     url("../../assets/fonts/inter/inter-v11-latin-800.woff") format("woff"),
-  
+
     url("../../assets/fonts/inter/inter-v11-latin-800.ttf") format("truetype"),
-  
+
     url("../../assets/fonts/inter/inter-v11-latin-800.svg#Inter") format("svg");
   font-weight: 800;
   font-style: normal;
@@ -986,13 +1006,13 @@
   src:
     local(""),
     url("../../assets/fonts/lora/lora-v24-latin-regular.eot?#iefix") format("embedded-opentype"),
-  
+
     url("../../assets/fonts/lora/lora-v24-latin-regular.woff2") format("woff2"),
-  
+
     url("../../assets/fonts/lora/lora-v24-latin-regular.woff") format("woff"),
-  
+
     url("../../assets/fonts/lora/lora-v24-latin-regular.ttf") format("truetype"),
-  
+
     url("../../assets/fonts/lora/lora-v24-latin-regular.svg#Lora") format("svg");
   font-weight: 400;
   font-style: normal;
@@ -1007,13 +1027,13 @@
   src:
     local(""),
     url("../../assets/fonts/lora/lora-v24-latin-700.eot?#iefix") format("embedded-opentype"),
-  
+
     url("../../assets/fonts/lora/lora-v24-latin-700.woff2") format("woff2"),
-  
+
     url("../../assets/fonts/lora/lora-v24-latin-700.woff") format("woff"),
-  
+
     url("../../assets/fonts/lora/lora-v24-latin-700.ttf") format("truetype"),
-  
+
     url("../../assets/fonts/lora/lora-v24-latin-700.svg#Lora") format("svg");
   font-weight: 700;
   font-style: normal;
@@ -1028,13 +1048,13 @@
   src:
     local(""),
     url("../../assets/fonts/lora/lora-v24-latin-italic.eot?#iefix") format("embedded-opentype"),
-  
+
     url("../../assets/fonts/lora/lora-v24-latin-italic.woff2") format("woff2"),
-  
+
     url("../../assets/fonts/lora/lora-v24-latin-italic.woff") format("woff"),
-  
+
     url("../../assets/fonts/lora/lora-v24-latin-italic.ttf") format("truetype"),
-  
+
     url("../../assets/fonts/lora/lora-v24-latin-italic.svg#Lora") format("svg");
   font-weight: 400;
   font-style: italic;

css/components/full.css

@@ -8,9 +8,9 @@
   margin-bottom: var(--spacing-large);
 }
 
-.full__page-top > *,
-.full__page-top > .field--name-localgov-event-location > article > * {
-  margin-bottom: var(--spacing-large);
+.full__page-top > * + *,
+.full__page-top > .field--name-localgov-event-location > article > * + * {
+  margin-top: var(--spacing-large);
 }
 
 .full .field--name-localgov-directory-standfirst,

templates/layout/page.html.twig

@@ -79,9 +79,7 @@
   {{ page.breadcrumb }}
 {% endif %}
 
-{% if has_messages %}
-  {{ page.messages }}
-{% endif %}
+{{ page.messages }}
 
 <main class="main" id="main-content"> {# The "skip to content" link jumps to here. #}
 
@@ -134,12 +132,12 @@
         {% endif %}
       </div>
     </div>
-  
+
   {# When we have no sidebars #}
   {% else %}
-    {# 
+    {#
       If there are no sidebars, the content region take up 100% of the space, but:
-      1.  If we are on a node page, we do not constrain the content (this will be handled 
+      1.  If we are on a node page, we do not constrain the content (this will be handled
           by the node templates, so some parts of the template (hero, etc) can be the full
           width of the screen).
       2.  If we are not on a node page, we'll contain the content, so views pages, taxonomy