Merge pull request #256 from yalesites-org/develop

Release

templates/block/extra-field-block/node/page/block--extra-field-block--node--page--content-moderation-control.html.twig

@@ -0,0 +1 @@
+{{ content }}

templates/block/layout-builder/block--inline-block--inline-message.html.twig

@@ -0,0 +1,20 @@
+{% extends "@atomic/block/layout-builder/_layout-builder-block-template.twig" %}
+
+{% block content %}
+
+  {% if parentNode == 'post' or parentNode == 'event' %}
+    {% set inline_message__width = "content" %}
+    {% set inline_message__alignment = "center" %}()
+  {% else %}
+    {% set inline_message__width = "site" %}
+    {% set inline_message__alignment = "left" %}
+  {% endif %}
+
+  {% include "@molecules/inline-message/yds-inline-message.twig" with {
+    inline_message__heading: content.field_heading.0,
+    inline_message__content: content.field_text.0,
+    inline_message__link__content: content.field_link.0['#title'],
+    inline_message__link__url: content.field_link.0['#url_title'],
+    inline_message__theme: content.field_style_color.0['#markup'],
+  } %}
+{% endblock %}

templates/layout/region--header.html.twig

@@ -5,20 +5,15 @@
   {% set site_header__site_name_is_image = getHeaderSetting('site_name_image') %}
 {% endif %}
 
-{# set primary and utility nave variables equal to their drupal elements #}
-{# this is necessary to pass the truthiness of the elements to the site-header organism #}
-{# which will set {% set site_header__hamburger = 'yes' %} #}
-{# and render the hamburger icon if the primary nav exists or the ulitity nav exists #}
-{% set primary_nav__items = elements.main_navigation.content['#items'] %}
-{% set utility_nav__items = elements.utility_navigation.content['#items'] %}
-
 {% embed "@organisms/site-header/yds-site-header.twig" with {
   site_name: site_name,
   site_header__border_thickness: '8',
   site_header__theme: getThemeSetting('header_theme'),
   site_header__accent: getThemeSetting('header_accent'),
   site_header__menu__variation: getHeaderSetting('header_variation'),
   site_header__nav_position: getHeaderSetting('nav_position'),
+  site_header__branding_name: getHeaderSetting('site_wide_branding_name')|default('Yale University'),
+  site_header__branding_link: getHeaderSetting('site_wide_branding_link')|default('https://www.yale.edu'),
   drupal_utility_nav: elements.utility_navigation,
 } %}
   {% block site_header__primary_nav %}