Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PR ahead of 2.0.0-beta12 #246

Merged
merged 9 commits into from
Feb 28, 2024
5 changes: 1 addition & 4 deletions .github/workflows/localgov_microsites.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
##
# Managed by https://github.com/localgovdrupal/github_workflow_manager
---
name: Test LocalGov Microsites localgovdrupal/localgov_microsites_base drupal-theme

on:
Expand Down Expand Up @@ -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 }}"
Binary file not shown.
Binary file not shown.
60 changes: 40 additions & 20 deletions css/base/fonts.css
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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;
Expand All @@ -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;
Expand All @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions css/components/full.css
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
10 changes: 4 additions & 6 deletions templates/layout/page.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -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. #}

Expand Down Expand Up @@ -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
Expand Down
Loading