From a023e1444a2eedacd6af49530bd32cbfaeb846de Mon Sep 17 00:00:00 2001
From: Joshua Nicholson <94021017+jnicholCU@users.noreply.github.com>
Date: Sun, 10 Dec 2023 22:32:20 -0700
Subject: [PATCH] Fixed Frame and Overlay

Fixed framing for single column rows
Added a new default for overlay classes.
---
 layouts/four-column/layout--four-column.html.twig   | 4 +++-
 layouts/one-column/layout--one-column.html.twig     | 6 ++++--
 layouts/three-column/layout--three-column.html.twig | 4 +++-
 layouts/two-column/layout--two-column.html.twig     | 4 +++-
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/layouts/four-column/layout--four-column.html.twig b/layouts/four-column/layout--four-column.html.twig
index fefae2b..d9239cc 100644
--- a/layouts/four-column/layout--four-column.html.twig
+++ b/layouts/four-column/layout--four-column.html.twig
@@ -47,8 +47,10 @@
 {% if settings.background_image_styles %}
 	{% if settings.overlay_color == 'black' %}
 		{% set row_overlay_settings = "ucb-bootstrap-layout-section-overlay-dark" %}
-	{% else %}
+	{% elseif settings.overlay_color == 'white' %}
 		{% set row_overlay_settings = "ucb-bootstrap-layout-section-overlay-light" %}
+	{% else %}
+		{% set row_overlay_settings = "ucb-bootstrap-layout-section-overlay-none" %}
 	{% endif %}
 {% else %}
 	{% set row_overlay_settings = "" %}
diff --git a/layouts/one-column/layout--one-column.html.twig b/layouts/one-column/layout--one-column.html.twig
index 5f81380..01daa55 100644
--- a/layouts/one-column/layout--one-column.html.twig
+++ b/layouts/one-column/layout--one-column.html.twig
@@ -43,8 +43,10 @@
 {% if settings.background_image_styles %}
 	{% if settings.overlay_color == 'black' %}
 		{% set row_overlay_settings = "ucb-bootstrap-layout-section-overlay-dark" %}
-	{% else %}
+	{% elseif settings.overlay_color == 'white' %}
 		{% set row_overlay_settings = "ucb-bootstrap-layout-section-overlay-light" %}
+	{% else %}
+		{% set row_overlay_settings = "ucb-bootstrap-layout-section-overlay-none" %}
 	{% endif %}
 {% else %}
 	{% set row_overlay_settings = "" %}
@@ -73,7 +75,7 @@ jarallax(document.querySelectorAll('.jarallax'), {speed: 0.2});
 		{% else %}
 			<div class="ucb-edge-to-edge">
 		{% endif %}
-				<div{{attributes.addClass(row_classes,frame_classes|join(''))}}>
+				<div{{attributes.addClass(row_classes,frame_classes|join(' '))}}>
 					<div {{ region_attributes.first.addClass('column', 'column--first', 'col-12') }}>
 						{{ content.first }}
 					</div>
diff --git a/layouts/three-column/layout--three-column.html.twig b/layouts/three-column/layout--three-column.html.twig
index 8bc28e4..86d008e 100644
--- a/layouts/three-column/layout--three-column.html.twig
+++ b/layouts/three-column/layout--three-column.html.twig
@@ -47,8 +47,10 @@
 {% if settings.background_image_styles %}
 	{% if settings.overlay_color == 'black' %}
 		{% set row_overlay_settings = "ucb-bootstrap-layout-section-overlay-dark" %}
-	{% else %}
+	{% elseif settings.overlay_color == 'white' %}
 		{% set row_overlay_settings = "ucb-bootstrap-layout-section-overlay-light" %}
+	{% else %}
+		{% set row_overlay_settings = "ucb-bootstrap-layout-section-overlay-none" %}
 	{% endif %}
 {% else %}
 	{% set row_overlay_settings = "" %}
diff --git a/layouts/two-column/layout--two-column.html.twig b/layouts/two-column/layout--two-column.html.twig
index d992d03..40159b2 100644
--- a/layouts/two-column/layout--two-column.html.twig
+++ b/layouts/two-column/layout--two-column.html.twig
@@ -47,8 +47,10 @@
 {% if settings.background_image_styles %}
 	{% if settings.overlay_color == 'black' %}
 		{% set row_overlay_settings = "ucb-bootstrap-layout-section-overlay-dark" %}
-	{% else %}
+	{% elseif settings.overlay_color == 'white' %}
 		{% set row_overlay_settings = "ucb-bootstrap-layout-section-overlay-light" %}
+	{% else %}
+		{% set row_overlay_settings = "ucb-bootstrap-layout-section-overlay-none" %}
 	{% endif %}
 {% else %}
 	{% set row_overlay_settings = "" %}