diff --git a/boulder_base.theme b/boulder_base.theme index b53d459f..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'); @@ -173,6 +174,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..25eaffac 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: 0 ucb_campus_header_color: '1' ucb_header_color: '3' ucb_sidebar_position: right @@ -22,4 +23,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/css/ucb-brand-bar.css b/css/ucb-brand-bar.css index 923dab7a..19722439 100644 --- a/css/ucb-brand-bar.css +++ b/css/ucb-brand-bar.css @@ -31,6 +31,10 @@ .ucb-brand-bar img.ucb-logo { max-width: 240px; } + + .ucb-brand-bar img.ucb-logo.ucb-homepage { + max-width: 320px; + } } .ucb-brand-bar .ucb-brand-bar-controls { diff --git a/templates/layout/page.html.twig b/templates/layout/page.html.twig index 0efbe592..8483908c 100644 --- a/templates/layout/page.html.twig +++ b/templates/layout/page.html.twig @@ -97,6 +97,12 @@ {% set header_color = 'dark' %} {% endif %} + {% if ucb_homepage_header %} + {% set hompeage_logo_size = "ucb-homepage" %} + {% else %} + {% set hompeage_logo_size = "" %} + {% endif %} + {% if ucb_rave_alerts %} {% endif %} @@ -116,7 +122,7 @@
{{ attach_library('boulder_base/ucb-brand-bar') }}
- +
{# Google Translate #} @@ -157,33 +163,35 @@ {% if site_search.0 %} {% include '@boulder_base/includes/ucb-search-modal.html.twig' %} {% endif %} - + + {% endif %}