From 7154428e135ed245e090f73bef3be556ef76b1d8 Mon Sep 17 00:00:00 2001 From: Anshuman Verma Date: Thu, 15 Nov 2018 13:03:55 +0530 Subject: [PATCH] Add missing imports --- themes/navy/source/scss/archive.scss | 1 - themes/navy/source/scss/base.scss | 7 +- themes/navy/source/scss/main.scss | 3 + themes/navy/source/scss/page.scss | 466 +-------------------------- 4 files changed, 14 insertions(+), 463 deletions(-) diff --git a/themes/navy/source/scss/archive.scss b/themes/navy/source/scss/archive.scss index 479214e..83843c3 100644 --- a/themes/navy/source/scss/archive.scss +++ b/themes/navy/source/scss/archive.scss @@ -7,7 +7,6 @@ } .archive-post-link { - @include clearfix(); display: block; color: color-default; text-decoration: none; diff --git a/themes/navy/source/scss/base.scss b/themes/navy/source/scss/base.scss index 0fc0514..190480b 100644 --- a/themes/navy/source/scss/base.scss +++ b/themes/navy/source/scss/base.scss @@ -24,12 +24,6 @@ input, button, select { border: 0; } -html, body { - @media screen and { - height: 100%; - } -} - body { background: color-navy; font-size: font-size; @@ -39,6 +33,7 @@ body { -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; overflow-x: hidden; + height: 100%; } .wrapper { diff --git a/themes/navy/source/scss/main.scss b/themes/navy/source/scss/main.scss index 92f8eeb..6a8effa 100644 --- a/themes/navy/source/scss/main.scss +++ b/themes/navy/source/scss/main.scss @@ -4,6 +4,9 @@ @import "index"; @import "header"; @import "highlight"; +@import "sidebar"; +@import "page"; +@import "archive"; html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, a, abbr, acronym, address, big, cite, del, dfn, em, img, ins, kbd, q, s, samp, small, strike, strong, sub, sup, tt, var, b, u, i, center, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td, article, aside, canvas, details, embed, figure, figcaption, footer, header, hgroup, menu, nav, output, ruby, section, summary, time, mark, audio, video { diff --git a/themes/navy/source/scss/page.scss b/themes/navy/source/scss/page.scss index b941572..fc9684f 100644 --- a/themes/navy/source/scss/page.scss +++ b/themes/navy/source/scss/page.scss @@ -3,7 +3,6 @@ $note-info: hsl(200, 100%, 50%); $note-warn: hsl(0, 100%, 50%); #content { - @include clearfix(); position: relative; } @@ -12,7 +11,6 @@ $note-warn: hsl(0, 100%, 50%); } #content-inner-full { - @include clearfix(); @media mq-normal { margin-left: 0; } @@ -25,10 +23,6 @@ $note-warn: hsl(0, 100%, 50%); } } -.article-inner { - @include clearfix(); -} - .article { float: left; width: 100%; @@ -41,8 +35,8 @@ $note-warn: hsl(0, 100%, 50%); #article-toc { display: none; float: right; - width: sidebar-width; - margin-right: sidebar-width * -1; + width: $sidebar-width; + margin-right: $sidebar-width * -1; opacity: 0.8; @media mq-normal { display: block; @@ -59,223 +53,10 @@ $note-warn: hsl(0, 100%, 50%); } #article-toc-inner { - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @extend .inner; overflow-x: hidden; overflow-y: auto; - width: sidebar-width; + width: $sidebar-width; .fixed & { position: fixed; top: 0; @@ -284,209 +65,6 @@ $note-warn: hsl(0, 100%, 50%); } .toc-link { - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @extend .sidebar-link; } @@ -526,9 +104,12 @@ $note-warn: hsl(0, 100%, 50%); font-size: 25px; color: #ffffff; transition: 0.2s; - a&:hover { + a { + &:hover { color: color-link-hover; + } } + .post & { float: none; } @@ -702,7 +283,6 @@ $note-warn: hsl(0, 100%, 50%); } .article-footer { - @include clearfix(); margin: 1em 0; border-top: 1px solid color-border; text-align: center; @@ -716,7 +296,7 @@ $note-warn: hsl(0, 100%, 50%); } } -$article-footer-link { +article-footer-link { color: color-link; text-decoration: none; font-weight: bold; @@ -735,38 +315,12 @@ $article-footer-link { } .article-footer-prev { - - - - - - - - - - - - - - - - @extend $article-footer-link; + @extend article-footer-link; left: 0; } .article-footer-next { - - - - - - - - - - - - @extend $article-footer-link; + @extend article-footer-link; right: 0; }