diff --git a/public/css/fontello.css b/public/css/fontello.css index 2d9f3b8..3f45019 100644 --- a/public/css/fontello.css +++ b/public/css/fontello.css @@ -1,11 +1,11 @@ @font-face { font-family: 'fontello'; - src: url('/fonts/fontello.eot?39973630'); - src: url('/fonts/fontello.eot?39973630#iefix') format('embedded-opentype'), - url('/fonts/fontello.woff2?39973630') format('woff2'), - url('/fonts/fontello.woff?39973630') format('woff'), - url('/fonts/fontello.ttf?39973630') format('truetype'), - url('/fonts/fontello.svg?39973630#fontello') format('svg'); + src: url('/fonts/fontello.eot?85902121'); + src: url('/fonts/fontello.eot?85902121#iefix') format('embedded-opentype'), + url('/fonts/fontello.woff2?85902121') format('woff2'), + url('/fonts/fontello.woff?85902121') format('woff'), + url('/fonts/fontello.ttf?85902121') format('truetype'), + url('/fonts/fontello.svg?85902121#fontello') format('svg'); font-weight: normal; font-style: normal; } @@ -37,17 +37,17 @@ .icon-attention:before { content: '\e801'; } /* '' */ .icon-comment:before { content: '\e802'; } /* '' */ .icon-ok:before { content: '\e803'; } /* '' */ +.icon-play:before { content: '\e804'; } /* '' */ .icon-link:before { content: '\e805'; } /* '' */ .icon-calendar:before { content: '\e806'; } /* '' */ .icon-location:before { content: '\e807'; } /* '' */ -.icon-down-open-1:before { content: '\e808'; } /* '' */ -.icon-picture-1:before { content: '\e809'; } /* '' */ +.icon-down-small:before { content: '\e808'; } /* '' */ +.icon-picture:before { content: '\e809'; } /* '' */ .icon-lock-circled:before { content: '\e80a'; } /* '' */ -.icon-down-open:before { content: '\e80b'; } /* '' */ +.icon-down:before { content: '\e80b'; } /* '' */ .icon-info-circled:before { content: '\e80c'; } /* '' */ -.icon-retweet-1:before { content: '\e80d'; } /* '' */ +.icon-retweet:before { content: '\e80d'; } /* '' */ .icon-search:before { content: '\e80e'; } /* '' */ .icon-pin:before { content: '\e80f'; } /* '' */ -.icon-ok-circled:before { content: '\e810'; } /* '' */ -.icon-cog-2:before { content: '\e812'; } /* '' */ -.icon-thumbs-up-alt:before { content: '\f164'; } /* '' */ +.icon-cog:before { content: '\e812'; } /* '' */ +.icon-thumbs-up:before { content: '\f164'; } /* '' */ diff --git a/public/fonts/fontello.eot b/public/fonts/fontello.eot index 43d722f..fc8567e 100644 Binary files a/public/fonts/fontello.eot and b/public/fonts/fontello.eot differ diff --git a/public/fonts/fontello.svg b/public/fonts/fontello.svg index 90cf3ca..8e5b56b 100644 --- a/public/fonts/fontello.svg +++ b/public/fonts/fontello.svg @@ -14,33 +14,33 @@ + + - + - + - + - + - + - - - + \ No newline at end of file diff --git a/public/fonts/fontello.ttf b/public/fonts/fontello.ttf index 6d82a62..a9f94a7 100644 Binary files a/public/fonts/fontello.ttf and b/public/fonts/fontello.ttf differ diff --git a/public/fonts/fontello.woff b/public/fonts/fontello.woff index 100da96..81e1c15 100644 Binary files a/public/fonts/fontello.woff and b/public/fonts/fontello.woff differ diff --git a/public/fonts/fontello.woff2 b/public/fonts/fontello.woff2 index 56cd672..3cd5362 100644 Binary files a/public/fonts/fontello.woff2 and b/public/fonts/fontello.woff2 differ diff --git a/src/views/general.nim b/src/views/general.nim index 048bcff..f8f5e8c 100644 --- a/src/views/general.nim +++ b/src/views/general.nim @@ -15,7 +15,7 @@ proc renderNavbar*(title: string): VNode = tdiv(class="item right"): icon "info-circled", title="About", href="/about" - icon "cog-2", title="Preferences", href="/settings" + icon "cog", title="Preferences", href="/settings" proc renderMain*(body: VNode; prefs: Prefs; title="Nitter"; titleText=""; desc=""; `type`="article"; video=""; images: seq[string] = @[]): string = diff --git a/src/views/profile.nim b/src/views/profile.nim index e6b8318..43cbbd0 100644 --- a/src/views/profile.nim +++ b/src/views/profile.nim @@ -50,7 +50,7 @@ proc renderPhotoRail(profile: Profile; photoRail: seq[GalleryPhoto]): VNode = buildHtml(tdiv(class="photo-rail-card")): tdiv(class="photo-rail-header"): a(href=(&"/{profile.username}/media")): - icon "picture-1", $profile.media & " Photos and videos" + icon "picture", $profile.media & " Photos and videos" tdiv(class="photo-rail-grid"): for i, photo in photoRail: diff --git a/src/views/tweet.nim b/src/views/tweet.nim index a73bd89..efe690d 100644 --- a/src/views/tweet.nim +++ b/src/views/tweet.nim @@ -8,7 +8,7 @@ proc renderHeader(tweet: Tweet): VNode = buildHtml(tdiv): if tweet.retweet.isSome: tdiv(class="retweet"): - span: icon "retweet-1", get(tweet.retweet).by & " retweeted" + span: icon "retweet", get(tweet.retweet).by & " retweeted" if tweet.pinned: tdiv(class="pinned"): @@ -141,11 +141,13 @@ proc renderCard(card: Card; prefs: Prefs): VNode = tdiv(class="card-content-container"): renderCardContent(card) -proc renderStats(stats: TweetStats): VNode = +proc renderStats(stats: TweetStats; views: string): VNode = buildHtml(tdiv(class="tweet-stats")): span(class="tweet-stat"): icon "comment", $stats.replies - span(class="tweet-stat"): icon "retweet-1", $stats.retweets - span(class="tweet-stat"): icon "thumbs-up-alt", $stats.likes + span(class="tweet-stat"): icon "retweet", $stats.retweets + span(class="tweet-stat"): icon "thumbs-up", $stats.likes + if views.len > 0: + span(class="tweet-stat"): icon "play", views proc renderReply(tweet: Tweet): VNode = buildHtml(tdiv(class="replying-to")): @@ -214,6 +216,7 @@ proc renderTweet*(tweet: Tweet; prefs: Prefs; class=""; buildHtml(tdiv(class=divClass)): tdiv(class="status-el"): tdiv(class="status-body"): + var views = "" renderHeader(tweet) if index == 0 and tweet.reply.len > 0: @@ -231,13 +234,14 @@ proc renderTweet*(tweet: Tweet; prefs: Prefs; class=""; renderAlbum(tweet) elif tweet.video.isSome: renderVideo(tweet.video.get(), prefs) + views = tweet.video.get().views elif tweet.gif.isSome: renderGif(tweet.gif.get(), prefs) elif tweet.poll.isSome: renderPoll(tweet.poll.get()) if not prefs.hideTweetStats: - renderStats(tweet.stats) + renderStats(tweet.stats, views) if tweet.hasThread and "timeline" in class: a(class="show-thread", href=getLink(tweet)):