From 2d0c4c76eb2c41bfd657a92a944360e69297e766 Mon Sep 17 00:00:00 2001
From: Daniel Scalzi <d_scalzi@yahoo.com>
Date: Wed, 20 Jun 2018 09:12:44 -0400
Subject: [PATCH] Enhanced News UI.

Added a drop shadow so that the news no longer scrolls into nothing.
Tweaked several styles to make the UI look a lot better.
---
 app/assets/css/launcher.css      | 63 +++++++++++++++++++++++++++-----
 app/assets/js/scripts/landing.js | 31 ++++++++++------
 app/landing.ejs                  |  2 +-
 3 files changed, 73 insertions(+), 23 deletions(-)

diff --git a/app/assets/css/launcher.css b/app/assets/css/launcher.css
index caf1178..b73efb0 100644
--- a/app/assets/css/launcher.css
+++ b/app/assets/css/launcher.css
@@ -1880,36 +1880,60 @@ input:checked + .toggleSwitchSlider:before {
 /* News content container. */
 #newsContent {
     height: 82vh;
-    width: 82vw;
+    width: 100%;
     display: flex;
     -webkit-user-select: initial;
+    position: relative;
+}
+
+/* Drop shadow displayed when content is scrolled out of view. */
+#newsContent:before {
+    content: '';
+    background: linear-gradient(rgba(0, 0, 0, 0.25), transparent);
+    width: 100%;
+    height: 5px;
+    position: absolute;
+    opacity: 0;
+    transition: opacity 0.25s ease;
+}
+#newsContent[scrolled]:before {
+    opacity: 1;
 }
 
 /* News article status container (left). */
 #newsStatusContainer {
-    width: 25%;
+    width: calc(30% - 60px);
     height: calc(100% - 30px);
-    padding: 15px;
+    padding: 15px 15px 15px 45px;
     display: flex;
     flex-direction: column;
     justify-content: space-between;
+    position: relative;
 }
 
 /* News status content. */
 #newsStatusContent {
     display: flex;
     flex-direction: column;
+    align-items: flex-end;
+}
+
+/* News title wrapper. */
+#newsTitleContainer {
+    display: flex;
+    max-width: 90%;
 }
 
 /* News article title styles. */
 #newsArticleTitle {
-    font-size: 20px;
+    font-size: 18px;
     font-weight: bold;
     font-family: 'Avenir Medium';
     color: white;
     text-decoration: none;
     transition: 0.25s ease;
     outline: none;
+    text-align: right;
 }
 #newsArticleTitle:hover,
 #newsArticleTitle:focus {
@@ -1926,6 +1950,13 @@ input:checked + .toggleSwitchSlider:before {
     flex-direction: column;
 }
 
+/* Date and author wrappers. */
+#newsArticleDateWrapper,
+#newsArticleAuthorWrapper {
+    display: flex;
+    justify-content: flex-end;
+}
+
 /* Date and author shared styles. */
 #newsArticleDate,
 #newsArticleAuthor {
@@ -1957,6 +1988,7 @@ input:checked + .toggleSwitchSlider:before {
     text-decoration: none;
     transition: 0.25s ease;
     outline: none;
+    text-align: right;
 }
 #newsArticleComments:focus,
 #newsArticleComments:hover {
@@ -1968,20 +2000,20 @@ input:checked + .toggleSwitchSlider:before {
 
 /* Article content container (right). */
 #newsArticleContainer {
-    width: 75%;
+    width: calc(100% - 25px);
     height: 100%;
+    margin: 0px 0px 0px 25px;
 }
 
 /* Article content styles. */
 #newsArticleContentScrollable {
     font-size: 12px;
-    max-width: 80%;
-    margin: 25px 35px 0px 25px;
     overflow-y: scroll;
-    height: calc(100% - 25px);
+    height: 100%;
     padding: 0px 15px 0px 15px;
 }
-#newsArticleContentScrollable img {
+#newsArticleContentScrollable img,
+#newsArticleContentScrollable iframe {
     max-width: 95%;
     display: block;
     margin: 0 auto;
@@ -2009,8 +2041,16 @@ input:checked + .toggleSwitchSlider:before {
     box-shadow: inset 0 0 10px rgba(255, 255, 255, 0.50);
 }
 
+#newsArticleContentWrapper {
+    width: 80%;
+}
+
+.newsArticleSpacerTop {
+    height: 15px;
+}
+
 /* Div to add spacing at the end of a news article. */
-.newsArticleSpacer {
+.newsArticleSpacerBot {
     height: 30px;
 }
 
@@ -2021,6 +2061,9 @@ input:checked + .toggleSwitchSlider:before {
     align-items: center;
     margin-bottom: 10px;
     -webkit-user-select: none;
+    position: absolute;
+    bottom: 15px;
+    right: 0px;
 }
 
 /* Navigation status span. */
diff --git a/app/assets/js/scripts/landing.js b/app/assets/js/scripts/landing.js
index c62b3a0..c08c013 100644
--- a/app/assets/js/scripts/landing.js
+++ b/app/assets/js/scripts/landing.js
@@ -21,17 +21,6 @@ const launch_details_text     = document.getElementById('launch_details_text')
 const server_selection_button = document.getElementById('server_selection_button')
 const user_text               = document.getElementById('user_text')
 
-// News Elements
-const newsContent             = document.getElementById('newsContent')
-const newsArticleTitle        = document.getElementById('newsArticleTitle')
-const newsArticleDate         = document.getElementById('newsArticleDate')
-const newsArticleAuthor       = document.getElementById('newsArticleAuthor')
-const newsArticleComments     = document.getElementById('newsArticleComments')
-const newsNavigationStatus    = document.getElementById('newsNavigationStatus')
-const newsArticleContent      = document.getElementById('newsArticleContentScrollable')
-const newsErrorContainer      = document.getElementById('newsErrorContainer')
-const nELoadSpan              = document.getElementById('nELoadSpan')
-
 /* Launch Progress Wrapper Functions */
 
 /**
@@ -722,6 +711,16 @@ function dlAsync(login = true){
  * News Loading Functions
  */
 
+// DOM Cache
+const newsContent                   = document.getElementById('newsContent')
+const newsArticleTitle              = document.getElementById('newsArticleTitle')
+const newsArticleDate               = document.getElementById('newsArticleDate')
+const newsArticleAuthor             = document.getElementById('newsArticleAuthor')
+const newsArticleComments           = document.getElementById('newsArticleComments')
+const newsNavigationStatus          = document.getElementById('newsNavigationStatus')
+const newsArticleContentScrollable  = document.getElementById('newsArticleContentScrollable')
+const nELoadSpan                    = document.getElementById('nELoadSpan')
+
 // News slide caches.
 let newsActive = false
 let newsGlideCount = 0
@@ -835,6 +834,14 @@ newsErrorRetry.onclick = () => {
     })
 }
 
+newsArticleContentScrollable.onscroll = (e) => {
+    if(e.target.scrollTop > Number.parseFloat($('.newsArticleSpacerTop').css('height'))){
+        newsContent.setAttribute('scrolled', '')
+    } else {
+        newsContent.removeAttribute('scrolled')
+    }
+}
+
 /**
  * Reload the news without restarting.
  * 
@@ -984,7 +991,7 @@ function displayArticle(articleObject, index){
     newsArticleDate.innerHTML = articleObject.date
     newsArticleComments.innerHTML = articleObject.comments
     newsArticleComments.href = articleObject.commentsLink
-    newsArticleContent.innerHTML = articleObject.content + '<div class="newsArticleSpacer"></div>'
+    newsArticleContentScrollable.innerHTML = '<div id="newsArticleContentWrapper"><div class="newsArticleSpacerTop"></div>' + articleObject.content + '<div class="newsArticleSpacerBot"></div></div>'
     newsNavigationStatus.innerHTML = index + ' of ' + newsArr.length
     newsContent.setAttribute('article', index-1)
 }
diff --git a/app/landing.ejs b/app/landing.ejs
index d592da7..1697ad5 100644
--- a/app/landing.ejs
+++ b/app/landing.ejs
@@ -169,7 +169,7 @@
                         <div id="newsArticleDateWrapper">
                             <span id="newsArticleDate">Mar 15, 44 BC, 9:14 AM</span>
                         </div>
-                        <div id="newsArticleTitleWrapper">
+                        <div id="newsArticleAuthorWrapper">
                             <span id="newsArticleAuthor">by Cicero</span>
                         </div>
                         <a href="#" id="newsArticleComments">0 Comments</a>