From 018775dc460c5ec2c87ed4cbd9e852ee23939713 Mon Sep 17 00:00:00 2001 From: Jacob Korf Date: Mon, 6 Nov 2023 23:10:13 -0700 Subject: [PATCH 1/2] Adds menu styles to the user page --- templates/layout/page--user.html.twig | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/templates/layout/page--user.html.twig b/templates/layout/page--user.html.twig index 3a2ba4bd..da3f5155 100755 --- a/templates/layout/page--user.html.twig +++ b/templates/layout/page--user.html.twig @@ -47,7 +47,31 @@ {#{% if ucb_alerts %}#} {# {{ attach_library('ucb2021_base/ucb-alerts') }}#} {#{% endif %}#} - +{# Adds Menu Styles #} +{% set menu_style = drupal_config('boulder_base.settings', 'ucb_menu_style') %} +{% if menu_style == 'highlight' %} + {{ attach_library('boulder_base/ucb-menu-style-highlight') }} +{% elseif menu_style == 'ivory' %} + {{ attach_library('boulder_base/ucb-menu-style-ivory') }} +{% elseif menu_style == 'layers' %} + {{ attach_library('boulder_base/ucb-menu-style-layers') }} +{% elseif menu_style == 'minimal' %} + {{ attach_library('boulder_base/ucb-menu-style-minimal') }} +{% elseif menu_style == 'modern' %} + {{ attach_library('boulder_base/ucb-menu-style-modern') }} +{% elseif menu_style == 'rise' %} + {{ attach_library('boulder_base/ucb-menu-style-rise') }} +{% elseif menu_style == 'shadow' %} + {{ attach_library('boulder_base/ucb-menu-style-shadow') }} +{% elseif menu_style == 'simple' %} + {{ attach_library('boulder_base/ucb-menu-style-simple') }} +{% elseif menu_style == 'spirit' %} + {{ attach_library('boulder_base/ucb-menu-style-spirit') }} +{% elseif menu_style == 'swatch' %} + {{ attach_library('boulder_base/ucb-menu-style-swatch') }} +{% elseif menu_style == 'tradition' %} + {{ attach_library('boulder_base/ucb-menu-style-tradition') }} +{% endif %} {# Adds js file necessary for status bar #} {{ attach_library('boulder_base/ucb-user-page') }} From d3123e6ab6799e972baa785778e4ed85ca4579c2 Mon Sep 17 00:00:00 2001 From: Jacob Korf Date: Tue, 7 Nov 2023 10:54:39 -0700 Subject: [PATCH 2/2] Moved styles to header block --- templates/layout/page--user.html.twig | 25 -------------- templates/layout/page.html.twig | 48 +++++++++++++-------------- 2 files changed, 24 insertions(+), 49 deletions(-) diff --git a/templates/layout/page--user.html.twig b/templates/layout/page--user.html.twig index da3f5155..b4e598e9 100755 --- a/templates/layout/page--user.html.twig +++ b/templates/layout/page--user.html.twig @@ -47,31 +47,6 @@ {#{% if ucb_alerts %}#} {# {{ attach_library('ucb2021_base/ucb-alerts') }}#} {#{% endif %}#} -{# Adds Menu Styles #} -{% set menu_style = drupal_config('boulder_base.settings', 'ucb_menu_style') %} -{% if menu_style == 'highlight' %} - {{ attach_library('boulder_base/ucb-menu-style-highlight') }} -{% elseif menu_style == 'ivory' %} - {{ attach_library('boulder_base/ucb-menu-style-ivory') }} -{% elseif menu_style == 'layers' %} - {{ attach_library('boulder_base/ucb-menu-style-layers') }} -{% elseif menu_style == 'minimal' %} - {{ attach_library('boulder_base/ucb-menu-style-minimal') }} -{% elseif menu_style == 'modern' %} - {{ attach_library('boulder_base/ucb-menu-style-modern') }} -{% elseif menu_style == 'rise' %} - {{ attach_library('boulder_base/ucb-menu-style-rise') }} -{% elseif menu_style == 'shadow' %} - {{ attach_library('boulder_base/ucb-menu-style-shadow') }} -{% elseif menu_style == 'simple' %} - {{ attach_library('boulder_base/ucb-menu-style-simple') }} -{% elseif menu_style == 'spirit' %} - {{ attach_library('boulder_base/ucb-menu-style-spirit') }} -{% elseif menu_style == 'swatch' %} - {{ attach_library('boulder_base/ucb-menu-style-swatch') }} -{% elseif menu_style == 'tradition' %} - {{ attach_library('boulder_base/ucb-menu-style-tradition') }} -{% endif %} {# Adds js file necessary for status bar #} {{ attach_library('boulder_base/ucb-user-page') }} diff --git a/templates/layout/page.html.twig b/templates/layout/page.html.twig index 5cbf54a7..636a85cd 100644 --- a/templates/layout/page.html.twig +++ b/templates/layout/page.html.twig @@ -45,36 +45,36 @@ #} -{% set menu_style = drupal_config('boulder_base.settings', 'ucb_menu_style') %} -{% if menu_style == 'highlight' %} - {{ attach_library('boulder_base/ucb-menu-style-highlight') }} -{% elseif menu_style == 'ivory' %} - {{ attach_library('boulder_base/ucb-menu-style-ivory') }} -{% elseif menu_style == 'layers' %} - {{ attach_library('boulder_base/ucb-menu-style-layers') }} -{% elseif menu_style == 'minimal' %} - {{ attach_library('boulder_base/ucb-menu-style-minimal') }} -{% elseif menu_style == 'modern' %} - {{ attach_library('boulder_base/ucb-menu-style-modern') }} -{% elseif menu_style == 'rise' %} - {{ attach_library('boulder_base/ucb-menu-style-rise') }} -{% elseif menu_style == 'shadow' %} - {{ attach_library('boulder_base/ucb-menu-style-shadow') }} -{% elseif menu_style == 'simple' %} - {{ attach_library('boulder_base/ucb-menu-style-simple') }} -{% elseif menu_style == 'spirit' %} - {{ attach_library('boulder_base/ucb-menu-style-spirit') }} -{% elseif menu_style == 'swatch' %} - {{ attach_library('boulder_base/ucb-menu-style-swatch') }} -{% elseif menu_style == 'tradition' %} - {{ attach_library('boulder_base/ucb-menu-style-tradition') }} -{% endif %}
{# HEADER CONTENT #} {% block page_header %} {{ attach_library('boulder_base/ucb-social-media') }} + {% set menu_style = drupal_config('boulder_base.settings', 'ucb_menu_style') %} + {% if menu_style == 'highlight' %} + {{ attach_library('boulder_base/ucb-menu-style-highlight') }} + {% elseif menu_style == 'ivory' %} + {{ attach_library('boulder_base/ucb-menu-style-ivory') }} + {% elseif menu_style == 'layers' %} + {{ attach_library('boulder_base/ucb-menu-style-layers') }} + {% elseif menu_style == 'minimal' %} + {{ attach_library('boulder_base/ucb-menu-style-minimal') }} + {% elseif menu_style == 'modern' %} + {{ attach_library('boulder_base/ucb-menu-style-modern') }} + {% elseif menu_style == 'rise' %} + {{ attach_library('boulder_base/ucb-menu-style-rise') }} + {% elseif menu_style == 'shadow' %} + {{ attach_library('boulder_base/ucb-menu-style-shadow') }} + {% elseif menu_style == 'simple' %} + {{ attach_library('boulder_base/ucb-menu-style-simple') }} + {% elseif menu_style == 'spirit' %} + {{ attach_library('boulder_base/ucb-menu-style-spirit') }} + {% elseif menu_style == 'swatch' %} + {{ attach_library('boulder_base/ucb-menu-style-swatch') }} + {% elseif menu_style == 'tradition' %} + {{ attach_library('boulder_base/ucb-menu-style-tradition') }} + {% endif %} {% set header_color = 'black' %} {% set campus_header_color = 'black' %} {% set campus_header_text_color = 'white' %}