From 5db5848f1b7fec111dc4abb5183cb219c0e1f2d1 Mon Sep 17 00:00:00 2001
From: ebremner <ebremner@uwaterloo.ca>
Date: Mon, 16 Nov 2020 15:48:40 -0500
Subject: [PATCH] ISTWCMS-4199: fixing header
---
.../_patterns/03-layouts/header/header.twig | 54 ++++++++++---------
1 file changed, 28 insertions(+), 26 deletions(-)
diff --git a/source/_patterns/03-layouts/header/header.twig b/source/_patterns/03-layouts/header/header.twig
index 16222ae5..f21bc3ec 100644
--- a/source/_patterns/03-layouts/header/header.twig
+++ b/source/_patterns/03-layouts/header/header.twig
@@ -4,36 +4,38 @@
<header class="uw-header {{ faculty }}" role="banner">
<div class="uw-header__wrapper">
- {% include '@components/site-logo/site-logo.twig' %}
+ {% include '@components/site-logo/site-logo.twig' %}
- {% include "@components/menu/menu--header/menu--header.twig" with {
- 'modifier_classes': header_modifier_classes,
- 'items': header_items
- } %}
- {% block content %}
+ {% include "@components/menu/menu--header/menu--header.twig" with {
+ 'modifier_classes': 'header',
+ } %}
- {% endblock %}
+ </div>
- </div>
+ {% include '@components/color-bar/color-bar.twig' with {
+ 'faculty': faculty
+ }%}
- {% include '@components/color-bar/color-bar.twig' with {
- 'faculty': faculty
- }%}
+ <div class="uw-header__site-name">
+ {% include '@components/site-name/site-name.twig' with {
+ 'site_name': site_name
+ } %}
+ </div>
+
+ <div class="uw-header__navigation">
+ {% include "@components/menu/menu--horizontal/menu--horizontal.twig" with {
+ 'modifier_classes': 'main',
+ 'menu_name': 'horizontal',
+ 'items': nav_items
+ }%}
+
+ {% include "@components/menu/menu--secondary/menu--secondary.twig" with {
+ 'modifier_classes': 'secondary',
+ 'items': secondary_items
+ }%}
+
+ </div>
- <div class="uw-header__site-name">
- {% include '@components/site-name/site-name.twig' with {
- 'site_name': 'PSYCHOLOGY'
- } %}
- </div>
- <div class="uw-header__navigation">
- {% include "@components/menu/menu--horizontal/menu--horizontal.twig" with {
- 'modifier_classes': main_modifier_classes,
- 'items': nav_items
- }%}
- {% include "@components/menu/menu--secondary/menu--secondary.twig" with {
- 'modifier_classes': secondary_modifier_classes,
- 'items': secondary_items
- }%}
- </div>
</header>
+
--
GitLab