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 @@ - + + {#each $navPages as navPage (navPage.href)} 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';