Merge pull request #533 from CuBoulder/issue/529

Issue/529
CuBoulder · Nov 2, 2023 · 33a3017 · 33a3017
2 parents 1f7d39e + c8ded03
commit 33a3017
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 8 deletions.
diff --git a/boulder_base.theme b/boulder_base.theme
@@ -78,6 +78,7 @@ function boulder_base_preprocess_page(array &$variables) {
   $variables['site_slogan'] = $config->get('slogan');
   $variables['ucb_secondary_menu_position'] = theme_get_setting('ucb_secondary_menu_position');
   $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_campus_header_color'] = theme_get_setting('ucb_campus_header_color');
   $variables['ucb_header_color'] = $headerColor = theme_get_setting('ucb_header_color');

diff --git a/css/block/content-grid.css b/css/block/content-grid.css
@@ -74,7 +74,7 @@
   margin-bottom: 1em;
 }
 
-.overlay-grid-image-container h3 {
+.overlay-grid-image-container h2, .overlay-grid-image-container h3 {
   padding: 0.75rem;
   position: absolute;
   bottom: 0;
@@ -83,11 +83,9 @@
   margin-bottom: 0;
   color: white;
   width: 100%;
+  font-size: 100%
 }
 
-.overlay-grid-text {
-  margin-bottom: 1em;
-}
 
 /*** Offest Grid Layout ***/
 .grid-image-container-large .grid-fill {

diff --git a/css/block/video-reveal.css b/css/block/video-reveal.css
@@ -1,12 +1,16 @@
 .ucb-video-reveal {
   margin-top: 20px;
-  aspect-ratio: 16/9;
 }
 
 .ucb-video-text-div {
   position: relative;
 }
 
+.ucb-edge-to-edge .ucb-video-reveal-text {
+  padding-left: 50px;
+  padding-right: 50px;
+}
+
 .ucb-video-reveal-controls {
   position: absolute;
   top: 50%;
@@ -41,6 +45,7 @@ span.ucb-vid-reveal-icon {
 
 .ucb-video-reveal-image img {
   width: 100%;
+  padding-bottom: 20px;
 }
 
 .ucb-video-reveal-image .media-image-caption {
@@ -52,7 +57,6 @@ span.ucb-vid-reveal-icon {
   padding-bottom: 0px;
   max-height: 600px;
   object-fit: cover;
-  aspect-ratio: 16/9; 
 }
 
 .ucb-video-reveal-video-wrapper{

diff --git a/css/style.css b/css/style.css
@@ -28,7 +28,7 @@ body {
 }
 
 main {
-  padding: 0 0 10px 0;
+  padding: 0 0 0 0;
 }
 
 h1,

diff --git a/css/ucb-page.css b/css/ucb-page.css
@@ -1,3 +1,7 @@
 /*
   Placeholder for styles for the basic page
- */
+ */
+
+ .ucb-page-title {
+  padding-top: 10px;
+}
diff --git a/css/ucb-people-list.css b/css/ucb-people-list.css
@@ -1,3 +1,7 @@
+.ucb-people-list-title {
+  padding-top: 10px;
+}
+
 .ucb-list-msg {
   font-size: 1.25em;
   font-weight: bolder;

diff --git a/css/ucb-person.css b/css/ucb-person.css
@@ -1,8 +1,10 @@
 .ucb-person-header {
+  padding-top: 1em;
   margin-bottom: 10px;
 }
 
 .ucb-person-name {
+  padding-top: 10px;
   margin-bottom: 0;
 }
 

diff --git a/templates/layout/page.html.twig b/templates/layout/page.html.twig
@@ -152,9 +152,11 @@
 
   {# MAIN PAGE CONTENT #}
   <div class="ucb-page-content">
+  {% if show_breadcrumb %}
   <div class="ucb-breadcrumb-region">
     {{ page.breadcrumb }}
   </div>
+  {% endif %}
 
   {{ page.highlighted }}
-Original file line number
+Diff line change
@@ Expand Up / @@ -28,7 +28,7 @@ body { @@
     }
     main {
-      padding: 0 0 10px 0;
+      padding: 0 0 0 0;
     }
     h1,
@@ Expand Down @@