From 55c15fc3a7bcdca456fa7f1a0d4ae31958d9dd9b Mon Sep 17 00:00:00 2001 From: ebremner <ebremner@uwaterloo.ca> Date: Thu, 19 Dec 2019 13:53:26 -0500 Subject: [PATCH] ISTWCMS-3505: adding code for UW header --- templates/regions/region--header.html.twig | 30 +++++++++++++++++----- uw_fdsu_theme_resp.info.yml | 3 +++ uw_fdsu_theme_resp.theme | 4 +-- 3 files changed, 28 insertions(+), 9 deletions(-) diff --git a/templates/regions/region--header.html.twig b/templates/regions/region--header.html.twig index 24028b3c..ceb443e2 100644 --- a/templates/regions/region--header.html.twig +++ b/templates/regions/region--header.html.twig @@ -1,7 +1,23 @@ -{% embed '@layouts/header/header.twig' %} - - {% block content %} - {{ content }} - {% endblock %} - -{% endembed %} +{# +/** + * @file + * Theme override to display a region. + * + * Available variables: + * - content: The content for this region, typically blocks. + * - attributes: HTML attributes for the region div. + * - region: The name of the region variable as defined in the theme's + * .info.yml file. + * + * @see template_preprocess_region() + */ +#} +{% embed '@layouts/header/header.twig' with { + 'classes': classes +}%} + + {% block content %} + {{ content }} + {% endblock %} + +{% endembed %} diff --git a/uw_fdsu_theme_resp.info.yml b/uw_fdsu_theme_resp.info.yml index c8920cc2..5c81302d 100644 --- a/uw_fdsu_theme_resp.info.yml +++ b/uw_fdsu_theme_resp.info.yml @@ -75,6 +75,9 @@ regions: # patterns folder = `$sourceDir` + `_patterns/` component-libraries: + global: + paths: + - uw_wcms_gesso/source/_patterns/01-global base: paths: - uw_wcms_gesso/source/_patterns/02-base diff --git a/uw_fdsu_theme_resp.theme b/uw_fdsu_theme_resp.theme index 046c81e4..59d5bed1 100644 --- a/uw_fdsu_theme_resp.theme +++ b/uw_fdsu_theme_resp.theme @@ -23,10 +23,10 @@ function uw_fdsu_theme_resp_preprocess_region(&$variables) { // (i.e. faculty colour and get the correct class here). if ($region == "header") { // The class that is used for the header. - $variables['attributes']['class'][] = 'header'; + $variables['classes'][] = 'uw-header'; // The colour scheme to be used for the header. - $variables['attributes']['class'][] = 'default'; + $variables['classes'][] = 'default'; } } -- GitLab