3208: Simplified media-section

os2display · Dec 15, 2024 · d51d094 · d51d094
1 parent dfbc91b
commit d51d094
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 22 deletions.
diff --git a/build/news-feed-config-develop.json b/build/news-feed-config-develop.json
@@ -4,8 +4,8 @@
   "id": "01JEWPAFF93YSF418TH72W1SBA",
   "description": "Mulighed for at vise nyhedsindhold.",
   "resources": {
-    "component": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/news-feed.js?ts=1734240677134",
-    "admin": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/news-feed-admin.json?ts=1734240677134",
+    "component": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/news-feed.js?ts=1734244724142",
+    "admin": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/news-feed-admin.json?ts=1734244724142",
     "schema": "",
     "assets": [],
     "options": {},

diff --git a/build/news-feed-config-main.json b/build/news-feed-config-main.json
@@ -4,8 +4,8 @@
   "id": "01JEWPAFF93YSF418TH72W1SBA",
   "description": "Mulighed for at vise nyhedsindhold.",
   "resources": {
-    "component": "https://raw.githubusercontent.com/os2display/display-templates/main/build/news-feed.js?ts=1734240677134",
-    "admin": "https://raw.githubusercontent.com/os2display/display-templates/main/build/news-feed-admin.json?ts=1734240677134",
+    "component": "https://raw.githubusercontent.com/os2display/display-templates/main/build/news-feed.js?ts=1734244724142",
+    "admin": "https://raw.githubusercontent.com/os2display/display-templates/main/build/news-feed-admin.json?ts=1734244724142",
     "schema": "",
     "assets": [],
     "options": {},

diff --git a/build/news-feed.js b/build/news-feed.js
diff --git a/src/news-feed/news-feed.js b/src/news-feed/news-feed.js
@@ -117,20 +117,18 @@ function NewsFeed({ slide, content, run, slideDone, executionId }) {
     return imageUrl;
   };
 
-  const image = currentPost ? getImageUrl(currentPost) : null;
+  const imageUrl = currentPost ? getImageUrl(currentPost) : null;
 
   return (
     <>
       {currentPost && (
         <div className="template-news-feed">
-          <div className="media-section">
-            <div
-              className={`image ${mediaContain ? "media-contain" : ""}`}
-              style={{
-                backgroundImage: image ? `url("${image}")` : "",
-              }}
-            />
-          </div>
+          <div
+            className={`media-section ${mediaContain ? "media-contain" : ""}`}
+            style={{
+              backgroundImage: imageUrl ? `url("${imageUrl}")` : "",
+            }}
+          />
           <div className="text-section">
             <h1 className="title">{currentPost.title}</h1>
             <div className="author">

diff --git a/src/news-feed/news-feed.scss b/src/news-feed/news-feed.scss
@@ -17,15 +17,10 @@
     height: 100%;
     width: 100%;
     background-color: var(--color-secondary);
+    background-size: cover;
+    background-position: top center;
 
-    .image {
-      height: 100%;
-      width: 100%;
-      background-size: cover;
-      background-position: top center;
-    }
-
-    .image.media-contain {
+    &.media-contain {
       background-size: contain;
       background-repeat: no-repeat;
     }