From 32c7a89ffc93ad08a32ad4941f374584a7e739d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bjo=CC=88rn=20Fromme?= <mail@bjo3rn.com>
Date: Mon, 29 Apr 2019 16:14:28 +0200
Subject: [PATCH] Adjust social media teaser styles

---
 .../Assets/scss/remix/_socialmedia.scss       | 32 -------------------
 .../Private/Assets/scss/remix/_teaserbox.scss |  3 +-
 .../Templates/SocialMedia/Feeds/List.html     |  4 +--
 3 files changed, 4 insertions(+), 35 deletions(-)

diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/remix/_socialmedia.scss b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/remix/_socialmedia.scss
index 0347a45a..e69de29b 100644
--- a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/remix/_socialmedia.scss
+++ b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/remix/_socialmedia.scss
@@ -1,32 +0,0 @@
-.socialmedia {}
-
-.tx-pb-social {
-
-  .socialmedia__items {
-    display: flex;
-    flex-wrap: wrap;
-    justify-content: flex-start;
-  }
-
-  .socialmedia__item {
-    float: none;
-    width: 100%;
-    margin-bottom: 20px;
-
-    @include mq($from: tablet) {
-      width: 48%;
-    }
-
-    @include mq($from: desktop) {
-      width: 23%;
-    }
-
-    .text {
-      background-color: rgba(black, 0.5);
-      font-size: 14px;
-      line-height: 18px;
-      height: auto;
-    }
-  }
-
-}
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/remix/_teaserbox.scss b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/remix/_teaserbox.scss
index ac7b2771..10aea3ac 100644
--- a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/remix/_teaserbox.scss
+++ b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/remix/_teaserbox.scss
@@ -192,7 +192,8 @@
   }
 
   &--fixed-height {
-    height: 220px;
+    height: 112px;
+    border-bottom: 12px solid white;
     overflow: hidden;
   }
 }
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Templates/SocialMedia/Feeds/List.html b/web/typo3conf/ext/ep_theme/Resources/Private/Templates/SocialMedia/Feeds/List.html
index b3a6b5c1..6879ece1 100644
--- a/web/typo3conf/ext/ep_theme/Resources/Private/Templates/SocialMedia/Feeds/List.html
+++ b/web/typo3conf/ext/ep_theme/Resources/Private/Templates/SocialMedia/Feeds/List.html
@@ -5,7 +5,7 @@
     
     <f:section name="main">
         <f:for each="{feeds}" as="feed">
-            <f:if condition="{feed.image}">
+            <f:if condition="{feed.image} and {feed.message}">
                 <div class="col-md-3">
                     <f:link.typolink class="teaserbox teaserbox--social" parameter="{feed.postUrl}" target="_blank" title="{feed.title}">
                         <div class="teaserbox__image teaserbox__image--social-media" style="background-image: url({feed.image})">
@@ -23,7 +23,7 @@
                             </f:switch>
                         </div>
                         <div class="teaserbox__main teaserbox__main--fixed-height">
-                            <p>{feed.postDate -> f:format.date(format: 'd.m.Y')}</p>
+                            <p>{feed.postDate -> f:format.date(format: 'd.m.Y')} @{feed.configuration.name}</p>
                             {feed.message -> f:format.crop(maxCharacters: '120') -> f:format.nl2br()}
                         </div>
                         <button class="button button--full teaserbox__button">{f:translate(key: 'tx_eptheme.label.teaserbutton.to_post', extensionName: 'ep_theme')}</button>