Merge branch 'master' into 'production'

Master to Production merge: fixed news feed image

See merge request sahkoinsinoorikilta/vtmk/web2.0-frontend!52

src/views/FeedPage/FeedPageView.tsx

@@ -12,7 +12,6 @@ interface FeedPageViewProps {
 }
 
 const StyledTextSection = styled(TextSection)`
-  margin: auto;
   align-items: center;
 
   & > h1 {
@@ -21,6 +20,10 @@ const StyledTextSection = styled(TextSection)`
       color: ${colors.orange1};
     }
   }
+
+  & > div {
+    margin: auto;
+  }
 `;
 
 const Content = styled(MarkdownStyles)`
@@ -36,13 +39,16 @@ const FeedPageView: React.FC<FeedPageViewProps> = ({ post }) => {
         <p>
           {post.description_fi}
         </p>
+        {post.image && (
           <Image
-          src={post.image || post.tags[0].icon}
+            src={post.image}
             alt={post.title_fi}
+            objectFit="scale-down"
             layout="responsive"
-          width={0}
-          height={0}
+            width={16}
+            height={9}
           />
+        )}
       </h1>
       <div>
         <Content source={post.content_fi} escapeHtml={false} />