diff --git a/public/css/fontello.css b/public/css/fontello.css index 447e9bb..d022bb5 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?63207931'); - src: url('/fonts/fontello.eot?63207931#iefix') format('embedded-opentype'), - url('/fonts/fontello.woff2?63207931') format('woff2'), - url('/fonts/fontello.woff?63207931') format('woff'), - url('/fonts/fontello.ttf?63207931') format('truetype'), - url('/fonts/fontello.svg?63207931#fontello') format('svg'); + src: url('/fonts/fontello.eot?21002321'); + src: url('/fonts/fontello.eot?21002321#iefix') format('embedded-opentype'), + url('/fonts/fontello.woff2?21002321') format('woff2'), + url('/fonts/fontello.woff?21002321') format('woff'), + url('/fonts/fontello.ttf?21002321') format('truetype'), + url('/fonts/fontello.svg?21002321#fontello') format('svg'); font-weight: normal; font-style: normal; } @@ -14,8 +14,8 @@ font-family: "fontello"; font-style: normal; font-weight: normal; - speak: none; - + speak: never; + display: inline-block; text-decoration: inherit; width: 1em; @@ -24,33 +24,30 @@ /* For safety - reset parent styles, that can break glyph codes*/ font-variant: normal; text-transform: none; - + /* fix buttons height, for twitter bootstrap */ line-height: 1em; - + /* Font smoothing. That was taken from TWBS */ -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; } - -.icon-help-circled:before { content: '\e800'; } /* '' */ -.icon-attention:before { content: '\e801'; } /* '' */ + +.icon-heart:before { content: '\2665'; } /* '♥' */ +.icon-quote:before { content: '\275e'; } /* '❞' */ .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-small:before { content: '\e808'; } /* '' */ .icon-picture:before { content: '\e809'; } /* '' */ -.icon-lock-circled:before { content: '\e80a'; } /* '' */ +.icon-lock:before { content: '\e80a'; } /* '' */ .icon-down:before { content: '\e80b'; } /* '' */ -.icon-info-circled:before { content: '\e80c'; } /* '' */ .icon-retweet:before { content: '\e80d'; } /* '' */ .icon-search:before { content: '\e80e'; } /* '' */ .icon-pin:before { content: '\e80f'; } /* '' */ -.icon-user:before { content: '\e810'; } /* '' */ -.icon-heart:before { content: '\e811'; } /* '' */ .icon-cog:before { content: '\e812'; } /* '' */ .icon-rss-feed:before { content: '\e813'; } /* '' */ -.icon-bird:before { content: '\f099'; } /* '' */ +.icon-info:before { content: '\f128'; } /* '' */ +.icon-bird:before { content: '\f309'; } /* '' */ diff --git a/public/fonts/LICENSE.txt b/public/fonts/LICENSE.txt index 1d98124..c8d90ff 100644 --- a/public/fonts/LICENSE.txt +++ b/public/fonts/LICENSE.txt @@ -10,13 +10,13 @@ Font license info Homepage: http://www.entypo.com -## MFG Labs +## Iconic - Copyright (C) 2012 by Daniel Bruce + Copyright (C) 2012 by P.J. Onori - Author: MFG Labs + Author: P.J. Onori License: SIL (http://scripts.sil.org/OFL) - Homepage: http://www.mfglabs.com/ + Homepage: http://somerandomdude.com/work/iconic/ ## Font Awesome @@ -37,3 +37,12 @@ Font license info Homepage: http://aristeides.com/ +## Modern Pictograms + + Copyright (c) 2012 by John Caserta. All rights reserved. + + Author: John Caserta + License: SIL (http://scripts.sil.org/OFL) + Homepage: http://thedesignoffice.org/project/modern-pictograms/ + + diff --git a/public/fonts/fontello.eot b/public/fonts/fontello.eot index 377b209..aaddd6b 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 4ec01c2..1f30ccc 100644 --- a/public/fonts/fontello.svg +++ b/public/fonts/fontello.svg @@ -1,14 +1,14 @@ -Copyright (C) 2019 by original authors @ fontello.com +Copyright (C) 2020 by original authors @ fontello.com - + - + @@ -22,31 +22,25 @@ - - - + - - - - - - - + - + + + \ No newline at end of file diff --git a/public/fonts/fontello.ttf b/public/fonts/fontello.ttf index b13e72b..29f1ec6 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 06ab146..8428cf8 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 e09a239..551f49d 100644 Binary files a/public/fonts/fontello.woff2 and b/public/fonts/fontello.woff2 differ diff --git a/src/parser.nim b/src/parser.nim index 417a4fb..0270af7 100644 --- a/src/parser.nim +++ b/src/parser.nim @@ -230,6 +230,7 @@ proc parseTweet(js: JsonNode): Tweet = replies: js{"reply_count"}.getInt, retweets: js{"retweet_count"}.getInt, likes: js{"favorite_count"}.getInt, + quotes: js{"quote_count"}.getInt ) ) diff --git a/src/sass/navbar.scss b/src/sass/navbar.scss index d20646d..af83301 100644 --- a/src/sass/navbar.scss +++ b/src/sass/navbar.scss @@ -10,6 +10,7 @@ nav { width: 100%; height: 50px; z-index: 1000; + font-size: 16px; a, .icon-button button { color: var(--fg_nav); @@ -67,7 +68,8 @@ nav { } .lp { - height: 13px; + height: 14px; + margin-top: 2px; display: block; fill: var(--fg_nav); @@ -75,3 +77,11 @@ nav { fill: var(--accent_light); } } + +.icon-info:before { + margin: 0 -3px; +} + +.icon-cog { + font-size: 15px; +} diff --git a/src/types.nim b/src/types.nim index 1e86fc2..cafb228 100644 --- a/src/types.nim +++ b/src/types.nim @@ -140,6 +140,7 @@ type replies*: int retweets*: int likes*: int + quotes*: int Tweet* = ref object id*: int64 diff --git a/src/views/general.nim b/src/views/general.nim index 8ed76cb..350d580 100644 --- a/src/views/general.nim +++ b/src/views/general.nim @@ -28,7 +28,7 @@ proc renderNavbar*(title, rss: string; req: Request): VNode = icon "rss-feed", title="RSS Feed", href=rss icon "bird", title="Open in Twitter", href=twitterPath a(href="https://liberapay.com/zedeus"): verbatim lp - icon "info-circled", title="About", href="/about" + icon "info", title="About", href="/about" iconReferer "cog", "/settings", path, title="Preferences" proc renderHead*(prefs: Prefs; cfg: Config; titleText=""; desc=""; video=""; diff --git a/src/views/renderutils.nim b/src/views/renderutils.nim index 1d428ac..b57cfef 100644 --- a/src/views/renderutils.nim +++ b/src/views/renderutils.nim @@ -27,7 +27,7 @@ proc linkUser*(profile: Profile, class=""): VNode = icon "ok", class="verified-icon", title="Verified account" if isName and profile.protected: text " " - icon "lock-circled", title="Protected account" + icon "lock", title="Protected account" proc linkText*(text: string; class=""): VNode = let url = if "http" notin text: "http://" & text else: text diff --git a/src/views/tweet.nim b/src/views/tweet.nim index c5d973c..953e959 100644 --- a/src/views/tweet.nim +++ b/src/views/tweet.nim @@ -186,6 +186,7 @@ proc renderStats(stats: TweetStats; views: string): VNode = span(class="tweet-stat"): icon "comment", insertSep($stats.replies, ',') span(class="tweet-stat"): icon "retweet", insertSep($stats.retweets, ',') span(class="tweet-stat"): icon "heart", insertSep($stats.likes, ',') + span(class="tweet-stat"): icon "quote", insertSep($stats.quotes, ',') if views.len > 0: span(class="tweet-stat"): icon "play", insertSep(views, ',')