Merge pull request #316 from wri/WRI-473--spacing

#473: misc event padding and layout tweaks.
wri · Sep 11, 2024 · 5f52091 · 5f52091
2 parents e2f4282 + dedcdf9
commit 5f52091
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 4 deletions.
diff --git a/modules/wri_event/config/install/smart_date.smart_date_format.compact_dot.yml b/modules/wri_event/config/install/smart_date.smart_date_format.compact_dot.yml
@@ -5,7 +5,7 @@ id: compact_dot
 label: 'Compact dot'
 date_format: 'F d, Y'
 time_format: 'g:ia T'
-time_hour_format: 'ga T'
+time_hour_format: 'g:ia T'
 allday_label: 'All day'
 separator: ' - '
 join: '<span>•</span>'

diff --git a/modules/wri_event/layouts/layout--event.html.twig b/modules/wri_event/layouts/layout--event.html.twig
@@ -71,7 +71,7 @@
     </div>
 
   {% if content.category or content.share %}
-    <div class="detail__meta meta grid margin-bottom-xl">
+    <div class="detail__meta meta grid margin-bottom-md">
       <div class="detail__meta-inner meta-inner {% if content.sidebar_left %}two-column{% endif %}">
         {% if content.category %}
           <div {{ region_attributes.category.addClass('layout__region', 'layout__region--category') }}>

diff --git a/modules/wri_event/wri_event.install b/modules/wri_event/wri_event.install
@@ -86,3 +86,12 @@ function wri_event_update_10001() {
   $message = 'Added Zoom tie-in fields, webform, and settings.';
   return $message;
 }
+
+/**
+ * Update the Smart Date compact_dot date format.
+ */
+function wri_event_update_10002() {
+  \Drupal::service('distro_helper.updates')->updateConfig('smart_date.smart_date_format.compact_dot', [
+    'time_hour_format',
+  ], 'wri_event');
+}
diff --git a/themes/custom/ts_wrin/sass/global/_header.scss b/themes/custom/ts_wrin/sass/global/_header.scss
@@ -31,7 +31,7 @@
 
 header:not(.pfp-header) {
   background-color: $white;
-  padding-bottom: 50px;
+  padding-bottom: 0;
   padding-top: 0;
   position: absolute;
   top: 0;

diff --git a/themes/custom/ts_wrin/sass/global/_tray-nav.scss b/themes/custom/ts_wrin/sass/global/_tray-nav.scss
@@ -14,7 +14,11 @@ body.noscroll {
   position: relative;
   transition: left 0.5s ease-in-out;
   width: 100%;
-  padding-top: 126px;
+  padding-top: 85px;
+
+  @include mq($md) {
+    padding-top: 126px;
+  }
 
   .path-frontpage &,
   .transparent-header & {