hr-design-system-handlebars 1.80.7 → 1.81.1

package/dist/views_static/components/content/copytext/components/infobox.hbs

@@ -3,7 +3,7 @@
     <span class="sr-only">{{loca "story_infobox_intro_sr" }}</span>
 
     {{~#if this.paragraphProperties.[0].title}}
-        <h3 class="text-lg sm480:text-2xl font-headingSerif dark:text-text-dark">{{this.paragraphProperties.[0].title}}</h3>
+        <h3 class="-mt-1 text-lg sm480:text-2xl font-headingSerif dark:text-text-dark">{{this.paragraphProperties.[0].title}}</h3>
     {{/if}}
 
     {{~#with this.paragraphBoxItem }}
@@ -13,41 +13,14 @@
                     <div class="w-full mr-0 sm:mr-5 sm:w-1/2 sm:float-left">
                 {{/unless}}
             {{/if}}
-            {{#if this.showPortrait.isTrue }}
-                {{~#if ../this.paragraphProperties.[0].title}}
-                    {{> components/content/copytext/components/image/figure
-                        _cssClass="mt-5 mb-0"
-                        _type="story"
-                        _variant="copytext-portrait"
-                        _noAr="true"
-                        _isWebview=../../_isWebview}}
-                {{else}}
-                    {{> components/content/copytext/components/image/figure
-                        _cssClass="my-0"
-                        _type="story"
-                        _variant="copytext-portrait"
-                        _noAr="true"
-                        _isWebview=../../_isWebview}}
-                {{/if}}
-            {{else}}
-                {{~#if ../this.paragraphProperties.[0].title}}
-                    {{> components/content/copytext/components/image/figure
-                        _cssClass="mt-5 mb-0"
-                        _cssClassCaption=""
-                        _type="story"
-                        _variant="100-copytext"
-                        _pictureAddClass="ar-16-9"
-                        _isWebview=../../_isWebview}}
-                {{else}}
-                    {{> components/content/copytext/components/image/figure
-                        _cssClass="my-0"
-                        _cssClassCaption=""
-                        _type="story"
-                        _variant="100-copytext"
-                        _pictureAddClass="ar-16-9"
-                        _isWebview=../../_isWebview}}
-                {{/if}}
-            {{/if}}
+            {{> components/content/copytext/components/image/figure
+                    _cssClass=(if ../this.paragraphProperties.[0].title "mt-5 mb-0" "my-0" )
+                    _type="story"
+                    _variant=(if this.showPortrait.isTrue "copytext-portrait" "100-copytext")
+                    _noAr=(if this.showPortrait.isTrue true false)
+                    _pictureAddClass=(if this.showPortrait.isTrue "" "ar-16-9")
+                    _cssClassCaption="mb-3"
+                    _isWebview=../../_isWebview}}
             {{#if ../paragraphProperties.[0].showFullSize }}
                 {{#unless this.showFullSize.isTrue }}
                     </div>
@@ -58,13 +31,13 @@
 
     {{#each this.text.split}}
         {{#if this.isText}}
-            <p class="copytextParagraphDS {{#if ../this.paragraphProperties.[0].title}}mt-4{{else}}{{#if ../this.paragraphBoxItem}}mt-4{{else}}-mt-0.5{{/if}}{{/if}} text-base sm480:text-lg sm480:leading-normal dark:text-text-dark">{{{this.text}}}</p>
+            <p class="mt-4 text-base copytextParagraphDS sm480:text-lg sm480:leading-normal dark:text-text-dark">{{{this.text}}}</p>
         {{/if}}
         {{#if this.isUl}}
-            <ul class="copytextParagraphDS {{#if ../this.paragraphProperties.[0].title}}mt-4{{else}}{{#if ../this.paragraphBoxItem}}mt-4{{else}}-mt-0.5{{/if}}{{/if}} overflow-hidden pl-9 text-base list-disc sm480:text-lg sm480:leading-normal dark:text-text-dark">{{{this.text}}}</ul>
+            <ul class="pl-5 mt-4 overflow-hidden text-base list-disc copytextParagraphDS sm480:text-lg sm480:leading-normal dark:text-text-dark">{{{this.text}}}</ul>
         {{/if}}
         {{#if this.isOl}}
-            <ol class="copytextParagraphDS {{#if ../this.paragraphProperties.[0].title}}mt-4{{else}}{{#if ../this.paragraphBoxItem}}mt-4{{else}}-mt-0.5{{/if}}{{/if}} overflow-hidden pl-9 text-base list-decimal sm480:text-lg sm480:leading-normal dark:text-text-dark">{{{this.text}}}</ol>
+            <ol class="pl-5 mt-4 overflow-hidden text-base list-decimal copytextParagraphDS sm480:text-lg sm480:leading-normal dark:text-text-dark">{{{this.text}}}</ol>
         {{/if}}
     {{/each}}
     {{~#block "subParagraphs"}}{{/block~}}

package/dist/views_static/components/page/components/commentlink.ssi.hbs

@@ -1,11 +1,11 @@
 <a class="text-xs sm480:text-sm font-headingSerif text-link hover:underline dark:text-link-dark" href="#commentList">
     {{> components/base/image/icon _icon="kommentar" _iconmap="icons" _addClass="mr-0.5 inline w-5 h-5 text-link dark:text-link-dark fill-current"}}
     <span class="sr-only">{{loca "comment_anchor_1"}}</span>
-    <span class="text-link">{{this.quantity}}</span>
+    <span>{{this.quantity}}</span>
     {{#if this.hasOneComment}}
-        <span class="text-link">{{loca "comment_label_text"}}</span>
+        <span>{{loca "comment_label_text"}}</span>
     {{else}}
-        <span class="text-link">{{loca "comment_label_text_many"}}</span>
+        <span>{{loca "comment_label_text_many"}}</span>
     {{/if}}
     <span class="sr-only">{{loca "comment_anchor_2"}}</span>
 </a>

package/dist/views_static/components/page/components/metadatabox.hbs

@@ -1,5 +1,5 @@
 {{#unless this.hideMetadatabox}}
-    <aside class="clear-both mt-5 border-y border-gray-scorpion">
+    <aside class="clear-both mt-5 border-y border-gray-scorpion dark:border-text-dark">
         <div class="flex clear-both w-full my-4 sm:my-4">
             <div class="self-center">
                 {{> components/page/components/author _hideFrom=false }}

package/package.json

@@ -6,7 +6,7 @@
     "license": "MIT",
     "main": "dist/index.js",
     "repository": "https://github.com/szuelch/hr-design-system-handlebars",
-    "version": "1.80.7",
+    "version": "1.81.1",
     "scripts": {
         "test": "echo \"Error: no test specified\" && exit 1",
         "storybook": "storybook dev -p 6006 public",

package/src/assets/brand/_default/conf/locatags.json

@@ -10,6 +10,7 @@
     "archive_content": "Dieser Inhalt ist zeitlich unbegrenzt verfügbar.",
     "backlink_title": "Zurück zum Artikel",
     "banner_image_copyright": "Banner Bild ©",
+    "broadcast": "Sendung",
     "close_button_alpine_click": "avStart = false; $dispatch('player_closed',{playerId: {0}})",
     "play_button_alpine_click": "playAndStop({0});/* $dispatch('stopotherplayers',{playerId: {0}}) */",
     "comment_anchor_1": "zu den ",
@@ -21,6 +22,7 @@
     "date_simple_at": "{0} Uhr",
     "date_published": "Veröffentlicht am {0} um {1} Uhr",
     "date_updated_fixed": "Stand: {0}, {1} Uhr",
+    "editorial_office": "Redaktion",
     "epg_program_supplier": "Zur Webseite",
     "event_calendar_no_events_available": "<strong>Hinweis:</strong><br />Es liegen aktuell noch keine Einträge für den gewählten Zeitraum vor.",
     "event_calendar_monthly_overview_link": "Zur Monats-Übersicht",

package/src/assets/brand/hessenschau/conf/locatags.merged.json

@@ -10,6 +10,7 @@
 	"archive_content": "Dieser Inhalt ist zeitlich unbegrenzt verfügbar.",
 	"backlink_title": "Zurück zum Artikel",
 	"banner_image_copyright": "Banner Bild ©",
+	"broadcast": "Sendung",
 	"close_button_alpine_click": "avStart = false; $dispatch('player_closed',{playerId: {0}})",
 	"play_button_alpine_click": "playAndStop({0});/* $dispatch('stopotherplayers',{playerId: {0}}) */",
 	"comment_anchor_1": "zu den ",
@@ -21,6 +22,7 @@
 	"date_simple_at": "{0} Uhr",
 	"date_published": "Veröffentlicht am {0} um {1} Uhr",
 	"date_updated_fixed": "Stand: {0}, {1} Uhr",
+	"editorial_office": "Redaktion",
 	"epg_program_supplier": "Zur Webseite",
 	"event_calendar_no_events_available": "<strong>Hinweis:</strong><br />Es liegen aktuell noch keine Einträge für den gewählten Zeitraum vor.",
 	"event_calendar_monthly_overview_link": "Zur Monats-Übersicht",

package/src/assets/brand/hr/conf/locatags.merged.json

@@ -10,6 +10,7 @@
 	"archive_content": "Dieser Inhalt ist zeitlich unbegrenzt verfügbar.",
 	"backlink_title": "Zurück zum Artikel",
 	"banner_image_copyright": "Banner Bild ©",
+	"broadcast": "Sendung",
 	"close_button_alpine_click": "avStart = false; $dispatch('player_closed',{playerId: {0}})",
 	"play_button_alpine_click": "playAndStop({0});/* $dispatch('stopotherplayers',{playerId: {0}}) */",
 	"comment_anchor_1": "zu den ",
@@ -21,6 +22,7 @@
 	"date_simple_at": "{0} Uhr",
 	"date_published": "Veröffentlicht am {0} um {1} Uhr",
 	"date_updated_fixed": "Stand: {0}, {1} Uhr",
+	"editorial_office": "Redaktion",
 	"epg_program_supplier": "Zur Webseite",
 	"event_calendar_no_events_available": "<strong>Hinweis:</strong><br />Es liegen aktuell noch keine Einträge für den gewählten Zeitraum vor.",
 	"event_calendar_monthly_overview_link": "Zur Monats-Übersicht",

package/src/assets/brand/hr-bigband/conf/locatags.merged.json

@@ -10,6 +10,7 @@
 	"archive_content": "Dieser Inhalt ist zeitlich unbegrenzt verfügbar.",
 	"backlink_title": "Zurück zum Artikel",
 	"banner_image_copyright": "Banner Bild ©",
+	"broadcast": "Sendung",
 	"close_button_alpine_click": "avStart = false; $dispatch('player_closed',{playerId: {0}})",
 	"play_button_alpine_click": "playAndStop({0});/* $dispatch('stopotherplayers',{playerId: {0}}) */",
 	"comment_anchor_1": "zu den ",
@@ -21,6 +22,7 @@
 	"date_simple_at": "{0} Uhr",
 	"date_published": "Veröffentlicht am {0} um {1} Uhr",
 	"date_updated_fixed": "Stand: {0}, {1} Uhr",
+	"editorial_office": "Redaktion",
 	"epg_program_supplier": "Zur Webseite",
 	"event_calendar_no_events_available": "<strong>Hinweis:</strong><br />Es liegen aktuell noch keine Einträge für den gewählten Zeitraum vor.",
 	"event_calendar_monthly_overview_link": "Zur Monats-Übersicht",

package/src/assets/brand/hr-fernsehen/conf/locatags.merged.json

@@ -10,6 +10,7 @@
 	"archive_content": "Dieser Inhalt ist zeitlich unbegrenzt verfügbar.",
 	"backlink_title": "Zurück zum Artikel",
 	"banner_image_copyright": "Banner Bild ©",
+	"broadcast": "Sendung",
 	"close_button_alpine_click": "avStart = false; $dispatch('player_closed',{playerId: {0}})",
 	"play_button_alpine_click": "playAndStop({0});/* $dispatch('stopotherplayers',{playerId: {0}}) */",
 	"comment_anchor_1": "zu den ",
@@ -21,6 +22,7 @@
 	"date_simple_at": "{0} Uhr",
 	"date_published": "Veröffentlicht am {0} um {1} Uhr",
 	"date_updated_fixed": "Stand: {0}, {1} Uhr",
+	"editorial_office": "Redaktion",
 	"epg_program_supplier": "Zur Webseite",
 	"event_calendar_no_events_available": "<strong>Hinweis:</strong><br />Es liegen aktuell noch keine Einträge für den gewählten Zeitraum vor.",
 	"event_calendar_monthly_overview_link": "Zur Monats-Übersicht",

package/src/assets/brand/hr-inforadio/conf/locatags.merged.json

@@ -10,6 +10,7 @@
 	"archive_content": "Dieser Inhalt ist zeitlich unbegrenzt verfügbar.",
 	"backlink_title": "Zurück zum Artikel",
 	"banner_image_copyright": "Banner Bild ©",
+	"broadcast": "Sendung",
 	"close_button_alpine_click": "avStart = false; $dispatch('player_closed',{playerId: {0}})",
 	"play_button_alpine_click": "playAndStop({0});/* $dispatch('stopotherplayers',{playerId: {0}}) */",
 	"comment_anchor_1": "zu den ",
@@ -21,6 +22,7 @@
 	"date_simple_at": "{0} Uhr",
 	"date_published": "Veröffentlicht am {0} um {1} Uhr",
 	"date_updated_fixed": "Stand: {0}, {1} Uhr",
+	"editorial_office": "Redaktion",
 	"epg_program_supplier": "Zur Webseite",
 	"event_calendar_no_events_available": "<strong>Hinweis:</strong><br />Es liegen aktuell noch keine Einträge für den gewählten Zeitraum vor.",
 	"event_calendar_monthly_overview_link": "Zur Monats-Übersicht",

package/src/assets/brand/hr-rundfunkrat/conf/locatags.merged.json

@@ -10,6 +10,7 @@
 	"archive_content": "Dieser Inhalt ist zeitlich unbegrenzt verfügbar.",
 	"backlink_title": "Zurück zum Artikel",
 	"banner_image_copyright": "Banner Bild ©",
+	"broadcast": "Sendung",
 	"close_button_alpine_click": "avStart = false; $dispatch('player_closed',{playerId: {0}})",
 	"play_button_alpine_click": "playAndStop({0});/* $dispatch('stopotherplayers',{playerId: {0}}) */",
 	"comment_anchor_1": "zu den ",
@@ -21,6 +22,7 @@
 	"date_simple_at": "{0} Uhr",
 	"date_published": "Veröffentlicht am {0} um {1} Uhr",
 	"date_updated_fixed": "Stand: {0}, {1} Uhr",
+	"editorial_office": "Redaktion",
 	"epg_program_supplier": "Zur Webseite",
 	"event_calendar_no_events_available": "<strong>Hinweis:</strong><br />Es liegen aktuell noch keine Einträge für den gewählten Zeitraum vor.",
 	"event_calendar_monthly_overview_link": "Zur Monats-Übersicht",

package/src/assets/brand/hr-sinfonieorchester/conf/locatags.merged.json

@@ -10,6 +10,7 @@
 	"archive_content": "Dieser Inhalt ist zeitlich unbegrenzt verfügbar.",
 	"backlink_title": "Zurück zum Artikel",
 	"banner_image_copyright": "Banner Bild ©",
+	"broadcast": "Sendung",
 	"close_button_alpine_click": "avStart = false; $dispatch('player_closed',{playerId: {0}})",
 	"play_button_alpine_click": "playAndStop({0});/* $dispatch('stopotherplayers',{playerId: {0}}) */",
 	"comment_anchor_1": "zu den ",
@@ -21,6 +22,7 @@
 	"date_simple_at": "{0} Uhr",
 	"date_published": "Veröffentlicht am {0} um {1} Uhr",
 	"date_updated_fixed": "Stand: {0}, {1} Uhr",
+	"editorial_office": "Redaktion",
 	"epg_program_supplier": "Zur Webseite",
 	"event_calendar_no_events_available": "<strong>Hinweis:</strong><br />Es liegen aktuell noch keine Einträge für den gewählten Zeitraum vor.",
 	"event_calendar_monthly_overview_link": "Zur Monats-Übersicht",

package/src/assets/brand/hr-werbung/conf/locatags.merged.json

@@ -10,6 +10,7 @@
 	"archive_content": "Dieser Inhalt ist zeitlich unbegrenzt verfügbar.",
 	"backlink_title": "Zurück zum Artikel",
 	"banner_image_copyright": "Banner Bild ©",
+	"broadcast": "Sendung",
 	"close_button_alpine_click": "avStart = false; $dispatch('player_closed',{playerId: {0}})",
 	"play_button_alpine_click": "playAndStop({0});/* $dispatch('stopotherplayers',{playerId: {0}}) */",
 	"comment_anchor_1": "zu den ",
@@ -21,6 +22,7 @@
 	"date_simple_at": "{0} Uhr",
 	"date_published": "Veröffentlicht am {0} um {1} Uhr",
 	"date_updated_fixed": "Stand: {0}, {1} Uhr",
+	"editorial_office": "Redaktion",
 	"epg_program_supplier": "Zur Webseite",
 	"event_calendar_no_events_available": "<strong>Hinweis:</strong><br />Es liegen aktuell noch keine Einträge für den gewählten Zeitraum vor.",
 	"event_calendar_monthly_overview_link": "Zur Monats-Übersicht",

package/src/assets/brand/hr1/conf/locatags.merged.json

@@ -10,6 +10,7 @@
 	"archive_content": "Dieser Inhalt ist zeitlich unbegrenzt verfügbar.",
 	"backlink_title": "Zurück zum Artikel",
 	"banner_image_copyright": "Banner Bild ©",
+	"broadcast": "Sendung",
 	"close_button_alpine_click": "avStart = false; $dispatch('player_closed',{playerId: {0}})",
 	"play_button_alpine_click": "playAndStop({0});/* $dispatch('stopotherplayers',{playerId: {0}}) */",
 	"comment_anchor_1": "zu den ",
@@ -21,6 +22,7 @@
 	"date_simple_at": "{0} Uhr",
 	"date_published": "Veröffentlicht am {0} um {1} Uhr",
 	"date_updated_fixed": "Stand: {0}, {1} Uhr",
+	"editorial_office": "Redaktion",
 	"epg_program_supplier": "Zur Webseite",
 	"event_calendar_no_events_available": "<strong>Hinweis:</strong><br />Es liegen aktuell noch keine Einträge für den gewählten Zeitraum vor.",
 	"event_calendar_monthly_overview_link": "Zur Monats-Übersicht",

package/src/assets/brand/hr2/conf/locatags.merged.json

@@ -10,6 +10,7 @@
 	"archive_content": "Dieser Inhalt ist zeitlich unbegrenzt verfügbar.",
 	"backlink_title": "Zurück zum Artikel",
 	"banner_image_copyright": "Banner Bild ©",
+	"broadcast": "Sendung",
 	"close_button_alpine_click": "avStart = false; $dispatch('player_closed',{playerId: {0}})",
 	"play_button_alpine_click": "playAndStop({0});/* $dispatch('stopotherplayers',{playerId: {0}}) */",
 	"comment_anchor_1": "zu den ",
@@ -21,6 +22,7 @@
 	"date_simple_at": "{0} Uhr",
 	"date_published": "Veröffentlicht am {0} um {1} Uhr",
 	"date_updated_fixed": "Stand: {0}, {1} Uhr",
+	"editorial_office": "Redaktion",
 	"epg_program_supplier": "Zur Webseite",
 	"event_calendar_no_events_available": "<strong>Hinweis:</strong><br />Es liegen aktuell noch keine Einträge für den gewählten Zeitraum vor.",
 	"event_calendar_monthly_overview_link": "Zur Monats-Übersicht",

package/src/assets/brand/hr3/conf/locatags.merged.json

@@ -10,6 +10,7 @@
 	"archive_content": "Dieser Inhalt ist zeitlich unbegrenzt verfügbar.",
 	"backlink_title": "Zurück zum Artikel",
 	"banner_image_copyright": "Banner Bild ©",
+	"broadcast": "Sendung",
 	"close_button_alpine_click": "avStart = false; $dispatch('player_closed',{playerId: {0}})",
 	"play_button_alpine_click": "playAndStop({0});/* $dispatch('stopotherplayers',{playerId: {0}}) */",
 	"comment_anchor_1": "zu den ",
@@ -21,6 +22,7 @@
 	"date_simple_at": "{0} Uhr",
 	"date_published": "Veröffentlicht am {0} um {1} Uhr",
 	"date_updated_fixed": "Stand: {0}, {1} Uhr",
+	"editorial_office": "Redaktion",
 	"epg_program_supplier": "Zur Webseite",
 	"event_calendar_no_events_available": "<strong>Hinweis:</strong><br />Es liegen aktuell noch keine Einträge für den gewählten Zeitraum vor.",
 	"event_calendar_monthly_overview_link": "Zur Monats-Übersicht",

package/src/assets/brand/hr4/conf/locatags.merged.json

@@ -10,6 +10,7 @@
 	"archive_content": "Dieser Inhalt ist zeitlich unbegrenzt verfügbar.",
 	"backlink_title": "Zurück zum Artikel",
 	"banner_image_copyright": "Banner Bild ©",
+	"broadcast": "Sendung",
 	"close_button_alpine_click": "avStart = false; $dispatch('player_closed',{playerId: {0}})",
 	"play_button_alpine_click": "playAndStop({0});/* $dispatch('stopotherplayers',{playerId: {0}}) */",
 	"comment_anchor_1": "zu den ",
@@ -21,6 +22,7 @@
 	"date_simple_at": "{0} Uhr",
 	"date_published": "Veröffentlicht am {0} um {1} Uhr",
 	"date_updated_fixed": "Stand: {0}, {1} Uhr",
+	"editorial_office": "Redaktion",
 	"epg_program_supplier": "Zur Webseite",
 	"event_calendar_no_events_available": "<strong>Hinweis:</strong><br />Es liegen aktuell noch keine Einträge für den gewählten Zeitraum vor.",
 	"event_calendar_monthly_overview_link": "Zur Monats-Übersicht",

package/src/assets/brand/you-fm/conf/locatags.merged.json

@@ -10,6 +10,7 @@
 	"archive_content": "Dieser Inhalt ist zeitlich unbegrenzt verfügbar.",
 	"backlink_title": "Zurück zum Artikel",
 	"banner_image_copyright": "Banner Bild ©",
+	"broadcast": "Sendung",
 	"close_button_alpine_click": "avStart = false; $dispatch('player_closed',{playerId: {0}})",
 	"play_button_alpine_click": "playAndStop({0});/* $dispatch('stopotherplayers',{playerId: {0}}) */",
 	"comment_anchor_1": "zu den ",
@@ -21,6 +22,7 @@
 	"date_simple_at": "{0} Uhr",
 	"date_published": "Veröffentlicht am {0} um {1} Uhr",
 	"date_updated_fixed": "Stand: {0}, {1} Uhr",
+	"editorial_office": "Redaktion",
 	"epg_program_supplier": "Zur Webseite",
 	"event_calendar_no_events_available": "<strong>Hinweis:</strong><br />Es liegen aktuell noch keine Einträge für den gewählten Zeitraum vor.",
 	"event_calendar_monthly_overview_link": "Zur Monats-Übersicht",

package/src/stories/views/components/content/content_footer/content_footer.hbs

@@ -1,10 +1,10 @@
 <footer class="flex flex-col mt-10 text-xs md:text-sm text-gray-scorpion dark:text-text-dark font-headingSerif{{#if _addClass}} {{_addClass}}{{/if}}">
     {{#with this.editorialStaffItems}}
         <p>
-            Redaktion:
+            <span>{{~loca "editorial_office"}}:</span>
             {{#each this}}
                 {{#if this.hasProfileLink}}
-                    {{#>components/base/link _link=this.link _css="text-link hover:underline"}}<span>{{../this.authorName~}}</span>{{/components/base/link~}}
+                    {{#>components/base/link _link=this.link _css="text-link dark:text-link-dark hover:underline"}}<span>{{../this.authorName~}}</span>{{/components/base/link~}}
                     {{~#with this.textAfterAuthor}}{{this}}{{/with}}{{~this.delimiter~}}
                 {{else}}
                     {{#with this.textAfterAuthor}}{{this}}{{/with}}{{this.delimiter}}
@@ -15,9 +15,9 @@
     {{~#with this.programReferenceAlt~}}
         {{~#if this.hasReference~}}
             <div>
-                Sendung:
+                <span>{{~loca "broadcast"}}:</span>
                 {{#if this.link}}
-                    {{#>components/base/link _link=this.link _css="text-link hover:underline"~}}
+                    {{#>components/base/link _link=this.link _css="text-link dark:text-link-dark hover:underline"~}}
                         <span>{{~ this.programLabel ~}}</span>{{/components/base/link~}}{{~#if this.date~}},
                         <span>
                                 <time datetime="{{#if this.displayWithTime}}{{this.date.htmlDateTime}}{{else}}{{this.date.date}}{{/if}}"

package/src/stories/views/components/content/copytext/components/contentbox/contentbox.hbs

@@ -1,12 +1,52 @@
-{{#if (isStorybook)}}  
-    {{> components/content/copytext/components/contentbox/storybook-contentbox }} 
-{{else}}            
-    <div class="border-y border-gray-boulder overflow-auto contentbox-box mt-13 mb-5 sm480:pb-7.5 pb-5 sm:px-0 px-5.5 {{#unless this.showFullSize.isTrue}} mt-7.5 mb-6 mr-0 sm:mr-6 md:w-6/12 float-left{{/unless}}">
-        {{~> components/base/a11y/hiddenText _locaTag="story_infobox_intro_sr" ~}}
-        {{#if this.title}}
-            <h3 class="mt-6 text-lg font-normal contentbox-title font-headingSerif dark:text-text-dark">{{this.title}}</h3>
-        {{/if}}         
-        {{> modules/story/copytext-contentbox ~}}
-        {{~> components/base/a11y/hiddenText _locaTag="story_infobox_outro_sr" ~}}
-    </div>
-{{/if}}
+{{#>components/content/copytext/components/common/paragraphbox_wrapper _showFullsize=this.showFullSize.isTrue}}
+
+    {{~> components/base/a11y/hiddenText _locaTag="story_infobox_intro_sr" ~}}
+
+    {{~#if this.title}}
+        <h3 class="-mt-1 text-lg sm480:text-2xl font-headingSerif dark:text-text-dark">{{this.title}}</h3>
+    {{/if}}
+
+    {{~#with this.copytextParagraph.[0].paragraphBoxItem }}
+        {{~#if this.isImage}}
+            {{#if ../this.showFullSize.isTrue }}
+                {{#unless this.showFullSize.isTrue }}
+                    <div class="w-full mr-0 sm:mr-5 sm:w-1/2 sm:float-left">
+                {{/unless}}
+            {{/if}}
+            {{> components/content/copytext/components/image/figure
+                    _cssClass=(if ../this.title "mt-5 mb-0" "my-0" )
+                    _type="story"
+                    _variant=(if this.showPortrait.isTrue "copytext-portrait" "100-copytext")
+                    _noAr=(if this.showPortrait.isTrue true false)
+                    _pictureAddClass=(if this.showPortrait.isTrue "" "ar-16-9")
+                    _cssClassCaption="mb-3"
+                    _isWebview=../../_isWebview}}
+            {{#if ../this.showFullSize.isTrue }}
+                {{#unless this.showFullSize.isTrue }}
+                    </div>
+                {{/unless}}
+            {{/if}}
+        {{/if~}}
+    {{/with}}
+
+    {{#with this.copytext}}
+        {{#each this.paragraph}}
+            {{#each this.text.split}}
+                {{#if this.isText}}
+                    <p class="mt-4 text-base copytextParagraphDS sm480:text-lg sm480:leading-normal dark:text-text-dark">{{{this.text}}}</p>
+                {{/if}}
+                {{#if this.isUl}}
+                    <ul class="pl-5 mt-4 overflow-hidden text-base list-disc copytextParagraphDS sm480:text-lg sm480:leading-normal dark:text-text-dark">{{{this.text}}}</ul>
+                {{/if}}
+                {{#if this.isOl}}
+                    <ol class="pl-5 mt-4 overflow-hidden text-base list-decimal copytextParagraphDS sm480:text-lg sm480:leading-normal dark:text-text-dark">{{{this.text}}}</ol>
+                {{/if}}
+            {{/each}}
+        {{/each}}
+    {{/with}}
+
+    {{~#block "subParagraphs"}}{{/block~}}
+
+    {{~> components/base/a11y/hiddenText _locaTag="story_infobox_outro_sr" ~}}
+
+{{/components/content/copytext/components/common/paragraphbox_wrapper}}

package/src/stories/views/components/content/copytext/components/infobox.hbs

@@ -3,7 +3,7 @@
     <span class="sr-only">{{loca "story_infobox_intro_sr" }}</span>
 
     {{~#if this.paragraphProperties.[0].title}}
-        <h3 class="text-lg sm480:text-2xl font-headingSerif dark:text-text-dark">{{this.paragraphProperties.[0].title}}</h3>
+        <h3 class="-mt-1 text-lg sm480:text-2xl font-headingSerif dark:text-text-dark">{{this.paragraphProperties.[0].title}}</h3>
     {{/if}}
 
     {{~#with this.paragraphBoxItem }}
@@ -13,41 +13,14 @@
                     <div class="w-full mr-0 sm:mr-5 sm:w-1/2 sm:float-left">
                 {{/unless}}
             {{/if}}
-            {{#if this.showPortrait.isTrue }}
-                {{~#if ../this.paragraphProperties.[0].title}}
-                    {{> components/content/copytext/components/image/figure
-                        _cssClass="mt-5 mb-0"
-                        _type="story"
-                        _variant="copytext-portrait"
-                        _noAr="true"
-                        _isWebview=../../_isWebview}}
-                {{else}}
-                    {{> components/content/copytext/components/image/figure
-                        _cssClass="my-0"
-                        _type="story"
-                        _variant="copytext-portrait"
-                        _noAr="true"
-                        _isWebview=../../_isWebview}}
-                {{/if}}
-            {{else}}
-                {{~#if ../this.paragraphProperties.[0].title}}
-                    {{> components/content/copytext/components/image/figure
-                        _cssClass="mt-5 mb-0"
-                        _cssClassCaption=""
-                        _type="story"
-                        _variant="100-copytext"
-                        _pictureAddClass="ar-16-9"
-                        _isWebview=../../_isWebview}}
-                {{else}}
-                    {{> components/content/copytext/components/image/figure
-                        _cssClass="my-0"
-                        _cssClassCaption=""
-                        _type="story"
-                        _variant="100-copytext"
-                        _pictureAddClass="ar-16-9"
-                        _isWebview=../../_isWebview}}
-                {{/if}}
-            {{/if}}
+            {{> components/content/copytext/components/image/figure
+                    _cssClass=(if ../this.paragraphProperties.[0].title "mt-5 mb-0" "my-0" )
+                    _type="story"
+                    _variant=(if this.showPortrait.isTrue "copytext-portrait" "100-copytext")
+                    _noAr=(if this.showPortrait.isTrue true false)
+                    _pictureAddClass=(if this.showPortrait.isTrue "" "ar-16-9")
+                    _cssClassCaption="mb-3"
+                    _isWebview=../../_isWebview}}
             {{#if ../paragraphProperties.[0].showFullSize }}
                 {{#unless this.showFullSize.isTrue }}
                     </div>
@@ -58,13 +31,13 @@
 
     {{#each this.text.split}}
         {{#if this.isText}}
-            <p class="copytextParagraphDS {{#if ../this.paragraphProperties.[0].title}}mt-4{{else}}{{#if ../this.paragraphBoxItem}}mt-4{{else}}-mt-0.5{{/if}}{{/if}} text-base sm480:text-lg sm480:leading-normal dark:text-text-dark">{{{this.text}}}</p>
+            <p class="mt-4 text-base copytextParagraphDS sm480:text-lg sm480:leading-normal dark:text-text-dark">{{{this.text}}}</p>
         {{/if}}
         {{#if this.isUl}}
-            <ul class="copytextParagraphDS {{#if ../this.paragraphProperties.[0].title}}mt-4{{else}}{{#if ../this.paragraphBoxItem}}mt-4{{else}}-mt-0.5{{/if}}{{/if}} overflow-hidden pl-9 text-base list-disc sm480:text-lg sm480:leading-normal dark:text-text-dark">{{{this.text}}}</ul>
+            <ul class="pl-5 mt-4 overflow-hidden text-base list-disc copytextParagraphDS sm480:text-lg sm480:leading-normal dark:text-text-dark">{{{this.text}}}</ul>
         {{/if}}
         {{#if this.isOl}}
-            <ol class="copytextParagraphDS {{#if ../this.paragraphProperties.[0].title}}mt-4{{else}}{{#if ../this.paragraphBoxItem}}mt-4{{else}}-mt-0.5{{/if}}{{/if}} overflow-hidden pl-9 text-base list-decimal sm480:text-lg sm480:leading-normal dark:text-text-dark">{{{this.text}}}</ol>
+            <ol class="pl-5 mt-4 overflow-hidden text-base list-decimal copytextParagraphDS sm480:text-lg sm480:leading-normal dark:text-text-dark">{{{this.text}}}</ol>
         {{/if}}
     {{/each}}
     {{~#block "subParagraphs"}}{{/block~}}

package/src/stories/views/components/page/components/commentlink.ssi.hbs

@@ -1,11 +1,11 @@
 <a class="text-xs sm480:text-sm font-headingSerif text-link hover:underline dark:text-link-dark" href="#commentList">
     {{> components/base/image/icon _icon="kommentar" _iconmap="icons" _addClass="mr-0.5 inline w-5 h-5 text-link dark:text-link-dark fill-current"}}
     <span class="sr-only">{{loca "comment_anchor_1"}}</span>
-    <span class="text-link">{{this.quantity}}</span>
+    <span>{{this.quantity}}</span>
     {{#if this.hasOneComment}}
-        <span class="text-link">{{loca "comment_label_text"}}</span>
+        <span>{{loca "comment_label_text"}}</span>
     {{else}}
-        <span class="text-link">{{loca "comment_label_text_many"}}</span>
+        <span>{{loca "comment_label_text_many"}}</span>
     {{/if}}
     <span class="sr-only">{{loca "comment_anchor_2"}}</span>
 </a>

package/src/stories/views/components/page/components/metadatabox.hbs

@@ -1,5 +1,5 @@
 {{#unless this.hideMetadatabox}}
-    <aside class="clear-both mt-5 border-y border-gray-scorpion">
+    <aside class="clear-both mt-5 border-y border-gray-scorpion dark:border-text-dark">
         <div class="flex clear-both w-full my-4 sm:my-4">
             <div class="self-center">
                 {{> components/page/components/author _hideFrom=false }}

package/dist/views/components/content/copytext/components/contentbox/storybook-contentbox.hbs

@@ -1,58 +0,0 @@
-{{#>components/content/copytext/components/common/paragraphbox_wrapper _showFullsize=this.showFullSize.isTrue}}
-    
-    {{~> components/base/a11y/hiddenText _locaTag="story_infobox_intro_sr" ~}}
-    
-    <h3 class="text-lg sm480:text-2xl font-headingSerif dark:text-text-dark">{{this.title}}</h3>
-
-    {{~#with this.copytextParagraph.[0].paragraphBoxItem }}
-        {{~#if this.isImage}}
-            {{#if ../this.showFullSize.isTrue }}
-                {{#unless this.showFullSize.isTrue }}
-                    <div class="w-full mr-0 sm:mr-5 sm:w-1/2 sm:float-left">
-                {{/unless}}
-            {{/if}}
-            {{#if this.showPortrait.isTrue }}
-                {{> components/content/copytext/components/image/figure 
-                    _cssClass=""
-                    _type="story"
-                    _variant="copytext-portrait"
-                    _noAr="true"
-                    _isWebview=../../_isWebview}}
-            {{else}}
-                {{> components/content/copytext/components/image/figure 
-                    _cssClass="mt-5 mb-0"
-                    _cssClassCaption=""
-                    _type="story"
-                    _variant="100-copytext"
-                    _pictureAddClass="ar-16-9"
-                    _isWebview=../../_isWebview}}
-            {{/if}}
-            {{#if ../this.showFullSize.isTrue }}
-                {{#unless this.showFullSize.isTrue }}
-                    </div>
-                {{/unless}}
-            {{/if}}
-        {{/if~}}
-    {{/with}}
-
-    {{#with this.copytext}}
-        {{#each this.paragraph}}
-            {{~#each this.text.split }}
-                {{#if this.isText}}
-                    <p class="mt-4 text-base sm480:text-lg sm480:leading-normal dark:text-text-dark">{{{this.text}}}</p>
-                {{/if}}
-                {{#if this.isUl}}
-                    <ul class="mt-4 ml-5 text-base list-disc sm480:text-lg sm480:leading-normal dark:text-text-dark">{{{this.text}}}</ul>
-                {{/if}}
-                {{#if this.isOl}}
-                    <ol class="mt-4 ml-5 text-base list-decimal sm480:text-lg sm480:leading-normal dark:text-text-dark">{{{this.text}}}</ol>
-                {{/if}}
-            {{/each}}
-        {{/each}}
-    {{/with}}
-    
-    {{~#block "subParagraphs"}}{{/block~}}
-
-    {{~> components/base/a11y/hiddenText _locaTag="story_infobox_outro_sr" ~}}
-    
-{{/components/content/copytext/components/common/paragraphbox_wrapper}}