Merge pull request #847 from massgov/release-5.25.0

Release 5.25.0
massgov · May 23, 2018 · a4616ac · a4616ac
2 parents d18569b + 497a15a
commit a4616ac
Show file tree

Hide file tree

Showing 123 changed files with 244 additions and 129 deletions.
diff --git a/...js/reference/regression_page_G2G-G2G-ORG-Health-Services_0_document_0_phone.png b/...js/reference/regression_page_G2G-G2G-ORG-Health-Services_0_document_0_phone.png
diff --git a/...s/reference/regression_page_G2G-G2G-ORG-Health-Services_0_document_1_tablet.png b/...s/reference/regression_page_G2G-G2G-ORG-Health-Services_0_document_1_tablet.png
diff --git a/...ce/regression_page_G2G-G2G-Service-Unemployment-Benefits_0_document_0_phone.png b/...ce/regression_page_G2G-G2G-Service-Unemployment-Benefits_0_document_0_phone.png
diff --git a/...e/regression_page_G2G-G2G-Service-Unemployment-Benefits_0_document_1_tablet.png b/...e/regression_page_G2G-G2G-Service-Unemployment-Benefits_0_document_1_tablet.png
diff --git a/backstopjs/reference/regression_page_Homepage_0_document_0_phone.png b/backstopjs/reference/regression_page_Homepage_0_document_0_phone.png
diff --git a/backstopjs/reference/regression_page_Homepage_0_document_1_tablet.png b/backstopjs/reference/regression_page_Homepage_0_document_1_tablet.png
diff --git a/backstopjs/reference/regression_page_binder-page-cover_0_document_1_tablet.png b/backstopjs/reference/regression_page_binder-page-cover_0_document_1_tablet.png
diff --git a/backstopjs/reference/regression_page_binder-page-internal_0_document_1_tablet.png b/backstopjs/reference/regression_page_binder-page-internal_0_document_1_tablet.png
diff --git a/backstopjs/reference/regression_page_bio-page_0_document_0_phone.png b/backstopjs/reference/regression_page_bio-page_0_document_0_phone.png
diff --git a/backstopjs/reference/regression_page_bio-page_0_document_1_tablet.png b/backstopjs/reference/regression_page_bio-page_0_document_1_tablet.png
diff --git a/backstopjs/reference/regression_page_board-decision_0_document_1_tablet.png b/backstopjs/reference/regression_page_board-decision_0_document_1_tablet.png
diff --git a/...erence/regression_page_detail-for-service-howto-location_0_document_0_phone.png b/...erence/regression_page_detail-for-service-howto-location_0_document_0_phone.png
diff --git a/...rence/regression_page_detail-for-service-howto-location_0_document_1_tablet.png b/...rence/regression_page_detail-for-service-howto-location_0_document_1_tablet.png
diff --git a/...topjs/reference/regression_page_event-end-date-with-time_0_document_0_phone.png b/...topjs/reference/regression_page_event-end-date-with-time_0_document_0_phone.png
diff --git a/...opjs/reference/regression_page_event-end-date-with-time_0_document_1_tablet.png b/...opjs/reference/regression_page_event-end-date-with-time_0_document_1_tablet.png
diff --git a/backstopjs/reference/regression_page_event-end-date_0_document_0_phone.png b/backstopjs/reference/regression_page_event-end-date_0_document_0_phone.png
diff --git a/backstopjs/reference/regression_page_event-end-date_0_document_1_tablet.png b/backstopjs/reference/regression_page_event-end-date_0_document_1_tablet.png
diff --git a/backstopjs/reference/regression_page_event-listing_0_document_0_phone.png b/backstopjs/reference/regression_page_event-listing_0_document_0_phone.png
diff --git a/backstopjs/reference/regression_page_event-listing_0_document_1_tablet.png b/backstopjs/reference/regression_page_event-listing_0_document_1_tablet.png
diff --git a/...js/reference/regression_page_event-public-meeting-agenda_0_document_0_phone.png b/...js/reference/regression_page_event-public-meeting-agenda_0_document_0_phone.png
diff --git a/...s/reference/regression_page_event-public-meeting-agenda_0_document_1_tablet.png b/...s/reference/regression_page_event-public-meeting-agenda_0_document_1_tablet.png
diff --git a/...s/reference/regression_page_event-public-meeting-minutes_0_document_0_phone.png b/...s/reference/regression_page_event-public-meeting-minutes_0_document_0_phone.png
diff --git a/.../reference/regression_page_event-public-meeting-minutes_0_document_1_tablet.png b/.../reference/regression_page_event-public-meeting-minutes_0_document_1_tablet.png
diff --git a/backstopjs/reference/regression_page_event-public-meeting_0_document_0_phone.png b/backstopjs/reference/regression_page_event-public-meeting_0_document_0_phone.png
diff --git a/backstopjs/reference/regression_page_event-public-meeting_0_document_1_tablet.png b/backstopjs/reference/regression_page_event-public-meeting_0_document_1_tablet.png
diff --git a/backstopjs/reference/regression_page_event-recurring_0_document_0_phone.png b/backstopjs/reference/regression_page_event-recurring_0_document_0_phone.png
diff --git a/backstopjs/reference/regression_page_event-recurring_0_document_1_tablet.png b/backstopjs/reference/regression_page_event-recurring_0_document_1_tablet.png
diff --git a/backstopjs/reference/regression_page_event_0_document_0_phone.png b/backstopjs/reference/regression_page_event_0_document_0_phone.png
diff --git a/backstopjs/reference/regression_page_event_0_document_1_tablet.png b/backstopjs/reference/regression_page_event_0_document_1_tablet.png
diff --git a/backstopjs/reference/regression_page_executive-order_0_document_0_phone.png b/backstopjs/reference/regression_page_executive-order_0_document_0_phone.png
diff --git a/backstopjs/reference/regression_page_executive-order_0_document_1_tablet.png b/backstopjs/reference/regression_page_executive-order_0_document_1_tablet.png
diff --git a/backstopjs/reference/regression_page_form-page-example_0_document_0_phone.png b/backstopjs/reference/regression_page_form-page-example_0_document_0_phone.png
diff --git a/backstopjs/reference/regression_page_form-page-example_0_document_1_tablet.png b/backstopjs/reference/regression_page_form-page-example_0_document_1_tablet.png
diff --git a/...topjs/reference/regression_page_guide-section-all-fields_0_document_0_phone.png b/...topjs/reference/regression_page_guide-section-all-fields_0_document_0_phone.png
diff --git a/...opjs/reference/regression_page_guide-section-all-fields_0_document_1_tablet.png b/...opjs/reference/regression_page_guide-section-all-fields_0_document_1_tablet.png
diff --git a/backstopjs/reference/regression_page_guide_0_document_1_tablet.png b/backstopjs/reference/regression_page_guide_0_document_1_tablet.png
diff --git a/backstopjs/reference/regression_page_howto_0_document_0_phone.png b/backstopjs/reference/regression_page_howto_0_document_0_phone.png
diff --git a/backstopjs/reference/regression_page_howto_0_document_1_tablet.png b/backstopjs/reference/regression_page_howto_0_document_1_tablet.png
diff --git a/...nce/regression_page_information-details-preContent-media_0_document_0_phone.png b/...nce/regression_page_information-details-preContent-media_0_document_0_phone.png
diff --git a/...ce/regression_page_information-details-preContent-media_0_document_1_tablet.png b/...ce/regression_page_information-details-preContent-media_0_document_1_tablet.png
diff --git a/...ce/regression_page_information-details-table-of-contents_0_document_0_phone.png b/...ce/regression_page_information-details-table-of-contents_0_document_0_phone.png
diff --git a/...e/regression_page_information-details-table-of-contents_0_document_1_tablet.png b/...e/regression_page_information-details-table-of-contents_0_document_1_tablet.png
diff --git a/backstopjs/reference/regression_page_information-details_0_document_0_phone.png b/backstopjs/reference/regression_page_information-details_0_document_0_phone.png
diff --git a/backstopjs/reference/regression_page_information-details_0_document_1_tablet.png b/backstopjs/reference/regression_page_information-details_0_document_1_tablet.png
diff --git a/backstopjs/reference/regression_page_listing-links_0_document_0_phone.png b/backstopjs/reference/regression_page_listing-links_0_document_0_phone.png
diff --git a/backstopjs/reference/regression_page_listing-links_0_document_1_tablet.png b/backstopjs/reference/regression_page_listing-links_0_document_1_tablet.png
diff --git a/...topjs/reference/regression_page_location-general-content_0_document_0_phone.png b/...topjs/reference/regression_page_location-general-content_0_document_0_phone.png
diff --git a/...opjs/reference/regression_page_location-general-content_0_document_1_tablet.png b/...opjs/reference/regression_page_location-general-content_0_document_1_tablet.png
diff --git a/backstopjs/reference/regression_page_location-listing_0_document_0_phone.png b/backstopjs/reference/regression_page_location-listing_0_document_0_phone.png
diff --git a/backstopjs/reference/regression_page_location-listing_0_document_1_tablet.png b/backstopjs/reference/regression_page_location-listing_0_document_1_tablet.png
diff --git a/backstopjs/reference/regression_page_location-park-content_0_document_1_tablet.png b/backstopjs/reference/regression_page_location-park-content_0_document_1_tablet.png
diff --git a/backstopjs/reference/regression_page_organization-boards_0_document_1_tablet.png b/backstopjs/reference/regression_page_organization-boards_0_document_1_tablet.png
diff --git a/backstopjs/reference/regression_page_organization-detail_0_document_0_phone.png b/backstopjs/reference/regression_page_organization-detail_0_document_0_phone.png
diff --git a/backstopjs/reference/regression_page_organization-detail_0_document_1_tablet.png b/backstopjs/reference/regression_page_organization-detail_0_document_1_tablet.png
diff --git a/...reference/regression_page_organization-elected-official_0_document_1_tablet.png b/...reference/regression_page_organization-elected-official_0_document_1_tablet.png
diff --git a/backstopjs/reference/regression_page_organization_0_document_0_phone.png b/backstopjs/reference/regression_page_organization_0_document_0_phone.png
diff --git a/backstopjs/reference/regression_page_organization_0_document_1_tablet.png b/backstopjs/reference/regression_page_organization_0_document_1_tablet.png
diff --git a/backstopjs/reference/regression_page_page-alert_0_document_0_phone.png b/backstopjs/reference/regression_page_page-alert_0_document_0_phone.png
diff --git a/backstopjs/reference/regression_page_page-alert_0_document_1_tablet.png b/backstopjs/reference/regression_page_page-alert_0_document_1_tablet.png
diff --git a/backstopjs/reference/regression_page_people-listing_0_document_0_phone.png b/backstopjs/reference/regression_page_people-listing_0_document_0_phone.png
diff --git a/backstopjs/reference/regression_page_people-listing_0_document_1_tablet.png b/backstopjs/reference/regression_page_people-listing_0_document_1_tablet.png
diff --git a/...pjs/reference/regression_page_policy-advisory-directive_0_document_1_tablet.png b/...pjs/reference/regression_page_policy-advisory-directive_0_document_1_tablet.png
diff --git a/backstopjs/reference/regression_page_press-listing_0_document_0_phone.png b/backstopjs/reference/regression_page_press-listing_0_document_0_phone.png
diff --git a/backstopjs/reference/regression_page_press-listing_0_document_1_tablet.png b/backstopjs/reference/regression_page_press-listing_0_document_1_tablet.png
diff --git a/...topjs/reference/regression_page_press-release-with-image_0_document_0_phone.png b/...topjs/reference/regression_page_press-release-with-image_0_document_0_phone.png
diff --git a/...opjs/reference/regression_page_press-release-with-image_0_document_1_tablet.png b/...opjs/reference/regression_page_press-release-with-image_0_document_1_tablet.png
diff --git a/...topjs/reference/regression_page_press-release-with-video_0_document_0_phone.png b/...topjs/reference/regression_page_press-release-with-video_0_document_0_phone.png
diff --git a/...opjs/reference/regression_page_press-release-with-video_0_document_1_tablet.png b/...opjs/reference/regression_page_press-release-with-video_0_document_1_tablet.png
diff --git a/backstopjs/reference/regression_page_press-release_0_document_0_phone.png b/backstopjs/reference/regression_page_press-release_0_document_0_phone.png
diff --git a/backstopjs/reference/regression_page_press-release_0_document_1_tablet.png b/backstopjs/reference/regression_page_press-release_0_document_1_tablet.png
diff --git a/backstopjs/reference/regression_page_regulation_0_document_1_tablet.png b/backstopjs/reference/regression_page_regulation_0_document_1_tablet.png
diff --git a/backstopjs/reference/regression_page_rules-of-court_0_document_1_tablet.png b/backstopjs/reference/regression_page_rules-of-court_0_document_1_tablet.png
diff --git a/backstopjs/reference/regression_page_section-landing_0_document_0_phone.png b/backstopjs/reference/regression_page_section-landing_0_document_0_phone.png
diff --git a/backstopjs/reference/regression_page_section-landing_0_document_1_tablet.png b/backstopjs/reference/regression_page_section-landing_0_document_1_tablet.png
diff --git a/backstopjs/reference/regression_page_service_0_document_0_phone.png b/backstopjs/reference/regression_page_service_0_document_0_phone.png
diff --git a/backstopjs/reference/regression_page_service_0_document_1_tablet.png b/backstopjs/reference/regression_page_service_0_document_1_tablet.png
diff --git a/backstopjs/reference/regression_page_site-alert_0_document_0_phone.png b/backstopjs/reference/regression_page_site-alert_0_document_0_phone.png
diff --git a/backstopjs/reference/regression_page_site-alert_0_document_1_tablet.png b/backstopjs/reference/regression_page_site-alert_0_document_1_tablet.png
diff --git a/backstopjs/reference/regression_page_topic-your-government_0_document_0_phone.png b/backstopjs/reference/regression_page_topic-your-government_0_document_0_phone.png
diff --git a/backstopjs/reference/regression_page_topic-your-government_0_document_1_tablet.png b/backstopjs/reference/regression_page_topic-your-government_0_document_1_tablet.png
diff --git a/backstopjs/reference/regression_page_topic_0_document_0_phone.png b/backstopjs/reference/regression_page_topic_0_document_0_phone.png
diff --git a/backstopjs/reference/regression_page_topic_0_document_1_tablet.png b/backstopjs/reference/regression_page_topic_0_document_1_tablet.png
diff --git a/backstopjs/reference/regression_page_video-transcript_0_document_0_phone.png b/backstopjs/reference/regression_page_video-transcript_0_document_0_phone.png
diff --git a/backstopjs/reference/regression_page_video-transcript_0_document_1_tablet.png b/backstopjs/reference/regression_page_video-transcript_0_document_1_tablet.png
diff --git a/...pjs/reference/regression_template_01-content-types-alert_0_document_0_phone.png b/...pjs/reference/regression_template_01-content-types-alert_0_document_0_phone.png
diff --git a/...js/reference/regression_template_01-content-types-alert_0_document_1_tablet.png b/...js/reference/regression_template_01-content-types-alert_0_document_1_tablet.png
diff --git a/...opjs/reference/regression_template_01-content-types-bio_0_document_1_tablet.png b/...opjs/reference/regression_template_01-content-types-bio_0_document_1_tablet.png
diff --git a/...erence/regression_template_01-content-types-court-rules_0_document_1_tablet.png b/...erence/regression_template_01-content-types-court-rules_0_document_1_tablet.png
diff --git a/...egression_template_01-content-types-information-details_0_document_1_tablet.png b/...egression_template_01-content-types-information-details_0_document_1_tablet.png
diff --git a/.../reference/regression_template_01-content-types-location_0_document_0_phone.png b/.../reference/regression_template_01-content-types-location_0_document_0_phone.png
diff --git a/...regression_template_01-content-types-organization-detail_0_document_0_phone.png b/...regression_template_01-content-types-organization-detail_0_document_0_phone.png
diff --git a/...egression_template_01-content-types-organization-detail_0_document_1_tablet.png b/...egression_template_01-content-types-organization-detail_0_document_1_tablet.png
diff --git a/...ce/regression_template_01-content-types-policy-advisory_0_document_1_tablet.png b/...ce/regression_template_01-content-types-policy-advisory_0_document_1_tablet.png
diff --git a/.../reference/regression_template_01-content-types-services_0_document_0_phone.png b/.../reference/regression_template_01-content-types-services_0_document_0_phone.png
diff --git a/...reference/regression_template_01-content-types-services_0_document_1_tablet.png b/...reference/regression_template_01-content-types-services_0_document_1_tablet.png
diff --git a/backstopjs/reference/regression_template_single-column_0_document_0_phone.png b/backstopjs/reference/regression_template_single-column_0_document_0_phone.png
diff --git a/backstopjs/reference/regression_template_single-column_0_document_1_tablet.png b/backstopjs/reference/regression_template_single-column_0_document_1_tablet.png
diff --git a/...topjs/reference/regression_template_stacked-row-template_0_document_0_phone.png b/...topjs/reference/regression_template_stacked-row-template_0_document_0_phone.png
diff --git a/...opjs/reference/regression_template_stacked-row-template_0_document_1_tablet.png b/...opjs/reference/regression_template_stacked-row-template_0_document_1_tablet.png
diff --git a/...stopjs/reference/regression_template_two-column-reversed_0_document_0_phone.png b/...stopjs/reference/regression_template_two-column-reversed_0_document_0_phone.png
diff --git a/...topjs/reference/regression_template_two-column-reversed_0_document_1_tablet.png b/...topjs/reference/regression_template_two-column-reversed_0_document_1_tablet.png
diff --git a/backstopjs/reference/regression_template_two-column_0_document_0_phone.png b/backstopjs/reference/regression_template_two-column_0_document_0_phone.png
diff --git a/backstopjs/reference/regression_template_two-column_0_document_1_tablet.png b/backstopjs/reference/regression_template_two-column_0_document_1_tablet.png
diff --git a/release-notes.md b/release-notes.md
@@ -13,6 +13,16 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 **For example**
 - DP-1234: The short description text on a [service detail](http://mayflower.digital.mass.gov/?p=pages-detail-for-service-howto-location) page banner ([@organisms/by-template/page-banner](http://mayflower.digital.mass.gov/?p=organisms-page-banner)) should now render ([PR #493](https://github.com/massgov/mayflower/pull/493))
 
+## 5.25.0 (5/23/2018)
+
+### Changed
+- DP-8631: Provides twig blocks to support overrides and template mapping of data.
+- DP-8854: Update the footer template to match the one in Drupal.
+- DP-8949: Mayflower Subpatterns for General Teaser.
+
+### Fixed 
+- DP-9057 - Fix IE11 bug where featured image in mosaic was not appearing.
+
 ## 5.24.0 (5/16/2018)
 
 ### Fixed

diff --git a/styleguide/package.json b/styleguide/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@massds/mayflower",
   "description": "Open source UI components and visual style guide for Massachusetts government websites",
-  "version": "5.24.0",
+  "version": "5.25.0",
   "author": "Massachusetts Digital Services (MDS)",
   "repository": {
     "type": "git",

diff --git a/styleguide/source/_meta/_01-foot.twig b/styleguide/source/_meta/_01-foot.twig
@@ -1,4 +1,18 @@
 
+<script>
+  function googleTranslateElementInit() {
+    new google.translate.TranslateElement({pageLanguage: 'en', includedLanguages: '{{ languages }}', layout: google.translate.TranslateElement.InlineLayout.SIMPLE}, 'google_translate_element');
+    document.querySelector('#google_translate_element') !== null ? document.querySelector('#google_translate_element').classList.add('has-rendered') : '';
+  }
+  (function() {
+    var script = document.createElement('script');
+    script.src = "//translate.google.com/translate_a/element.js?cb=googleTranslateElementInit";
+    script.async = true;
+    element = document.getElementsByTagName('head')[0];
+    element.appendChild(script);
+  })();
+</script>
+
     <!--DO NOT REMOVE-->
     {{ patternLabFoot | raw }}
     <script>

diff --git a/styleguide/source/_patterns/02-molecules/general-teaser-emphasizedText.json b/styleguide/source/_patterns/02-molecules/general-teaser-emphasizedText.json
@@ -0,0 +1,7 @@
+{
+  "emphasizedText": [
+    "An emphasized text field",
+    "Another emphasized text field"
+  ]
+}
+
diff --git a/styleguide/source/_patterns/02-molecules/general-teaser-emphasizedText.md b/styleguide/source/_patterns/02-molecules/general-teaser-emphasizedText.md
@@ -0,0 +1,13 @@
+### Description
+Emphasized Text field in block wrapper for the [General Teaser](/?p=molecules-general-teaser)
+
+### Status
+* Stable as of TBA
+
+### Variables
+~~~
+generalTeaser : {
+  eyebrow:
+    type: string / optional
+}
+~~~
diff --git a/styleguide/source/_patterns/02-molecules/general-teaser-emphasizedText.twig b/styleguide/source/_patterns/02-molecules/general-teaser-emphasizedText.twig
@@ -0,0 +1,7 @@
+<div class="ma__general-teaser__emph-text-wrapper">
+  {% for item in emphasizedText %}
+    <span class="ma__general-teaser__emph-text">
+      {{ item }}
+    </span>
+  {% endfor %}
+</div>
diff --git a/styleguide/source/_patterns/02-molecules/general-teaser-eyebrow.json b/styleguide/source/_patterns/02-molecules/general-teaser-eyebrow.json
@@ -0,0 +1,3 @@
+{
+  "eyebrow": "Eyebrow"
+}
diff --git a/styleguide/source/_patterns/02-molecules/general-teaser-eyebrow.md b/styleguide/source/_patterns/02-molecules/general-teaser-eyebrow.md
@@ -0,0 +1,14 @@
+### Description
+Eyebrow field in block wrapper for the [General Teaser](/?p=molecules-general-teaser)
+
+### Status
+* Stable as of TBA
+
+### Variables
+~~~
+generalTeaser : {
+  emphasizedText: [
+    type: array of string / optional,
+  ],
+}
+~~~
diff --git a/styleguide/source/_patterns/02-molecules/general-teaser-eyebrow.twig b/styleguide/source/_patterns/02-molecules/general-teaser-eyebrow.twig
@@ -0,0 +1,3 @@
+<div class="ma__general-teaser__eyebrow">
+  <span>{{ eyebrow }}</span>
+</div>
diff --git a/styleguide/source/_patterns/02-molecules/general-teaser-title.json b/styleguide/source/_patterns/02-molecules/general-teaser-title.json
@@ -0,0 +1,9 @@
+{
+  "level": "",
+  "title" : {
+    "href": "#",
+    "text": "Link field for a title or name",
+    "info": "",
+    "property": ""
+  }
+}
diff --git a/styleguide/source/_patterns/02-molecules/general-teaser-title.md b/styleguide/source/_patterns/02-molecules/general-teaser-title.md
@@ -0,0 +1,20 @@
+### Description
+Title field in block wrapper for the [General Teaser](/?p=molecules-general-teaser)
+
+### Status
+* Stable as of TBA
+
+### Pattern Contains
+* Decorative Link
+
+
+### Variables
+~~~
+generalTeaser : {
+  title : {
+    type: decorativeLink / required
+  },
+  level:
+    type: number / optional
+}
+~~~
diff --git a/styleguide/source/_patterns/02-molecules/general-teaser-title.twig b/styleguide/source/_patterns/02-molecules/general-teaser-title.twig
@@ -0,0 +1,9 @@
+{% set headingLevel = level ? : 2 %}
+<h{{ headingLevel }} class="ma__general-teaser__title">
+  {% if title.href %}
+    {% set decorativeLink = title %}
+    {% include "@atoms/decorative-link.twig" %}
+  {% else %}
+    {{ title.text }}
+  {% endif %}
+</h{{ headingLevel }}>
diff --git a/styleguide/source/_patterns/02-molecules/general-teaser.md b/styleguide/source/_patterns/02-molecules/general-teaser.md
@@ -13,6 +13,10 @@ If a teaser image is provided, it will link to the title's href, if set.
 * Decorative Link
 * Image
 * Rich Text
+* [General Teaser Title](/?p=molecules-general-teaser-title)
+* [General Teaser Eyebrow](/?p=molecules-general-teaser-eyebrow)
+* [General Teaser Emphasized Text ](/?p=molecules-general-teaser-emphasizedText)
+
 
 ### Variables
 ~~~
@@ -21,7 +25,7 @@ generalTeaser : {
     type: string / optional
   image:
     type: image / optional
-  eyebrow: 
+  eyebrow:
     type: string / optional
   title : {
     type: decorativeLink / required

diff --git a/styleguide/source/_patterns/02-molecules/general-teaser.twig b/styleguide/source/_patterns/02-molecules/general-teaser.twig
@@ -2,71 +2,79 @@
 {% set layout = generalTeaser.layout ?: 'side-by-side' %}
 
 <section class="ma__general-teaser {{ imageClass }} {{ layout }}">
-  {% if generalTeaser.image %}
-    {% if generalTeaser.title.href %}
-      <a
+  {% block teaserImage %}
+    {% if generalTeaser.image %}
+
+      {% if generalTeaser.title.href %}
+        <a
         class="ma__general-teaser__image-wrapper"
         href="{{ generalTeaser.title.href }}"
         title="{{ generalTeaser.title.text }}">
-    {% else %}
-      <span class="ma__general-teaser__image-wrapper">
-    {% endif %}
-    {% set image = generalTeaser.image %}
-    {% include "@atoms/09-media/image.twig" %}
-    {% if generalTeaser.title.href %}
-      </a>
-    {% else %}
-      </span>
+      {% else %}
+        <span class="ma__general-teaser__image-wrapper">
+      {% endif %}
+
+      {% set image = generalTeaser.image %}
+      {% include "@atoms/09-media/image.twig" %}
+
+      {% if generalTeaser.title.href %}
+        </a>
+      {% else %}
+        </span>
+      {% endif %}
+
     {% endif %}
-  {% endif %}
+  {% endblock %}
 
   {% if layout == 'inline-image' %}
     <div class="ma__general-teaser__header">
   {% else %}
     <div class="ma__general-teaser__details">
   {% endif %}
+
+  {% block eyebrow %}
     {% if generalTeaser.eyebrow %}
-      <div class="ma__general-teaser__eyebrow">
-        <span>{{ generalTeaser.eyebrow }}</span>
-      </div>
+      {% set eyebrow = generalTeaser.eyebrow %}
+      {% include "@molecules/general-teaser-eyebrow.twig" %}
     {% endif %}
+  {% endblock %}
+
+  {% block title %}
     {% if generalTeaser.title.text %}
+      {% set title = generalTeaser.title %}
       {% set headingLevel = generalTeaser.level ? : 2 %}
-      <h{{ headingLevel }} class="ma__general-teaser__title">
-        {% if generalTeaser.title.href %}
-          {% set decorativeLink = generalTeaser.title %}
-          {% include "@atoms/decorative-link.twig" %}
-        {% else %}
-          {{ generalTeaser.title.text }}
-        {% endif %}
-      </h{{ headingLevel }}>
+      {% include "@molecules/general-teaser-title.twig" %}
     {% endif %}
+  {% endblock %}
+
+  {% block emphasizedText %}
     {% if generalTeaser.emphasizedText %}
-      <div class="ma__general-teaser__emph-text-wrapper">
-        {% for emphasizedText in generalTeaser.emphasizedText %}
-          <span class="ma__general-teaser__emph-text">
-            {{ emphasizedText }}
-          </span>
-        {% endfor %}
-      </div>
-    {% endif %}
-    {% if layout == 'inline-image' %}
-      </div><!-- end ma__general-teaser__header -->
-      <div class="ma__general-teaser__details">
+      {% set emphasizedText = generalTeaser.emphasizedText %}
+      {% include "@molecules/general-teaser-emphasizedText.twig" %}
     {% endif %}
+  {% endblock %}
+
+  {% if layout == 'inline-image' %}
+    </div><!-- end ma__general-teaser__header -->
+    <div class="ma__general-teaser__details">
+  {% endif %}
+
     {% if generalTeaser.contents and layout != 'contents-stacked' %}
       <div class="ma__general-teaser__contents">
         {% for content in generalTeaser.contents %}
           {% include content.path with content.data %}
         {% endfor %}
       </div>
     {% endif %}
-  </div>
+
+    </div><!-- ma__general-teaser__details -->
+
   {% if generalTeaser.contents and layout == 'contents-stacked' %}
     <div class="ma__general-teaser__contents">
       {% for content in generalTeaser.contents %}
         {% include content.path with content.data %}
       {% endfor %}
     </div>
   {% endif %}
+
 </section>
diff --git a/styleguide/source/_patterns/03-organisms/by-author/teaser-listing.twig b/styleguide/source/_patterns/03-organisms/by-author/teaser-listing.twig
@@ -19,8 +19,8 @@
     {% endif %}
     {% if teaserListing.description %}
       <div class="ma__teaser-listing__description">
-      {% set paragraph = teaserListing.description %}
-      {% include "@atoms/11-text/paragraph.twig" %}
+        {% set paragraph = teaserListing.description %}
+        {% include "@atoms/11-text/paragraph.twig" %}
       </div>
     {% endif %}
     {% if teaserListing.featuredItems %}
@@ -31,46 +31,48 @@
         {% endfor %}
       </div>
     {% endif %}
-    {% if teaserListing.items %}
-      {% if teaserListing.expandable %}
-        <ul class="ma__teaser-listing__items {{ columnClass }}">
-          {% for generalTeaser in teaserListing.items[:shownNumber] %}
-            {% block teaserListItem %}
-            <li class="ma__teaser-listing__item">
-              {% set generalTeaser = generalTeaser|merge({"level":teaserHeading}) %}
-              {% include "@molecules/general-teaser.twig" %}
-            </li>
-            {% endblock %}
-          {% endfor %}
-        </ul>
-        {% if teaserListing.items|length > shownNumber %}
-          <div class="ma__teaser-listing__extra js-accordion-content">
-            <ul class="ma__teaser-listing__items {{columnClass}}">
-            {% for generalTeaser in teaserListing.items[shownNumber:last] %}
+    {% block teaserListingItems %}
+      {% if teaserListing.items %}
+        {% if teaserListing.expandable %}
+          <ul class="ma__teaser-listing__items {{ columnClass }}">
+            {% for generalTeaser in teaserListing.items[:shownNumber] %}
+              {% block teaserListItem %}
+                <li class="ma__teaser-listing__item">
+                  {% set generalTeaser = generalTeaser|merge({"level":teaserHeading}) %}
+                  {% include "@molecules/general-teaser.twig" %}
+                </li>
+              {% endblock %}
+            {% endfor %}
+          </ul>
+          {% if teaserListing.items|length > shownNumber %}
+            <div class="ma__teaser-listing__extra js-accordion-content">
+              <ul class="ma__teaser-listing__items {{columnClass}}">
+                {% for generalTeaser in teaserListing.items[shownNumber:last] %}
+                  {{ block('teaserListItem') }}
+                {% endfor %}
+              </ul>
+            </div>
+            <button
+                class="ma__content-link ma__content-link--chevron ma__content-link__acordion-toggle js-accordion-link"
+                aria-label="{{ teaserListing.moreItemsLabel }}">
+              <span class="more">{{teaserListing.moreItemsLabel}}</span>
+              <span class="less">{{teaserListing.lessItemsLabel}}</span>
+            </button>
+          {% endif %}
+        {% else %}
+          <ul class="ma__teaser-listing__items {{ columnClass }}">
+            {% for generalTeaser in teaserListing.items %}
               {{ block('teaserListItem') }}
             {% endfor %}
-            </ul>
-          </div>
-          <button
-          class="ma__content-link ma__content-link--chevron ma__content-link__acordion-toggle js-accordion-link"
-          aria-label="{{ teaserListing.moreItemsLabel }}">
-            <span class="more">{{teaserListing.moreItemsLabel}}</span>
-            <span class="less">{{teaserListing.lessItemsLabel}}</span>
-          </button>
+          </ul>
         {% endif %}
-      {% else %}
-        <ul class="ma__teaser-listing__items {{ columnClass }}">
-          {% for generalTeaser in teaserListing.items %}
-            {{ block('teaserListItem') }}
-          {% endfor %}
-        </ul>
       {% endif %}
-    {% endif %}
+    {% endblock %}
     {% if teaserListing.more %}
       <div class="ma__teaser-listing__more">
         {% set link = teaserListing.more %}
         {% include "@atoms/11-text/link.twig" %}
       </div>
     {% endif %}
   </div>
-</section>
+</section>
diff --git a/styleguide/source/_patterns/03-organisms/by-template/footer.md b/styleguide/source/_patterns/03-organisms/by-template/footer.md
@@ -8,9 +8,7 @@ This is a site wide footer.
 * Floating Action
 * Footer Links
 * Social Links
-
-### JavaScript Used
-* This pattern includes JavaScript to generate the Google translate dropdown.
+* Privacy Policy
 
 ### Variables
 ~~~
@@ -25,4 +23,8 @@ footerLinks: {
 socialLinks {
   type: socialLinks / required
 }
+
+privacyPolicy {
+  type: privacyPolicy / required
+}
 ~~~