From 9e14673349065f7320be762502b70385fcad2b0b Mon Sep 17 00:00:00 2001 From: Cotes Chung <11371340+cotes2020@users.noreply.github.com> Date: Wed, 19 Aug 2020 21:18:14 +0800 Subject: [PATCH] Improve SASS code style. --- assets/css/_addon/fonts.scss | 2 +- assets/css/_addon/main.scss | 56 ++++----- assets/css/_addon/module.scss | 10 +- assets/css/_addon/syntax.scss | 54 +++++---- assets/css/_addon/variables.scss | 2 +- assets/css/_colors/dark-syntax.scss | 143 +++++++++++------------ assets/css/_colors/dark-typography.scss | 20 ++-- assets/css/_colors/light-syntax.scss | 125 ++++++++++---------- assets/css/_colors/light-typography.scss | 60 +--------- 9 files changed, 213 insertions(+), 259 deletions(-) diff --git a/assets/css/_addon/fonts.scss b/assets/css/_addon/fonts.scss index dea90fb..1c12762 100644 --- a/assets/css/_addon/fonts.scss +++ b/assets/css/_addon/fonts.scss @@ -5,4 +5,4 @@ * */ -@import url('https://fonts.googleapis.com/css?family=Lato|Roboto+Condensed:400,700|Source+Sans+Pro:400,600,700,900&display=swap'); \ No newline at end of file +@import url('https://fonts.googleapis.com/css?family=Lato|Roboto+Condensed:400,700|Source+Sans+Pro:400,600,700,900&display=swap'); diff --git a/assets/css/_addon/main.scss b/assets/css/_addon/main.scss index 22fa90d..56cf81d 100644 --- a/assets/css/_addon/main.scss +++ b/assets/css/_addon/main.scss @@ -106,7 +106,7 @@ $sidebar-display: "sidebar-display"; } .sidebar-bottom { - .icon-border+a { // the icon behide mode-toggle + .icon-border + a { // the icon behide mode-toggle margin-left: .1rem; } } @@ -185,7 +185,7 @@ $sidebar-display: "sidebar-display"; margin-bottom: .5rem; // icons may have multi lines } - a:hover, #mode-toggle-wrapper>i:hover { + a:hover, #mode-toggle-wrapper > i:hover { color: #fff; } @@ -211,7 +211,7 @@ $sidebar-display: "sidebar-display"; } // #sidebar @media (hover: hover) { - #sidebar ul>li:last-child::after { + #sidebar ul > li:last-child::after { -webkit-transition: top .5s ease; -moz-transition: top .5s ease; -o-transition: top .5s ease; @@ -242,7 +242,7 @@ $sidebar-display: "sidebar-display"; transition: border-color 0.35s ease-in-out; } - &:hover>a { + &:hover > a { border-color: #fff; } @@ -448,7 +448,7 @@ $sidebar-display: "sidebar-display"; @include pl-pr(0); } -#main>div.row:first-child>div { +#main > div.row:first-child > div { &:nth-child(1), &:nth-child(2) { margin-top: $topbar-height; /* same as the height of topbar */ } @@ -544,7 +544,7 @@ footer { #access-tags { - >div.post-content>div { + >div.post-content > div { max-width: 80%; } .post-tag { @@ -676,7 +676,7 @@ sup { &:not(:last-child) { margin-bottom: -.8rem; } - &:target>p { + &:target > p { background-color: var(--footnote-target-bg); width: fit-content; -webkit-transition: background-color 1.5s ease-in-out; @@ -693,7 +693,7 @@ sup { -webkit-transition: background-color 1.5s ease-in-out; /* Safari prior 6.1 */ transition: background-color 1.5s ease-in-out; } - @at-root sup:target>a#{&} { + @at-root sup:target > a#{&} { background-color: var(--footnote-target-bg); padding: 0 2px; } @@ -928,7 +928,7 @@ div.post-content .table-wrapper { $footer-height: 6rem; // overwrite - #main>div.row:first-child>div:first-child { + #main > div.row:first-child > div:first-child { min-height: calc(100vh - #{$topbar-height} - #{$footer-height}); } @@ -941,7 +941,7 @@ div.post-content .table-wrapper { } } - #avatar>a { + #avatar > a { width: 5rem; height: 5rem; } @@ -951,7 +951,7 @@ div.post-content .table-wrapper { } /* table text in small screens */ - div>table, p~table { + div > table, p ~ table { width: 100%; table-layout: fixed; word-wrap: break-word; @@ -1051,8 +1051,8 @@ div.post-content .table-wrapper { top: 0 !important; } - #main>div.row:first-child>div:nth-child(1), - #main>div.row:first-child>div:nth-child(2) { + #main > div.row:first-child > div:nth-child(1), + #main > div.row:first-child > div:nth-child(2) { margin-top: 0; } @@ -1063,7 +1063,7 @@ div.post-content .table-wrapper { } #search-wrapper { - &.loaded~a { + &.loaded ~ a { margin-right: 1rem; } .fa-times-circle { @@ -1095,7 +1095,7 @@ div.post-content .table-wrapper { padding-top: 3.4rem; } - .footnotes ol>li { + .footnotes ol > li { padding-top: 3.5rem; margin-top: -4.3rem; &:first-child { @@ -1106,7 +1106,7 @@ div.post-content .table-wrapper { @media all and (min-width: 577px) and (max-width: 1199px) { - footer>.d-flex>div { + footer>.d-flex > div { width: 312px; } } @@ -1147,7 +1147,7 @@ div.post-content .table-wrapper { text-align: left; } - footer>div.d-flex { + footer > div.d-flex { width: 92%; } @@ -1184,7 +1184,7 @@ div.post-content .table-wrapper { width: calc(100% - 210px); } - #search-results>div { + #search-results > div { max-width: 700px; } @@ -1222,7 +1222,7 @@ div.post-content .table-wrapper { padding: 0; } - #main>div.row { + #main > div.row { -webkit-box-pack: center!important; -ms-flex-pack: center!important; justify-content: center!important; @@ -1234,7 +1234,7 @@ div.post-content .table-wrapper { @media all and (min-width: 1200px) { - #main>div.row>div.col-xl-8 { + #main > div.row > div.col-xl-8 { -webkit-box-flex: 0; -ms-flex: 0 0 75%; flex: 0 0 75%; @@ -1265,7 +1265,7 @@ div.post-content .table-wrapper { width: calc(100% - 260px); } - #search-results>div { + #search-results > div { max-width: 46%; &:nth-child(odd) { margin-right: 1.5rem; @@ -1283,7 +1283,7 @@ div.post-content .table-wrapper { font-size: 1.03rem; } - footer>div.d-felx { + footer > div.d-felx { width: 85%; } @@ -1291,7 +1291,7 @@ div.post-content .table-wrapper { @media all and (min-width: 1400px) { - #main>div.row { + #main > div.row { padding-left: calc((100% - #{$main-content-max-width}) / 2); >div.col-xl-8 { max-width: 850px; @@ -1323,7 +1323,7 @@ div.post-content .table-wrapper { padding-left: 0; } - #main>div.row>div.col-xl-8 { + #main > div.row > div.col-xl-8 { padding-left: 0; >div:first-child { padding-left: .55rem !important; @@ -1400,7 +1400,7 @@ div.post-content .table-wrapper { ul { margin-left: 3%; - >li>a { + >li > a { padding-left: 2.5rem; -webkit-box-pack: start!important; -ms-flex-pack: start!important; @@ -1457,7 +1457,7 @@ div.post-content .table-wrapper { } } // .sidebar-bottom } // #sidebar - footer>div.d-flex { + footer > div.d-flex { width: 87%; max-width: 1140px; } @@ -1482,7 +1482,7 @@ div.post-content .table-wrapper { max-width: calc(#{$main-content-max-width} + 20px) } - #main>div.row { + #main > div.row { padding-left: calc((100% - #{$main-content-max-width} - 2%) / 2); } @@ -1502,7 +1502,7 @@ div.post-content .table-wrapper { } @media (min-width: 1920px) { - #main>div.row { + #main > div.row { padding-left: 190px; } diff --git a/assets/css/_addon/module.scss b/assets/css/_addon/module.scss index 81fc8eb..b24bc26 100644 --- a/assets/css/_addon/module.scss +++ b/assets/css/_addon/module.scss @@ -7,7 +7,7 @@ * MIT Licensed */ -/*---------- scss placeholder ---------*/ +/* ---------- scss placeholder --------- */ %tag-hover { background: var(--tag-hover); @@ -15,12 +15,12 @@ } %table-cell { - padding: .4rem 1rem; + padding: 0.4rem 1rem; font-size: 95%; } %link-hover { - color: #d2603a!important; + color: #d2603a !important; border-bottom: 1px solid #d2603a; text-decoration: none; } @@ -54,7 +54,7 @@ margin-top: -2.5rem; } -/*---------- scss mixin ---------*/ +/* ---------- scss mixin --------- */ @mixin no-text-decoration { text-decoration: none; @@ -64,7 +64,7 @@ color: $color; transition: color 0.35s ease-in-out; user-select: none; - margin: 0 .25rem; + margin: 0 0.25rem; } @mixin icon-round($diameter) { diff --git a/assets/css/_addon/syntax.scss b/assets/css/_addon/syntax.scss index bafcf81..012b2a9 100644 --- a/assets/css/_addon/syntax.scss +++ b/assets/css/_addon/syntax.scss @@ -9,8 +9,8 @@ @import "_colors/light-syntax"; @import "_colors/dark-syntax"; - -html:not([mode]), html[mode=light] { +html:not([mode]), +html[mode=light] { @include light-syntax; } @@ -19,7 +19,8 @@ html[mode=dark] { } @media (prefers-color-scheme: dark) { - html:not([mode]), html[mode=dark] { + html:not([mode]), + html[mode=dark] { @include dark-syntax; } @@ -28,7 +29,7 @@ html[mode=dark] { } } -/*-- Codes Snippet --*/ +/* -- Codes Snippet -- */ %code-snippet-bg { background: var(--highlight-bg-color); @@ -39,12 +40,19 @@ html[mode=dark] { } %code-snippet-padding { - padding: .8rem 1rem; + padding: 0.8rem 1rem; +} + +div > pre { + @extend %code-snippet-bg; + @extend %code-snippet-radius; + @extend %code-snippet-padding; } .highlighter-rouge { @extend %code-snippet-bg; @extend %code-snippet-radius; + color: var(--highlighter-rouge-color); margin-bottom: 1.2em; /* Override BS Inline-code style */ } @@ -52,13 +60,15 @@ html[mode=dark] { .highlight { @extend %code-snippet-radius; @extend %code-snippet-bg; + @at-root figure#{&} { @extend %code-snippet-bg; } + overflow: auto; .lineno { - margin: .8rem 0rem; - padding: 0 .5rem; + margin: 0.8rem 0; + padding: 0 0.5rem; min-width: 2.2rem; text-align: right; color: var(--highlight-lineno-color); @@ -70,6 +80,12 @@ html[mode=dark] { -o-user-select: none; user-select: none; } + pre { + margin-bottom: 0; + font-size: 0.85rem; + line-height: 1.4rem; + word-wrap: normal; /* Fixed Safari overflow-x */ + } table { padding: 0; border: 0; @@ -82,14 +98,6 @@ html[mode=dark] { padding: 0; border: 0; } - pre { - margin-bottom: 0; - font-size: .85rem; - line-height: 1.4rem; - word-wrap: normal; - /* Fixed Safari overflow-x */ - } - } //.highlight code { @@ -97,19 +105,23 @@ code { -ms-hyphens: none; -moz-hyphens: none; hyphens: none; + &.highlighter-rouge { padding: 3px 5px; - margin: 0 .15rem; + margin: 0 0.15rem; border-radius: 4px; background-color: var(--inline-code-bg); } - @at-root a>&.highlighter-rouge { + + @at-root a > &.highlighter-rouge { padding-bottom: 0; // show link's underlinke color: inherit; } - @at-root a:hover>&.highlighter-rouge { + + @at-root a:hover > &.highlighter-rouge { border-bottom: none; } + blockquote &.highlighter-rouge { color: inherit; } @@ -120,12 +132,6 @@ td.rouge-code { padding-right: 1rem; } -div>pre { - @extend %code-snippet-bg; - @extend %code-snippet-radius; - @extend %code-snippet-padding; -} - /* Hide line numbers for default, console, and terminal code snippets */ div { &[class^='highlighter-rouge'], diff --git a/assets/css/_addon/variables.scss b/assets/css/_addon/variables.scss index b591354..7c655f4 100644 --- a/assets/css/_addon/variables.scss +++ b/assets/css/_addon/variables.scss @@ -7,7 +7,7 @@ * MIT Licensed */ -/*--- ↓ width and height ----*/ +/* --- ↓ width and height ---- */ $tab-height: 3.3rem; $tab-cursor-height: 1.6rem; diff --git a/assets/css/_colors/dark-syntax.scss b/assets/css/_colors/dark-syntax.scss index 912acbb..41f3f28 100644 --- a/assets/css/_colors/dark-syntax.scss +++ b/assets/css/_colors/dark-syntax.scss @@ -7,87 +7,82 @@ */ @mixin dark-syntax { - /* syntax highlight colors from https://raw.githubusercontent.com/jwarby/pygments-css/master/monokai.css */ - .highlight pre { background-color: #272822; } - .highlight .hll { background-color: #272822; } - .highlight .c { color: #75715e } /* Comment */ - .highlight .err { color: #960050; background-color: #1e0010 } /* Error */ - .highlight .k { color: #66d9ef } /* Keyword */ - .highlight .l { color: #ae81ff } /* Literal */ - .highlight .n { color: #f8f8f2 } /* Name */ - .highlight .o { color: #f92672 } /* Operator */ - .highlight .p { color: #f8f8f2 } /* Punctuation */ - .highlight .cm { color: #75715e } /* Comment.Multiline */ - .highlight .cp { color: #75715e } /* Comment.Preproc */ - .highlight .c1 { color: #75715e } /* Comment.Single */ - .highlight .cs { color: #75715e } /* Comment.Special */ - .highlight .ge { font-style: italic } /* Generic.Emph */ - .highlight .gs { font-weight: bold } /* Generic.Strong */ - .highlight .kc { color: #66d9ef } /* Keyword.Constant */ - .highlight .kd { color: #66d9ef } /* Keyword.Declaration */ - .highlight .kn { color: #f92672 } /* Keyword.Namespace */ - .highlight .kp { color: #66d9ef } /* Keyword.Pseudo */ - .highlight .kr { color: #66d9ef } /* Keyword.Reserved */ - .highlight .kt { color: #66d9ef } /* Keyword.Type */ - .highlight .ld { color: #e6db74 } /* Literal.Date */ - .highlight .m { color: #ae81ff } /* Literal.Number */ - .highlight .s { color: #e6db74 } /* Literal.String */ - .highlight .na { color: #a6e22e } /* Name.Attribute */ - .highlight .nb { color: #f8f8f2 } /* Name.Builtin */ - .highlight .nc { color: #a6e22e } /* Name.Class */ - .highlight .no { color: #66d9ef } /* Name.Constant */ - .highlight .nd { color: #a6e22e } /* Name.Decorator */ - .highlight .ni { color: #f8f8f2 } /* Name.Entity */ - .highlight .ne { color: #a6e22e } /* Name.Exception */ - .highlight .nf { color: #a6e22e } /* Name.Function */ - .highlight .nl { color: #f8f8f2 } /* Name.Label */ - .highlight .nn { color: #f8f8f2 } /* Name.Namespace */ - .highlight .nx { color: #a6e22e } /* Name.Other */ - .highlight .py { color: #f8f8f2 } /* Name.Property */ - .highlight .nt { color: #f92672 } /* Name.Tag */ - .highlight .nv { color: #f8f8f2 } /* Name.Variable */ - .highlight .ow { color: #f92672 } /* Operator.Word */ - .highlight .w { color: #f8f8f2 } /* Text.Whitespace */ - .highlight .mf { color: #ae81ff } /* Literal.Number.Float */ - .highlight .mh { color: #ae81ff } /* Literal.Number.Hex */ - .highlight .mi { color: #ae81ff } /* Literal.Number.Integer */ - .highlight .mo { color: #ae81ff } /* Literal.Number.Oct */ - .highlight .sb { color: #e6db74 } /* Literal.String.Backtick */ - .highlight .sc { color: #e6db74 } /* Literal.String.Char */ - .highlight .sd { color: #e6db74 } /* Literal.String.Doc */ - .highlight .s2 { color: #e6db74 } /* Literal.String.Double */ - .highlight .se { color: #ae81ff } /* Literal.String.Escape */ - .highlight .sh { color: #e6db74 } /* Literal.String.Heredoc */ - .highlight .si { color: #e6db74 } /* Literal.String.Interpol */ - .highlight .sx { color: #e6db74 } /* Literal.String.Other */ - .highlight .sr { color: #e6db74 } /* Literal.String.Regex */ - .highlight .s1 { color: #e6db74 } /* Literal.String.Single */ - .highlight .ss { color: #e6db74 } /* Literal.String.Symbol */ - .highlight .bp { color: #f8f8f2 } /* Name.Builtin.Pseudo */ - .highlight .vc { color: #f8f8f2 } /* Name.Variable.Class */ - .highlight .vg { color: #f8f8f2 } /* Name.Variable.Global */ - .highlight .vi { color: #f8f8f2 } /* Name.Variable.Instance */ - .highlight .il { color: #ae81ff } /* Literal.Number.Integer.Long */ - - .highlight .gh { } /* Generic Heading & Diff Header */ - .highlight .gu { color: #75715e; } /* Generic.Subheading & Diff Unified/Comment? */ - .highlight .gd { color: #f92672; background-color: #561c08 } /* Generic.Deleted & Diff Deleted */ - .highlight .gi { color: #a6e22e; background-color: #0b5858 } /* Generic.Inserted & Diff Inserted */ - - - /*----- My styles ------*/ - + /* ----- My styles ------ */ --highlight-bg-color: #272822; --highlighter-rouge-color: #de6b18; - --highlight-lineno-color: #6c6c6d; --highlight-lineno-border-color: #3c4042; - --inline-code-bg: var(--highlight-bg-color); .highlight { .gp { color: #818c96; } } - pre { color: #818c96 } /* override Bootstrap */ + + pre { color: #818c96; } /* override Bootstrap */ kbd { background-color: black; } -} \ No newline at end of file + + /* syntax highlight colors from https://raw.githubusercontent.com/jwarby/pygments-css/master/monokai.css */ + .highlight pre { background-color: #272822; } + .highlight .hll { background-color: #272822; } + .highlight .c { color: #75715e; } /* Comment */ + .highlight .err { color: #960050; background-color: #1e0010; } /* Error */ + .highlight .k { color: #66d9ef; } /* Keyword */ + .highlight .l { color: #ae81ff; } /* Literal */ + .highlight .n { color: #f8f8f2; } /* Name */ + .highlight .o { color: #f92672; } /* Operator */ + .highlight .p { color: #f8f8f2; } /* Punctuation */ + .highlight .cm { color: #75715e; } /* Comment.Multiline */ + .highlight .cp { color: #75715e; } /* Comment.Preproc */ + .highlight .c1 { color: #75715e; } /* Comment.Single */ + .highlight .cs { color: #75715e; } /* Comment.Special */ + .highlight .ge { font-style: italic; } /* Generic.Emph */ + .highlight .gs { font-weight: bold; } /* Generic.Strong */ + .highlight .kc { color: #66d9ef; } /* Keyword.Constant */ + .highlight .kd { color: #66d9ef; } /* Keyword.Declaration */ + .highlight .kn { color: #f92672; } /* Keyword.Namespace */ + .highlight .kp { color: #66d9ef; } /* Keyword.Pseudo */ + .highlight .kr { color: #66d9ef; } /* Keyword.Reserved */ + .highlight .kt { color: #66d9ef; } /* Keyword.Type */ + .highlight .ld { color: #e6db74; } /* Literal.Date */ + .highlight .m { color: #ae81ff; } /* Literal.Number */ + .highlight .s { color: #e6db74; } /* Literal.String */ + .highlight .na { color: #a6e22e; } /* Name.Attribute */ + .highlight .nb { color: #f8f8f2; } /* Name.Builtin */ + .highlight .nc { color: #a6e22e; } /* Name.Class */ + .highlight .no { color: #66d9ef; } /* Name.Constant */ + .highlight .nd { color: #a6e22e; } /* Name.Decorator */ + .highlight .ni { color: #f8f8f2; } /* Name.Entity */ + .highlight .ne { color: #a6e22e; } /* Name.Exception */ + .highlight .nf { color: #a6e22e; } /* Name.Function */ + .highlight .nl { color: #f8f8f2; } /* Name.Label */ + .highlight .nn { color: #f8f8f2; } /* Name.Namespace */ + .highlight .nx { color: #a6e22e; } /* Name.Other */ + .highlight .py { color: #f8f8f2; } /* Name.Property */ + .highlight .nt { color: #f92672; } /* Name.Tag */ + .highlight .nv { color: #f8f8f2; } /* Name.Variable */ + .highlight .ow { color: #f92672; } /* Operator.Word */ + .highlight .w { color: #f8f8f2; } /* Text.Whitespace */ + .highlight .mf { color: #ae81ff; } /* Literal.Number.Float */ + .highlight .mh { color: #ae81ff; } /* Literal.Number.Hex */ + .highlight .mi { color: #ae81ff; } /* Literal.Number.Integer */ + .highlight .mo { color: #ae81ff; } /* Literal.Number.Oct */ + .highlight .sb { color: #e6db74; } /* Literal.String.Backtick */ + .highlight .sc { color: #e6db74; } /* Literal.String.Char */ + .highlight .sd { color: #e6db74; } /* Literal.String.Doc */ + .highlight .s2 { color: #e6db74; } /* Literal.String.Double */ + .highlight .se { color: #ae81ff; } /* Literal.String.Escape */ + .highlight .sh { color: #e6db74; } /* Literal.String.Heredoc */ + .highlight .si { color: #e6db74; } /* Literal.String.Interpol */ + .highlight .sx { color: #e6db74; } /* Literal.String.Other */ + .highlight .sr { color: #e6db74; } /* Literal.String.Regex */ + .highlight .s1 { color: #e6db74; } /* Literal.String.Single */ + .highlight .ss { color: #e6db74; } /* Literal.String.Symbol */ + .highlight .bp { color: #f8f8f2; } /* Name.Builtin.Pseudo */ + .highlight .vc { color: #f8f8f2; } /* Name.Variable.Class */ + .highlight .vg { color: #f8f8f2; } /* Name.Variable.Global */ + .highlight .vi { color: #f8f8f2; } /* Name.Variable.Instance */ + .highlight .il { color: #ae81ff; } /* Literal.Number.Integer.Long */ + .highlight .gu { color: #75715e; } /* Generic.Subheading & Diff Unified/Comment? */ + .highlight .gd { color: #f92672; background-color: #561c08; } /* Generic.Deleted & Diff Deleted */ + .highlight .gi { color: #a6e22e; background-color: #0b5858; } /* Generic.Inserted & Diff Inserted */ +} diff --git a/assets/css/_colors/dark-typography.scss b/assets/css/_colors/dark-typography.scss index 256ed29..a88f003 100644 --- a/assets/css/_colors/dark-typography.scss +++ b/assets/css/_colors/dark-typography.scss @@ -26,12 +26,10 @@ --button-bg: rgb(39, 40, 43); --blockquote-border-color: rgb(66, 66, 66); --blockquote-text-color: rgb(117, 117, 117); - --btn-border-color: rgb(63, 65, 68); --btn-backtotop-color: var(--text-color); --btn-backtotop-border-color: var(--btn-border-color); --btn-box-shadow: var(--main-wrapper-bg); - --card-header-bg: rgb(51, 50, 50); --label-color: rgb(108, 117, 125); @@ -71,7 +69,6 @@ --tag-border: rgb(59, 79, 88); --tag-shadow: rgb(32, 33, 33); --search-tag-bg: var(--tag-bg); - --dash-color: rgb(63, 65, 68); /* categories */ @@ -98,10 +95,10 @@ nav[data-toggle=toc] .nav-link.active, nav[data-toggle=toc] .nav-link.active:focus, nav[data-toggle=toc] .nav-link.active:hover, - nav[data-toggle=toc] .nav>li>a:focus, - nav[data-toggle=toc] .nav>li>a:hover { - color: var(--toc-highlight)!important; - border-left-color: var(--toc-highlight)!important; + nav[data-toggle=toc] .nav > li > a:focus, + nav[data-toggle=toc] .nav > li > a:hover { + color: var(--toc-highlight) !important; + border-left-color: var(--toc-highlight) !important; } /* categories */ @@ -126,8 +123,13 @@ } #archives li:nth-child(odd) { - background-image: linear-gradient(to left, - rgb(26, 26, 30), rgb(39, 39, 45), rgb(39, 39, 45), rgb(39, 39, 45), rgb(26, 26, 30)); + background-image: linear-gradient( + to left, + rgb(26, 26, 30), + rgb(39, 39, 45), + rgb(39, 39, 45), + rgb(39, 39, 45), + rgb(26, 26, 30)); } } // dark-scheme diff --git a/assets/css/_colors/light-syntax.scss b/assets/css/_colors/light-syntax.scss index 367d9cd..7fb0d27 100644 --- a/assets/css/_colors/light-syntax.scss +++ b/assets/css/_colors/light-syntax.scss @@ -8,73 +8,72 @@ @mixin light-syntax { /* see: */ - .highlight .hll { background-color: #ffffcc } - .highlight .c { color: #999988; font-style: italic } /* Comment */ - .highlight .err { color: #a61717; background-color: #e3d2d2 } /* Error */ - .highlight .k { color: #000000; font-weight: bold } /* Keyword */ - .highlight .o { color: #000000; font-weight: bold } /* Operator */ - .highlight .cm { color: #999988; font-style: italic } /* Comment.Multiline */ - .highlight .cp { color: #999999; font-weight: bold; font-style: italic } /* Comment.Preproc */ - .highlight .c1 { color: #999988; font-style: italic } /* Comment.Single */ - .highlight .cs { color: #999999; font-weight: bold; font-style: italic } /* Comment.Special */ - .highlight .gd { color: #d01040; background-color: #ffdddd } /* Generic.Deleted */ - .highlight .ge { color: #000000; font-style: italic } /* Generic.Emph */ - .highlight .gr { color: #aa0000 } /* Generic.Error */ - .highlight .gh { color: #999999 } /* Generic.Heading */ - .highlight .gi { color: #008080; background-color: #ddffdd } /* Generic.Inserted */ - .highlight .go { color: #888888 } /* Generic.Output */ - .highlight .gp { color: #555555 } /* Generic.Prompt */ - .highlight .gs { font-weight: bold } /* Generic.Strong */ - .highlight .gu { color: #aaaaaa } /* Generic.Subheading */ - .highlight .gt { color: #aa0000 } /* Generic.Traceback */ - .highlight .kc { color: #000000; font-weight: bold } /* Keyword.Constant */ - .highlight .kd { color: #000000; font-weight: bold } /* Keyword.Declaration */ - .highlight .kn { color: #000000; font-weight: bold } /* Keyword.Namespace */ - .highlight .kp { color: #000000; font-weight: bold } /* Keyword.Pseudo */ - .highlight .kr { color: #000000; font-weight: bold } /* Keyword.Reserved */ - .highlight .kt { color: #445588; font-weight: bold } /* Keyword.Type */ - .highlight .m { color: #009999 } /* Literal.Number */ - .highlight .s { color: #d01040 } /* Literal.String */ - .highlight .na { color: #008080 } /* Name.Attribute */ - .highlight .nb { color: #0086B3 } /* Name.Builtin */ - .highlight .nc { color: #445588; font-weight: bold } /* Name.Class */ - .highlight .no { color: #008080 } /* Name.Constant */ - .highlight .nd { color: #3c5d5d; font-weight: bold } /* Name.Decorator */ - .highlight .ni { color: #800080 } /* Name.Entity */ - .highlight .ne { color: #990000; font-weight: bold } /* Name.Exception */ - .highlight .nf { color: #990000; font-weight: bold } /* Name.Function */ - .highlight .nl { color: #990000; font-weight: bold } /* Name.Label */ - .highlight .nn { color: #555555 } /* Name.Namespace */ - .highlight .nt { color: #000080 } /* Name.Tag */ - .highlight .nv { color: #008080 } /* Name.Variable */ - .highlight .ow { color: #000000; font-weight: bold } /* Operator.Word */ - .highlight .w { color: #bbbbbb } /* Text.Whitespace */ - .highlight .mf { color: #009999 } /* Literal.Number.Float */ - .highlight .mh { color: #009999 } /* Literal.Number.Hex */ - .highlight .mi { color: #009999 } /* Literal.Number.Integer */ - .highlight .mo { color: #009999 } /* Literal.Number.Oct */ - .highlight .sb { color: #d01040 } /* Literal.String.Backtick */ - .highlight .sc { color: #d01040 } /* Literal.String.Char */ - .highlight .sd { color: #d01040 } /* Literal.String.Doc */ - .highlight .s2 { color: #d01040 } /* Literal.String.Double */ - .highlight .se { color: #d01040 } /* Literal.String.Escape */ - .highlight .sh { color: #d01040 } /* Literal.String.Heredoc */ - .highlight .si { color: #d01040 } /* Literal.String.Interpol */ - .highlight .sx { color: #d01040 } /* Literal.String.Other */ - .highlight .sr { color: #009926 } /* Literal.String.Regex */ - .highlight .s1 { color: #d01040 } /* Literal.String.Single */ - .highlight .ss { color: #990073 } /* Literal.String.Symbol */ - .highlight .bp { color: #999999 } /* Name.Builtin.Pseudo */ - .highlight .vc { color: #008080 } /* Name.Variable.Class */ - .highlight .vg { color: #008080 } /* Name.Variable.Global */ - .highlight .vi { color: #008080 } /* Name.Variable.Instance */ - .highlight .il { color: #009999 } /* Literal.Number.Integer.Long */ + .highlight .hll { background-color: #ffffcc; } + .highlight .c { color: #999988; font-style: italic; } /* Comment */ + .highlight .err { color: #a61717; background-color: #e3d2d2; } /* Error */ + .highlight .k { color: #000000; font-weight: bold; } /* Keyword */ + .highlight .o { color: #000000; font-weight: bold; } /* Operator */ + .highlight .cm { color: #999988; font-style: italic; } /* Comment.Multiline */ + .highlight .cp { color: #999999; font-weight: bold; font-style: italic; } /* Comment.Preproc */ + .highlight .c1 { color: #999988; font-style: italic; } /* Comment.Single */ + .highlight .cs { color: #999999; font-weight: bold; font-style: italic; } /* Comment.Special */ + .highlight .gd { color: #d01040; background-color: #ffdddd; } /* Generic.Deleted */ + .highlight .ge { color: #000000; font-style: italic; } /* Generic.Emph */ + .highlight .gr { color: #aa0000; } /* Generic.Error */ + .highlight .gh { color: #999999; } /* Generic.Heading */ + .highlight .gi { color: #008080; background-color: #ddffdd; } /* Generic.Inserted */ + .highlight .go { color: #888888; } /* Generic.Output */ + .highlight .gp { color: #555555; } /* Generic.Prompt */ + .highlight .gs { font-weight: bold; } /* Generic.Strong */ + .highlight .gu { color: #aaaaaa; } /* Generic.Subheading */ + .highlight .gt { color: #aa0000; } /* Generic.Traceback */ + .highlight .kc { color: #000000; font-weight: bold; } /* Keyword.Constant */ + .highlight .kd { color: #000000; font-weight: bold; } /* Keyword.Declaration */ + .highlight .kn { color: #000000; font-weight: bold; } /* Keyword.Namespace */ + .highlight .kp { color: #000000; font-weight: bold; } /* Keyword.Pseudo */ + .highlight .kr { color: #000000; font-weight: bold; } /* Keyword.Reserved */ + .highlight .kt { color: #445588; font-weight: bold; } /* Keyword.Type */ + .highlight .m { color: #009999; } /* Literal.Number */ + .highlight .s { color: #d01040; } /* Literal.String */ + .highlight .na { color: #008080; } /* Name.Attribute */ + .highlight .nb { color: #0086b3; } /* Name.Builtin */ + .highlight .nc { color: #445588; font-weight: bold; } /* Name.Class */ + .highlight .no { color: #008080; } /* Name.Constant */ + .highlight .nd { color: #3c5d5d; font-weight: bold; } /* Name.Decorator */ + .highlight .ni { color: #800080; } /* Name.Entity */ + .highlight .ne { color: #990000; font-weight: bold; } /* Name.Exception */ + .highlight .nf { color: #990000; font-weight: bold; } /* Name.Function */ + .highlight .nl { color: #990000; font-weight: bold; } /* Name.Label */ + .highlight .nn { color: #555555; } /* Name.Namespace */ + .highlight .nt { color: #000080; } /* Name.Tag */ + .highlight .nv { color: #008080; } /* Name.Variable */ + .highlight .ow { color: #000000; font-weight: bold; } /* Operator.Word */ + .highlight .w { color: #bbbbbb; } /* Text.Whitespace */ + .highlight .mf { color: #009999; } /* Literal.Number.Float */ + .highlight .mh { color: #009999; } /* Literal.Number.Hex */ + .highlight .mi { color: #009999; } /* Literal.Number.Integer */ + .highlight .mo { color: #009999; } /* Literal.Number.Oct */ + .highlight .sb { color: #d01040; } /* Literal.String.Backtick */ + .highlight .sc { color: #d01040; } /* Literal.String.Char */ + .highlight .sd { color: #d01040; } /* Literal.String.Doc */ + .highlight .s2 { color: #d01040; } /* Literal.String.Double */ + .highlight .se { color: #d01040; } /* Literal.String.Escape */ + .highlight .sh { color: #d01040; } /* Literal.String.Heredoc */ + .highlight .si { color: #d01040; } /* Literal.String.Interpol */ + .highlight .sx { color: #d01040; } /* Literal.String.Other */ + .highlight .sr { color: #009926; } /* Literal.String.Regex */ + .highlight .s1 { color: #d01040; } /* Literal.String.Single */ + .highlight .ss { color: #990073; } /* Literal.String.Symbol */ + .highlight .bp { color: #999999; } /* Name.Builtin.Pseudo */ + .highlight .vc { color: #008080; } /* Name.Variable.Class */ + .highlight .vg { color: #008080; } /* Name.Variable.Global */ + .highlight .vi { color: #008080; } /* Name.Variable.Instance */ + .highlight .il { color: #009999; } /* Literal.Number.Integer.Long */ - /*--- custom light colors ---*/ + /* --- custom light colors --- */ --highlight-bg-color: #f7f7f7; --highlighter-rouge-color: #353a3d; --highlight-lineno-color: #c2c6cc; --highlight-lineno-border-color: #e9ecef; - --inline-code-bg: #f3f3f3; } // light-syntax diff --git a/assets/css/_colors/light-typography.scss b/assets/css/_colors/light-typography.scss index 9d77763..d4388f4 100644 --- a/assets/css/_colors/light-typography.scss +++ b/assets/css/_colors/light-typography.scss @@ -7,118 +7,70 @@ */ @mixin light-scheme { - + /* Common */ --body-bg: #fafafa; - --mask-bg: #c1c3c5; - --main-wrapper-bg: white; - --main-border-color: #f3f3f3; - --btn-border-color: #e9ecef; - --text-color: #333333; - --blockquote-border-color: #eee; - --blockquote-text-color: #9a9a9a; - --link-color: #2a408e; - --link-underline-color: #dee2e6; - --text-muted-color: gray; - --tb-odd-bg: #fbfcfd; - --tb-border-color: #eaeaea; - --button-bg: #fff; - --btn-backtotop-color: #686868; - --btn-backtotop-border-color: #f1f1f1; //--main-border-color, - --btn-box-shadow: #eaeaea; /* Sidebar */ - --sidebar-bg: radial-gradient( - circle, rgba(42, 30, 107, 1) 0%, rgba(35, 37, 46, 1) 100%); - + circle, + rgba(42, 30, 107, 1) 0%, + rgba(35, 37, 46, 1) 100%); --nav-cursor-color: #fcfcfc; /* Topbar */ - --topbar-wrapper-bg: white; - --topbar-text-color: rgb(78, 78, 78); - --search-wrapper-bg: #f5f5f5; - --search-tag-bg: #f8f9fa; - --search-icon-color: #c2c6cc; - --input-focus-border-color: var(--btn-border-color); /* Home page */ - --post-list-text-color: dimgray; - --btn-patinator-text-color: #555555; - --btn-paginator-hover-color: #e9ecef; - --btn-active-bg: #2a408e; - --btn-active-border-color: #007bff; - --btn-text-color: #f8f8f8; - --btn-paginator-border-color: #f1f1f1; - --btn-paginator-shadow: #4b92d2; /* Posts */ - --btn-share-hover-color: var(--link-color); - --card-border-color: #f1f1f1; - --card-box-shadow: rgba(234, 234, 234, 0.7686274509803922); - --label-color: #808080; - - --relate-post-date: rgba(30, 55, 70, .4); - + --relate-post-date: rgba(30, 55, 70, 0.4); --tag-bg: rgba(0, 0, 0, 0.075); - --tag-border: #dee2e6; - --tag-shadow: var(--btn-border-color); - --tag-hover: rgb(222, 226, 230); - --categories-hover-bg: var(--btn-border-color); - --dash-color: silver; - /* Archive */ - --timeline-color: rgba(0, 0, 0, 0.075); - --timeline-node-bg: #c2c6cc; - --timeline-year-dot-color: #ffffff; /* Footer */ - --footer-bg-color: #ffffff; - --footnote-target-bg: lightcyan; - --footer-link: #424242; -} +} // light-scheme