diff --git a/public/css/fontello.css b/public/css/fontello.css index 3f45019..b58b3c7 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?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'); + src: url('/fonts/fontello.eot?33844470'); + src: url('/fonts/fontello.eot?33844470#iefix') format('embedded-opentype'), + url('/fonts/fontello.woff2?33844470') format('woff2'), + url('/fonts/fontello.woff?33844470') format('woff'), + url('/fonts/fontello.ttf?33844470') format('truetype'), + url('/fonts/fontello.svg?33844470#fontello') format('svg'); font-weight: normal; font-style: normal; } @@ -50,4 +50,5 @@ .icon-search:before { content: '\e80e'; } /* '' */ .icon-pin:before { content: '\e80f'; } /* '' */ .icon-cog:before { content: '\e812'; } /* '' */ +.icon-rss:before { content: '\f143'; } /* '' */ .icon-thumbs-up:before { content: '\f164'; } /* '' */ diff --git a/public/fonts/fontello.eot b/public/fonts/fontello.eot index fc8567e..a3d11e8 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 8e5b56b..257ace5 100644 --- a/public/fonts/fontello.svg +++ b/public/fonts/fontello.svg @@ -40,6 +40,8 @@ + + diff --git a/public/fonts/fontello.ttf b/public/fonts/fontello.ttf index a9f94a7..847494e 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 81e1c15..a508a00 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 3cd5362..52dff8d 100644 Binary files a/public/fonts/fontello.woff2 and b/public/fonts/fontello.woff2 differ diff --git a/src/routes/timeline.nim b/src/routes/timeline.nim index 2ec0207..268bd7a 100644 --- a/src/routes/timeline.nim +++ b/src/routes/timeline.nim @@ -39,9 +39,10 @@ proc showSingleTimeline(name, after, agent: string; query: Option[Query]; if profile.username.len == 0: return "" + let rssUrl = profile.username & "/rss" let profileHtml = renderProfile(profile, timeline, await railFut, prefs, path) return renderMain(profileHtml, prefs, title, pageTitle(profile), - pageDesc(profile), path) + pageDesc(profile), path, rss=rssUrl) proc showMultiTimeline(names: seq[string]; after, agent: string; query: Option[Query]; prefs: Prefs; path, title: string): Future[string] {.async.} = diff --git a/src/sass/tweet/thread.scss b/src/sass/tweet/thread.scss index 3d6c10d..1bbb6f4 100644 --- a/src/sass/tweet/thread.scss +++ b/src/sass/tweet/thread.scss @@ -50,7 +50,7 @@ width: 5px; top: 2px; margin-bottom: 0; - margin-left: -5px; + margin-left: -2.5px; } } diff --git a/src/views/general.nim b/src/views/general.nim index 08b492d..fe5f37f 100644 --- a/src/views/general.nim +++ b/src/views/general.nim @@ -5,7 +5,7 @@ import ../utils, ../types const doctype = "\n" -proc renderNavbar*(title, path: string): VNode = +proc renderNavbar*(title, path, rss: string): VNode = buildHtml(nav(id="nav", class="nav-bar container")): tdiv(class="inner-nav"): tdiv(class="item"): @@ -14,11 +14,13 @@ proc renderNavbar*(title, path: string): VNode = a(href="/"): img(class="site-logo", src="/logo.png") tdiv(class="item right"): + if rss.len > 0: + icon "rss", title="RSS Feed", href=rss icon "info-circled", title="About", href="/about" iconReferer "cog", "/settings", path, title="Preferences" -proc renderMain*(body: VNode; prefs: Prefs; title="Nitter"; titleText=""; desc=""; - path="/"; `type`="article"; video=""; images: seq[string] = @[]): string = +proc renderMain*(body: VNode; prefs: Prefs; title="Nitter"; titleText=""; desc=""; path="/"; + rss=""; `type`="article"; video=""; images: seq[string] = @[]): string = let node = buildHtml(html(lang="en")): head: link(rel="stylesheet", `type`="text/css", href="/css/style.css") @@ -48,7 +50,7 @@ proc renderMain*(body: VNode; prefs: Prefs; title="Nitter"; titleText=""; desc=" meta(property="og:video:secure_url", content=video) body: - renderNavbar(title, path) + renderNavbar(title, path, rss) tdiv(id="content", class="container"): body