From 136d51e2bc1f859fce5e7c6298a36ce49756305c Mon Sep 17 00:00:00 2001
From: Bastard Operator <bofh@nogafam.es>
Date: Wed, 30 Dec 2020 20:14:48 +0100
Subject: [PATCH] Improved UI when first loading WebApp (you could see the
 no-script base blue theme) + some cleanup

---
 src/routes/_components/Nav.html                  | 5 +++--
 src/routes/_components/status/StatusContent.html | 2 +-
 src/routes/_components/status/StatusPoll.html    | 6 +++---
 src/routes/_components/status/StatusSidebar.html | 6 +++---
 static/fedilove-no-react.js                      | 5 +++++
 5 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/routes/_components/Nav.html b/src/routes/_components/Nav.html
index 5b0cc576..64eb88ea 100644
--- a/src/routes/_components/Nav.html
+++ b/src/routes/_components/Nav.html
@@ -1,5 +1,6 @@
 <nav id="main-nav" class="main-nav">
-	<ul class="main-nav-ul">
+  <div id="dummy-nav" style="height: 5em;"></div>
+	<ul class="main-nav-ul" style="display: none">
     {#each $navPages as navPage (navPage.href)}
       <li class="main-nav-li">
         <NavItem
@@ -43,7 +44,7 @@
 	.main-nav {
     box-sizing: border-box;
 		border-bottom: var(--nav-border-bottom) solid var(--nav-border);
-		background: var(--nav-bg);
+		background: #ff0759;
 		position: fixed;
 		left: 0;
 		right: 0;
diff --git a/src/routes/_components/status/StatusContent.html b/src/routes/_components/status/StatusContent.html
index 7362565d..b89ab180 100644
--- a/src/routes/_components/status/StatusContent.html
+++ b/src/routes/_components/status/StatusContent.html
@@ -99,7 +99,7 @@
     },
     store: () => store,
     computed: {
-      computedClass: ({ isStatusInOwnThread, isStatusInNotification, shown }) => {
+      computedClass: ({ isStatusInNotification, shown }) => {
         return classname(
           'status-content',
           isStatusInNotification && 'status-in-notification',
diff --git a/src/routes/_components/status/StatusPoll.html b/src/routes/_components/status/StatusPoll.html
index 56f68a9c..bdc71a63 100644
--- a/src/routes/_components/status/StatusPoll.html
+++ b/src/routes/_components/status/StatusPoll.html
@@ -299,14 +299,14 @@
       expiresAtAbsoluteFormatted: ({ expiresAtTS }) => absoluteDateFormatter.format(expiresAtTS),
       expiryText: ({ expired }) => expired ? 'intl.expired' : 'intl.expires',
       refreshElementId: ({ uuid }) => `poll-refresh-${uuid}`,
-      useNarrowSize: ({ $isMobileSize, expired, isStatusInOwnThread }) => (
-        !isStatusInOwnThread && $isMobileSize && !expired
+      useNarrowSize: ({ $isMobileSize, expired }) => (
+        $isMobileSize && !expired
       ),
       formDisabled: ({ choices }) => !choices.length,
       votesText: ({ votesCount }) => (
         formatIntl('intl.voteCount', { count: votesCount })
       ),
-      computedClass: ({ isStatusInNotification, isStatusInOwnThread, loading, shown }) => (
+      computedClass: ({ isStatusInNotification, loading, shown }) => (
         classname(
           'poll',
           isStatusInNotification && 'status-in-notification',
diff --git a/src/routes/_components/status/StatusSidebar.html b/src/routes/_components/status/StatusSidebar.html
index fd44be7d..242c25f8 100644
--- a/src/routes/_components/status/StatusSidebar.html
+++ b/src/routes/_components/status/StatusSidebar.html
@@ -40,11 +40,11 @@
     },
     computed: {
       elementId: ({ uuid }) => `status-author-avatar-${uuid}`,
-      size: ({ isStatusInOwnThread, $isVeryTinyMobileSize }) => {
+      size: ({ $isVeryTinyMobileSize }) => {
         if ($isVeryTinyMobileSize) {
-          return isStatusInOwnThread ? 'small' : 'extra-small'
+          return 'extra-small'
         }
-        return isStatusInOwnThread ? 'medium' : 'small'
+        return 'small'
       }
     }
   }
diff --git a/static/fedilove-no-react.js b/static/fedilove-no-react.js
index f9103248..4912a484 100644
--- a/static/fedilove-no-react.js
+++ b/static/fedilove-no-react.js
@@ -196,6 +196,11 @@ var fediloveEvents = {
 // this is our URL-based customizations made by JavaScript
 var intervalChatCssChange = null;
 function fedilove_customization() {
+    if (document.querySelector('#main-nav > div#dummy-nav') != null) {
+        document.querySelector('#main-nav > div#dummy-nav').remove();
+        document.querySelector('#main-nav > ul.main-nav-ul').style = '';
+    }
+
     document.body.classList = '';
     document.querySelector('.main-content').classList = "main-content";
     document.querySelector('#chat-compose-global').style = 'visibility: collapse';