From ee1d6f7cf022a745182e4da91ea2c596a03156f6 Mon Sep 17 00:00:00 2001 From: Zed Date: Sat, 29 Jun 2019 00:41:09 +0200 Subject: [PATCH] Fix inconsistent display of timeline warnings --- public/style.css | 14 +++++++------- src/views/user.nimf | 24 ++++++++++-------------- 2 files changed, 17 insertions(+), 21 deletions(-) diff --git a/public/style.css b/public/style.css index f8fc63d..10d64c9 100644 --- a/public/style.css +++ b/public/style.css @@ -57,10 +57,6 @@ a:hover { display: flex; } -.timeline-tweet { - border-bottom: 1px solid #3e3e35; -} - .status-body { flex: 1; min-width: 0; @@ -592,14 +588,18 @@ nav { font-weight: bold; } -.timeline-protected { +.timeline-tweet { + border-bottom: 1px solid #3e3e35; +} + +.timeline-footer, .timeline-header { max-width: 550px; margin: 0 auto; padding: 6px 0px; } -.timeline-protected-header { - color: #d0564c; +.timeline-none, .timeline-protected { + color: #ff6c60; font-size: 21px; font-weight: 600; } diff --git a/src/views/user.nimf b/src/views/user.nimf index 88e4bd0..f16425b 100644 --- a/src/views/user.nimf +++ b/src/views/user.nimf @@ -53,13 +53,6 @@ #proc renderTimeline*(timeline: Timeline; profile: Profile; beginning: bool): string = #var retweets: Tweets
- #if profile.protected: -
-

This account's Tweets are protected.

-

Only confirmed followers have access to @${profile.username}'s Tweets.

-
- #end if - # #if not beginning:
Load newest tweets @@ -77,15 +70,18 @@ - #else: -
+ #elif timeline.tweets.len > 0: + - #end if - # - #if timeline.tweets.len == 0: -
-

No tweets found.

+ #else: +
+ #if profile.protected: +

This account's tweets are protected.

+

Only confirmed followers have access to @${profile.username}'s tweets.

+ #else: +

No tweets found.

+ #end if
#end if