From f8f0fab80b8562fa7e4b27205cb40f348efd1237 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bjo=CC=88rn=20Fromme?= <fromme@dreipunktnull.com>
Date: Thu, 2 Jan 2020 15:17:01 +0100
Subject: [PATCH] Force whitespace to seperate subline from headline

---
 .../Resources/Private/Assets/scss/remix/_base.scss       | 9 ++++-----
 .../Resources/Private/Partials/Header/Header.html        | 4 ++--
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/remix/_base.scss b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/remix/_base.scss
index 045e3c50..b4939c78 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/remix/_base.scss
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/remix/_base.scss
@@ -222,13 +222,12 @@ h4 {
   text-transform: uppercase;
   font-weight: 300;
   letter-spacing: 2px;
-  line-height: 32px;
-  margin-bottom: -25px;
+  line-height: 24px;
+  padding-bottom: 8px;
 
   @include mq($from: tablet) {
-    display: inline-block;
-    line-height: 50px;
-    margin-bottom: 0;
+    line-height: 40px;
+    padding-bottom: 0;
     font-size: 16px;
   }
 }
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Header/Header.html b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Header/Header.html
index b0e0be6b..bc62745d 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Header/Header.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Header/Header.html
@@ -31,12 +31,12 @@
         </f:case>
         <f:case value="8">
             <h1 class="headline headline--primary headline--underlined{f:if(condition: subheader, then: ' headline--has-subline')}">
-                <f:if condition="{subheader}"><span class="headline__subline">{subheader -> f:format.raw()}</span><br></f:if>{header -> f:format.raw()}
+                <f:if condition="{subheader}"><span class="headline__subline">{subheader -> f:format.raw()}&nbsp;</span></f:if>{header -> f:format.raw()}
             </h1>
         </f:case>
         <f:case value="9">
             <h2 class="headline headline--secondary headline--underlined{f:if(condition: subheader, then: ' headline--has-subline')}">
-                <f:if condition="{subheader}"><span class="headline__subline">{subheader -> f:format.raw()}</span><br></f:if>{header -> f:format.raw()}
+                <f:if condition="{subheader}"><span class="headline__subline">{subheader -> f:format.raw()}&nbsp;</span></f:if>{header -> f:format.raw()}
             </h2>
         </f:case>
         <f:case value="100">