From 6dd64b02fc3a8678711b31344c2ca401725d10dc Mon Sep 17 00:00:00 2001 From: Mitarashi Date: Wed, 5 Jan 2022 14:10:02 +0200 Subject: [PATCH 1/3] made tweet stats not show number if its equal to 0 and modified css a bit --- src/sass/tweet/_base.scss | 2 ++ src/views/tweet.nim | 12 ++++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/sass/tweet/_base.scss b/src/sass/tweet/_base.scss index e29b880..3df3c08 100644 --- a/src/sass/tweet/_base.scss +++ b/src/sass/tweet/_base.scss @@ -175,6 +175,8 @@ .tweet-stat { padding-top: 5px; padding-right: 8px; + min-width: 1em; + margin-right: 0.2em; } .show-thread { diff --git a/src/views/tweet.nim b/src/views/tweet.nim index e8246d7..a8d3bc4 100644 --- a/src/views/tweet.nim +++ b/src/views/tweet.nim @@ -181,12 +181,16 @@ proc renderCard(card: Card; prefs: Prefs; path: string): VNode = tdiv(class="card-content-container"): renderCardContent(card) +func condNumber(stat: int): string {.inline.} = + if stat > 0: insertSep($stat, ',') + else: "" + proc renderStats(stats: TweetStats; views: string): VNode = buildHtml(tdiv(class="tweet-stats")): - span(class="tweet-stat"): icon "comment", insertSep($stats.replies, ',') - span(class="tweet-stat"): icon "retweet", insertSep($stats.retweets, ',') - span(class="tweet-stat"): icon "quote", insertSep($stats.quotes, ',') - span(class="tweet-stat"): icon "heart", insertSep($stats.likes, ',') + span(class="tweet-stat"): icon "comment", condNumber(stats.replies) + span(class="tweet-stat"): icon "retweet", condNumber(stats.retweets) + span(class="tweet-stat"): icon "quote" , condNumber(stats.quotes) + span(class="tweet-stat"): icon "heart" , condNumber(stats.likes) if views.len > 0: span(class="tweet-stat"): icon "play", insertSep(views, ',') From 33dd55067b2ce5c12b1905ea06de6e1352c29cd6 Mon Sep 17 00:00:00 2001 From: Mitarashi Date: Wed, 5 Jan 2022 14:27:52 +0200 Subject: [PATCH 2/3] fixed formatting and removed not needed padding --- src/sass/tweet/_base.scss | 3 +-- src/views/tweet.nim | 10 +++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/sass/tweet/_base.scss b/src/sass/tweet/_base.scss index 3df3c08..f7087b7 100644 --- a/src/sass/tweet/_base.scss +++ b/src/sass/tweet/_base.scss @@ -174,9 +174,8 @@ .tweet-stat { padding-top: 5px; - padding-right: 8px; min-width: 1em; - margin-right: 0.2em; + margin-right: 0.8em; } .show-thread { diff --git a/src/views/tweet.nim b/src/views/tweet.nim index a8d3bc4..b04fb0c 100644 --- a/src/views/tweet.nim +++ b/src/views/tweet.nim @@ -181,16 +181,16 @@ proc renderCard(card: Card; prefs: Prefs; path: string): VNode = tdiv(class="card-content-container"): renderCardContent(card) -func condNumber(stat: int): string {.inline.} = +func formatStat(stat: int): string = if stat > 0: insertSep($stat, ',') else: "" proc renderStats(stats: TweetStats; views: string): VNode = buildHtml(tdiv(class="tweet-stats")): - span(class="tweet-stat"): icon "comment", condNumber(stats.replies) - span(class="tweet-stat"): icon "retweet", condNumber(stats.retweets) - span(class="tweet-stat"): icon "quote" , condNumber(stats.quotes) - span(class="tweet-stat"): icon "heart" , condNumber(stats.likes) + span(class="tweet-stat"): icon "comment", formatStat(stats.replies) + span(class="tweet-stat"): icon "retweet", formatStat(stats.retweets) + span(class="tweet-stat"): icon "quote", formatStat(stats.quotes) + span(class="tweet-stat"): icon "heart", formatStat(stats.likes) if views.len > 0: span(class="tweet-stat"): icon "play", insertSep(views, ',') From f52e675ca2cbef1df69f2fe5ef6ee58b4c5a75a9 Mon Sep 17 00:00:00 2001 From: Mitarashi Date: Wed, 5 Jan 2022 14:34:45 +0200 Subject: [PATCH 3/3] bumped css version --- src/views/general.nim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/general.nim b/src/views/general.nim index 330b572..f8e01f9 100644 --- a/src/views/general.nim +++ b/src/views/general.nim @@ -45,7 +45,7 @@ proc renderHead*(prefs: Prefs; cfg: Config; titleText=""; desc=""; video=""; let opensearchUrl = getUrlPrefix(cfg) & "/opensearch" buildHtml(head): - link(rel="stylesheet", type="text/css", href="/css/style.css?v=7") + link(rel="stylesheet", type="text/css", href="/css/style.css?v=8") link(rel="stylesheet", type="text/css", href="/css/fontello.css?v=2") if theme.len > 0: