diff --git a/src/sass/index.scss b/src/sass/index.scss index 73b94b0..7e36f63 100644 --- a/src/sass/index.scss +++ b/src/sass/index.scss @@ -68,9 +68,6 @@ ul.about-list { .container { display: flex; flex-wrap: wrap; -} - -#content { box-sizing: border-box; padding-top: 50px; margin: auto; diff --git a/src/sass/navbar.scss b/src/sass/navbar.scss index 510bd81..45b2fa2 100644 --- a/src/sass/navbar.scss +++ b/src/sass/navbar.scss @@ -1,27 +1,25 @@ @import '_variables'; nav { - z-index: 1000; - background-color: $bg_overlays; - box-shadow: 0 0 4px $shadow; -} - -.nav-bar { - padding: 0; - width: 100%; + display: flex; align-items: center; position: fixed; + background-color: $bg_overlays; + box-shadow: 0 0 4px $shadow; + padding: 0; + width: 100%; height: 50px; + z-index: 1000; +} - .inner-nav { - margin: auto; - box-sizing: border-box; - padding: 0 10px; - display: flex; - align-items: center; - flex-basis: 920px; - height: 50px; - } +.inner-nav { + margin: auto; + box-sizing: border-box; + padding: 0 10px; + display: flex; + align-items: center; + flex-basis: 920px; + height: 50px; } .site-name { @@ -39,7 +37,7 @@ nav { height: 35px; } -.item { +.nav-item { display: flex; flex: 1; line-height: 50px; diff --git a/src/sass/profile/_base.scss b/src/sass/profile/_base.scss index 529d9c9..f5c8ddb 100644 --- a/src/sass/profile/_base.scss +++ b/src/sass/profile/_base.scss @@ -4,13 +4,13 @@ @import 'card'; @import 'photo-rail'; -.profile-timeline, .profile-tabs { - @include panel(auto, 900px); -} - .profile-tabs { - > .timeline-tab { + @include panel(auto, 900px); + + .timeline-container { + float: right; width: 68% !important; + max-width: unset; } } diff --git a/src/sass/tweet/thread.scss b/src/sass/tweet/thread.scss index 1bbb6f4..95db9d8 100644 --- a/src/sass/tweet/thread.scss +++ b/src/sass/tweet/thread.scss @@ -3,7 +3,6 @@ .conversation { @include panel(100%, 600px); - background-color: $bg_color !important; } .main-thread { diff --git a/src/views/general.nim b/src/views/general.nim index 5df1269..b5b1db3 100644 --- a/src/views/general.nim +++ b/src/views/general.nim @@ -6,14 +6,14 @@ import ../utils, ../types const doctype = "\n" proc renderNavbar*(title, path, rss: string): VNode = - buildHtml(nav(id="nav", class="nav-bar container")): + buildHtml(nav): tdiv(class="inner-nav"): - tdiv(class="item"): + tdiv(class="nav-item"): a(class="site-name", href="/"): text title a(href="/"): img(class="site-logo", src="/logo.png") - tdiv(class="item right"): + tdiv(class="nav-item right"): if rss.len > 0: icon "rss", title="RSS Feed", href=rss icon "info-circled", title="About", href="/about" @@ -55,7 +55,7 @@ proc renderMain*(body: VNode; prefs: Prefs; title="Nitter"; titleText=""; desc=" body: renderNavbar(title, path, rss) - tdiv(id="content", class="container"): + tdiv(class="container"): body result = doctype & $node diff --git a/src/views/status.nim b/src/views/status.nim index 0a4c918..1655e84 100644 --- a/src/views/status.nim +++ b/src/views/status.nim @@ -21,7 +21,7 @@ proc renderReplyThread(thread: Thread; prefs: Prefs; path: string): VNode = proc renderConversation*(conversation: Conversation; prefs: Prefs; path: string): VNode = let hasAfter = conversation.after != nil - buildHtml(tdiv(class="conversation", id="posts")): + buildHtml(tdiv(class="conversation")): tdiv(class="main-thread"): if conversation.before != nil: tdiv(class="before-tweet thread-line"):