diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d899b204..b9fce075 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -4,9 +4,11 @@ on: push: branches: - '1.x' + - '2.x' pull_request: branches: - '1.x' + - '2.x' workflow_dispatch: jobs: diff --git a/components/prev-next/prev-next.twig b/components/prev-next/prev-next.twig index e8c3cdd8..c4488ffb 100644 --- a/components/prev-next/prev-next.twig +++ b/components/prev-next/prev-next.twig @@ -7,7 +7,7 @@ */ #} -{% set prevNextAttributes = prevNextAttributes|default(create_attribute) %} +{% set prevNextAttributes = create_attribute(prevNextAttributes|default({})) %} {% set icon_path = icon_path|default('@localgov_base/includes/icons') %} {% set prev_icon = prev_icon|default('chevron-left') %} diff --git a/css/components/callout.css b/css/components/callout.css index 53eba0c0..7c87008f 100644 --- a/css/components/callout.css +++ b/css/components/callout.css @@ -5,6 +5,7 @@ padding: 1.5rem; text-align: center; color: var(--color-white); + background-color: var(--color-accent); font-size: var(--font-size-large); font-weight: bold; } diff --git a/css/components/secondary-menu.css b/css/components/secondary-menu.css index b9f8e3ae..f9e32df3 100644 --- a/css/components/secondary-menu.css +++ b/css/components/secondary-menu.css @@ -29,7 +29,7 @@ .region-secondary-menu .menu { overflow-y: initial; - max-height: auto; + max-height: none; column-count: var(--secondary-menu-column-count); } }