From 64ba22b8bec240827822f9f83793dd32ef71cb01 Mon Sep 17 00:00:00 2001 From: Joshua Nicholson <94021017+jnicholCU@users.noreply.github.com> Date: Mon, 11 Nov 2024 07:42:28 +0900 Subject: [PATCH 1/5] Additional footer style Added secondary footer style of "Homepage Layout" so that the homepage's footer can have it's own settings. Only accessible through "advanced" layout options. --- .../regions/region--site-information.html.twig | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/templates/regions/region--site-information.html.twig b/templates/regions/region--site-information.html.twig index e0e18244..baa3691b 100755 --- a/templates/regions/region--site-information.html.twig +++ b/templates/regions/region--site-information.html.twig @@ -32,6 +32,22 @@

© Regents of the University of Colorado

+ {% elseif ucb_be_boulder == '3' %} +
+
+

Be Boulder.

+

University of Colorado Boulder

+

© Regents of the University of Colorado

+

Privacy • Legal & Trademarks • Campus Map

+

Accessibility • Student Consumer Information • Land Acknowledgement • Policies • CU Boulder Jobs

+

Download the Clery Act Annual Security & Fire safety report, or request a paper copy from the CU Boulder Police Department.  

+
+
+
+

University of Colorado Boulder

+

© Regents of the University of Colorado

+
+ {% else %} {{ content }} {% endif %} From adde7a2aa7845424b190a6d2a2a652976d27824a Mon Sep 17 00:00:00 2001 From: Joshua Nicholson <94021017+jnicholCU@users.noreply.github.com> Date: Mon, 11 Nov 2024 08:21:46 +0900 Subject: [PATCH 2/5] Updated css, html, and theme The regions needed to have their outer div changed so that the background color applied correctly to the full width. Updated the css to fix padding issues. --- boulder_base.theme | 3 +++ config/install/boulder_base.settings.yml | 3 +++ css/layout-builder-styles.css | 2 +- templates/layout/page.html.twig | 24 ++++++++++++++++-------- 4 files changed, 23 insertions(+), 9 deletions(-) diff --git a/boulder_base.theme b/boulder_base.theme index b53d459f..6583f3b2 100755 --- a/boulder_base.theme +++ b/boulder_base.theme @@ -173,6 +173,9 @@ function boulder_base_preprocess_page(array &$variables) { $variables['ucb_rave_alerts'] = theme_get_setting('ucb_rave_alerts'); $variables['ucb_sticky_menu'] = theme_get_setting('ucb_sticky_menu'); $variables['ucb_heading_font'] = theme_get_setting('ucb_heading_font'); + $variables['ucb_above_content_region_color'] = theme_get_setting('ucb_above_content_region_color'); + $variables['ucb_after_content_one_region_color'] = theme_get_setting('ucb_after_content_one_region_color'); + $variables['ucb_after_content_two_region_color'] = theme_get_setting('ucb_after_content_two_region_color'); $useCustomLogo = theme_get_setting('ucb_use_custom_logo'); if ($useCustomLogo) { $fileUrlGenerator = \Drupal::service('file_url_generator'); diff --git a/config/install/boulder_base.settings.yml b/config/install/boulder_base.settings.yml index 1dacbb7f..aea88b87 100644 --- a/config/install/boulder_base.settings.yml +++ b/config/install/boulder_base.settings.yml @@ -22,4 +22,7 @@ ucb_footer_menu_default_links: 0 ucb_breadcrumb_nav: 1 ucb_use_custom_logo: false ucb_heading_font: 'bold' +ucb_above_content_region_color: 'white' +ucb_after_content_one_region_color: 'white' +ucb_after_content_two_region_color: 'white' web_express_version: '20241030' diff --git a/css/layout-builder-styles.css b/css/layout-builder-styles.css index 77e5a9dc..ca8cfe91 100644 --- a/css/layout-builder-styles.css +++ b/css/layout-builder-styles.css @@ -263,7 +263,7 @@ padding-bottom: 0; } -.ucb-bootstrap-layout-section .column .block:last-child, .ucb-sidebar .block:last-child, .ucb-above-content-region .block:last-child, .ucb-below-content-region .block:last-child { +.ucb-bootstrap-layout-section .column .block:last-child, .ucb-sidebar .block:last-child{ margin-bottom: 0 } diff --git a/templates/layout/page.html.twig b/templates/layout/page.html.twig index 0efbe592..7ad6c83f 100644 --- a/templates/layout/page.html.twig +++ b/templates/layout/page.html.twig @@ -228,9 +228,11 @@ {% endif %} {% if page.above_content|render %} -
-
- {{ page.above_content }} +
+
+
+ {{ page.above_content }} +
{% endif %} @@ -273,15 +275,21 @@
{% endif %} {% if page.below_content|render %} -
-
- {{ page.below_content }} +
+
+
+ {{ page.below_content }} +
{% endif %} {% if page.second_below_content|render %} -
- {{ page.second_below_content }} +
+
+
+ {{ page.second_below_content }} +
+
{% endif %}
From 2ad0cc24319c4ee47e2c66c9f9c6b7601e298433 Mon Sep 17 00:00:00 2001 From: Joshua Nicholson <94021017+jnicholCU@users.noreply.github.com> Date: Mon, 11 Nov 2024 08:50:34 +0900 Subject: [PATCH 3/5] Homepage
update Added if conditional and settings for hiding the `
` for the Homepage use case --- boulder_base.theme | 1 + config/install/boulder_base.settings.yml | 1 + templates/layout/page.html.twig | 48 ++++++++++++------------ 3 files changed, 27 insertions(+), 23 deletions(-) diff --git a/boulder_base.theme b/boulder_base.theme index 6583f3b2..241c62d7 100755 --- a/boulder_base.theme +++ b/boulder_base.theme @@ -166,6 +166,7 @@ function boulder_base_preprocess_page(array &$variables) { $variables['ucb_footer_menu_default_links'] = theme_get_setting('ucb_footer_menu_default_links'); $variables['show_breadcrumb'] = theme_get_setting('ucb_breadcrumb_nav'); $variables['theme_path'] = base_path() . $variables['directory']; + $variables['ucb_homepage_header'] = theme_get_setting('ucb_homepage_header'); $variables['ucb_campus_header_color'] = theme_get_setting('ucb_campus_header_color'); $variables['ucb_header_color'] = $headerColor = theme_get_setting('ucb_header_color'); $variables['ucb_be_boulder'] = theme_get_setting('ucb_be_boulder'); diff --git a/config/install/boulder_base.settings.yml b/config/install/boulder_base.settings.yml index aea88b87..35492b24 100644 --- a/config/install/boulder_base.settings.yml +++ b/config/install/boulder_base.settings.yml @@ -9,6 +9,7 @@ favicon: use_default: 0 path: /themes/custom/boulder_base/favicon.png mimetype: image/png +ucb_homepage_header: 1 ucb_campus_header_color: '1' ucb_header_color: '3' ucb_sidebar_position: right diff --git a/templates/layout/page.html.twig b/templates/layout/page.html.twig index 7ad6c83f..064624f0 100644 --- a/templates/layout/page.html.twig +++ b/templates/layout/page.html.twig @@ -157,33 +157,35 @@ {% if site_search.0 %} {% include '@boulder_base/includes/ucb-search-modal.html.twig' %} {% endif %} - +
+ {% endif %}