diff --git a/assets/css/_highlight.scss b/assets/css/_highlight.scss new file mode 100644 index 000000000..2fbb9caf9 --- /dev/null +++ b/assets/css/_highlight.scss @@ -0,0 +1,82 @@ +/* Background */ .chroma { color: #4d4d4d; background-color: #ffffff } +/* Other */ .chroma .x { } +/* Error */ .chroma .err { color: #ffffff; background-color: #cc0000 } +/* LineTableTD */ .chroma .lntd { vertical-align: top; padding: 0; margin: 0; border: 0; } +/* LineTable */ .chroma .lntable { border-spacing: 0; padding: 0; margin: 0; border: 0; width: auto; overflow: auto; display: block; } +/* LineHighlight */ .chroma .hl { display: block; width: 100%;background-color: #ffffcc } +/* LineNumbersTable */ .chroma .lnt { margin-right: 0.4em; padding: 0 0.4em 0 0.4em;color: #7f7f7f } +/* LineNumbers */ .chroma .ln { margin-right: 0.4em; padding: 0 0.4em 0 0.4em;color: #7f7f7f } +/* Keyword */ .chroma .k { color: #2c5dcd; font-weight: bold } +/* KeywordConstant */ .chroma .kc { color: #2c5dcd; font-weight: bold } +/* KeywordDeclaration */ .chroma .kd { color: #2c5dcd; font-weight: bold } +/* KeywordNamespace */ .chroma .kn { color: #2c5dcd; font-weight: bold } +/* KeywordPseudo */ .chroma .kp { color: #2c5dcd } +/* KeywordReserved */ .chroma .kr { color: #2c5dcd; font-weight: bold } +/* KeywordType */ .chroma .kt { color: #5918bb; font-weight: bold } +/* Name */ .chroma .n { } +/* NameAttribute */ .chroma .na { color: #2c5dcd; font-style: italic } +/* NameBuiltin */ .chroma .nb { color: #5918bb; font-weight: bold } +/* NameBuiltinPseudo */ .chroma .bp { } +/* NameClass */ .chroma .nc { text-decoration: underline } +/* NameConstant */ .chroma .no { color: #318495 } +/* NameDecorator */ .chroma .nd { color: #ff8000; font-weight: bold } +/* NameEntity */ .chroma .ni { color: #5918bb; font-weight: bold } +/* NameException */ .chroma .ne { color: #5918bb; font-weight: bold } +/* NameFunction */ .chroma .nf { color: #ff8000; font-weight: bold } +/* NameFunctionMagic */ .chroma .fm { } +/* NameLabel */ .chroma .nl { } +/* NameNamespace */ .chroma .nn { } +/* NameOther */ .chroma .nx { } +/* NameProperty */ .chroma .py { } +/* NameTag */ .chroma .nt { color: #2c5dcd; font-weight: bold } +/* NameVariable */ .chroma .nv { } +/* NameVariableClass */ .chroma .vc { } +/* NameVariableGlobal */ .chroma .vg { } +/* NameVariableInstance */ .chroma .vi { } +/* NameVariableMagic */ .chroma .vm { } +/* Literal */ .chroma .l { } +/* LiteralDate */ .chroma .ld { } +/* LiteralString */ .chroma .s { color: #00cc66 } +/* LiteralStringAffix */ .chroma .sa { color: #00cc66 } +/* LiteralStringBacktick */ .chroma .sb { color: #00cc66 } +/* LiteralStringChar */ .chroma .sc { color: #00cc66 } +/* LiteralStringDelimiter */ .chroma .dl { color: #00cc66 } +/* LiteralStringDoc */ .chroma .sd { color: #00cc66; font-style: italic } +/* LiteralStringDouble */ .chroma .s2 { color: #00cc66 } +/* LiteralStringEscape */ .chroma .se { color: #c5060b; font-weight: bold } +/* LiteralStringHeredoc */ .chroma .sh { color: #00cc66 } +/* LiteralStringInterpol */ .chroma .si { color: #00cc66 } +/* LiteralStringOther */ .chroma .sx { color: #318495 } +/* LiteralStringRegex */ .chroma .sr { color: #00cc66 } +/* LiteralStringSingle */ .chroma .s1 { color: #00cc66 } +/* LiteralStringSymbol */ .chroma .ss { color: #c5060b; font-weight: bold } +/* LiteralNumber */ .chroma .m { color: #5918bb; font-weight: bold } +/* LiteralNumberBin */ .chroma .mb { color: #5918bb; font-weight: bold } +/* LiteralNumberFloat */ .chroma .mf { color: #5918bb; font-weight: bold } +/* LiteralNumberHex */ .chroma .mh { color: #5918bb; font-weight: bold } +/* LiteralNumberInteger */ .chroma .mi { color: #5918bb; font-weight: bold } +/* LiteralNumberIntegerLong */ .chroma .il { color: #5918bb; font-weight: bold } +/* LiteralNumberOct */ .chroma .mo { color: #5918bb; font-weight: bold } +/* Operator */ .chroma .o { color: #2c5dcd } +/* OperatorWord */ .chroma .ow { color: #2c5dcd; font-weight: bold } +/* Punctuation */ .chroma .p { } +/* Comment */ .chroma .c { color: #0080ff; font-style: italic } +/* CommentHashbang */ .chroma .ch { color: #0080ff; font-style: italic } +/* CommentMultiline */ .chroma .cm { color: #0080ff; font-style: italic } +/* CommentSingle */ .chroma .c1 { color: #0080ff; font-style: italic } +/* CommentSpecial */ .chroma .cs { color: #0080ff; font-weight: bold; font-style: italic } +/* CommentPreproc */ .chroma .cp { color: #0080ff } +/* CommentPreprocFile */ .chroma .cpf { color: #0080ff } +/* Generic */ .chroma .g { } +/* GenericDeleted */ .chroma .gd { background-color: #ffcccc } +/* GenericEmph */ .chroma .ge { font-style: italic } +/* GenericError */ .chroma .gr { color: #ff0000 } +/* GenericHeading */ .chroma .gh { color: #2c5dcd; font-weight: bold } +/* GenericInserted */ .chroma .gi { background-color: #ccffcc } +/* GenericOutput */ .chroma .go { color: #aaaaaa } +/* GenericPrompt */ .chroma .gp { color: #2c5dcd; font-weight: bold } +/* GenericStrong */ .chroma .gs { font-weight: bold } +/* GenericSubheading */ .chroma .gu { color: #2c5dcd; font-weight: bold } +/* GenericTraceback */ .chroma .gt { color: #c5060b } +/* GenericUnderline */ .chroma .gl { text-decoration: underline } +/* TextWhitespace */ .chroma .w { color: #cbcbcb } diff --git a/assets/css/_page/_single.scss b/assets/css/_page/_single.scss index 50d3a10c4..0cca191e8 100644 --- a/assets/css/_page/_single.scss +++ b/assets/css/_page/_single.scss @@ -81,7 +81,7 @@ h3, h4, h5, h6 { font-weight: bold; margin-bottom: 1rem; - margin-top: 3.2rem; + margin-top: 1.8rem; & + * { margin-top: 0 !important; @@ -91,7 +91,7 @@ h2 { margin-bottom: 1.2rem; font-size: 2rem; - margin-top: 7rem; + margin-top: 3rem; } h3 { @@ -251,7 +251,7 @@ display: block; border-left: .3rem solid $blockquote-color; background-color: rgba($blockquote-color, .2); - padding: .25rem .75rem; + padding: .00rem .75rem; margin: 1rem 0; [theme=dark] & { diff --git a/assets/css/_partial/_archive/_terms.scss b/assets/css/_partial/_archive/_terms.scss index 1f63a47dc..03f591204 100644 --- a/assets/css/_partial/_archive/_terms.scss +++ b/assets/css/_partial/_archive/_terms.scss @@ -32,7 +32,7 @@ } span { - float: right; + float: left; padding-right: 1rem; } } diff --git a/assets/css/_partial/_footer.scss b/assets/css/_partial/_footer.scss index 88bc2d9a7..1d8102c4a 100644 --- a/assets/css/_partial/_footer.scss +++ b/assets/css/_partial/_footer.scss @@ -1,11 +1,13 @@ .footer { width: 100%; + border-top: 0.1rem solid #ebebeb; text-align: center; - line-height: 1.25rem; + line-height: 1.5rem; margin: 3rem 0 1rem 0; + font-family: 'Google Sans'; .footer-container { - font-size: .875rem; + font-size: .8rem; .footer-line { width: 100%; diff --git a/assets/css/_partial/_header.scss b/assets/css/_partial/_header.scss index 01249bd9f..126f1995b 100644 --- a/assets/css/_partial/_header.scss +++ b/assets/css/_partial/_header.scss @@ -150,6 +150,7 @@ position: fixed; height: $header-height; line-height: $header-height; + border-bottom: 0.1rem solid #ebebeb; [data-header-desktop=normal] & { position: static; diff --git a/assets/css/_partial/_pagination.scss b/assets/css/_partial/_pagination.scss index 10d24b77b..8806fbd9f 100644 --- a/assets/css/_partial/_pagination.scss +++ b/assets/css/_partial/_pagination.scss @@ -8,10 +8,10 @@ padding: 1rem 0 0; a { - font-size: .8rem; + font-size: .9rem; color: #bfbfbf; letter-spacing: .1rem; - font-weight: 700; + font-weight: normal; padding: 5px 5px; text-decoration: none; @include transition(0.3s); diff --git a/assets/css/_variables.scss b/assets/css/_variables.scss index 118998d08..f4fd6c4ce 100644 --- a/assets/css/_variables.scss +++ b/assets/css/_variables.scss @@ -4,7 +4,58 @@ // ========== Global ========== // // Font and Line Height -$global-font-family: system-ui, -apple-system, BlinkMacSystemFont, PingFang SC, Microsoft YaHei UI, Segoe UI, Roboto, Oxygen, Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue, Helvetica, Arial, sans-serif !default; +/* latin-ext */ +@font-face { + font-family: 'Overpass Mono'; + font-style: normal; + font-weight: 400; + src: url('/font/overpassmono/_Xmq-H86tzKDdAPa-KPQZ-AC1i-0tt21C34.woff2') format('woff2'); + unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; +} +/* latin */ +@font-face { + font-family: 'Overpass Mono'; + font-style: normal; + font-weight: 400; + src: url('/font/overpassmono/_Xmq-H86tzKDdAPa-KPQZ-AC1i-0tt21C34.woff2') format('woff2'); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; +} +/* latin-ext */ +@font-face { + font-family: 'Overpass Mono'; + font-style: normal; + font-weight: 700; + src: url('/font/overpassmono/_Xm3-H86tzKDdAPa-KPQZ-AC3pSRo_CXBlRc4EU.woff2') format('woff2'); + unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; +} +/* latin */ +@font-face { + font-family: 'Overpass Mono'; + font-style: normal; + font-weight: 700; + src: url('/font/overpassmono/_Xm3-H86tzKDdAPa-KPQZ-AC3pSRo_CXBlRc4EU.woff2') format('woff2'); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; +} + +/* latin */ +@font-face { + font-family: 'Google Sans'; + font-style: normal; + font-weight: 400; + src: url('/font/googlesans/4UaGrENHsxJlGDuGo1OIlL3Owp5eKQtG.woff2') format('woff2'); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; +} + +/* latin */ +@font-face { + font-family: 'Google Sans'; + font-style: normal; + font-weight: 500; + src: url('/font/googlesans/4UabrENHsxJlGDuGo1OIlLU94YtzCwZsPF4o.woff2') format('woff2'); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; +} + +$global-font-family: 'Google Sans', system-ui, -apple-system, BlinkMacSystemFont, PingFang SC, Microsoft YaHei UI, Segoe UI, Roboto, Oxygen, Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue, Helvetica, Arial, sans-serif, !default; $global-font-size: 16px; $global-font-weight: 400; $global-line-height: 1.5rem; @@ -65,8 +116,8 @@ $header-background-color: #f8f8f8 !default; $header-background-color-dark: #252627 !default; // Font style of the header title -$header-title-font-family: $global-font-family !default; -$header-title-font-size: 1.5rem !default; +$header-title-font-family: 'Google Sans', $global-font-family !default; +$header-title-font-size: 1.25rem !default; // Color of the hover header item $header-hover-color: #161209 !default; @@ -135,7 +186,7 @@ $code-info-color-dark: #b1b0b0 !default; $code-font-size: .875rem !default; // Font family of the code -$code-font-family: Source Code Pro, Menlo, Consolas, Monaco, monospace, $global-font-family !default; +$code-font-family: 'Google Sans', Source Code Pro, Menlo, Consolas, Monaco, monospace, $global-font-family !default; $margin-article: 1.5rem 0; @@ -171,7 +222,7 @@ $code-type-map: ( language-makefile: 'Makefile', language-markdown: 'Markdown', language-matlab: 'Matlab', - language-objectivec: 'Objective-C', + language-objc: 'Objective-C', language-php: 'PHP', language-perl: 'Perl', language-python: 'Python', @@ -268,6 +319,7 @@ $code-highlight-color-map: ( /* GenericTraceback */ 'gt': #e72d40, /* TextWhitespace */ 'w': #bbbbbb, ) !default; + $code-highlight-color-map-dark: ( /* Parentheses */ 'p': #a9a9b3, /* Keyword */ 'k': #d371e3, diff --git a/assets/css/style.scss b/assets/css/style.scss index b1aad8c84..59867ed3f 100644 --- a/assets/css/style.scss +++ b/assets/css/style.scss @@ -1,5 +1,7 @@ @charset "utf-8"; +@import "_highlight"; + @import "_variables"; @import "_override"; diff --git a/assets/lib/normalize/normalize.min.css b/assets/lib/normalize/normalize.min.css index 3aa6bcb0c..6fae2f1c6 100644 --- a/assets/lib/normalize/normalize.min.css +++ b/assets/lib/normalize/normalize.min.css @@ -5,5 +5,5 @@ * Do NOT use SRI with dynamically generated files! More information: https://www.jsdelivr.com/using-sri-with-dynamic-files */ /*! normalize.css v8.0.1 | MIT License | github.com/necolas/normalize.css */ -html{line-height:1.15;-webkit-text-size-adjust:100%}body{margin:0}main{display:block}h1{font-size:2em;margin:.67em 0}hr{box-sizing:content-box;height:0;overflow:visible}pre{font-family:monospace,monospace;font-size:1em}a{background-color:transparent}abbr[title]{border-bottom:none;text-decoration:underline;text-decoration:underline dotted}b,strong{font-weight:bolder}code,kbd,samp{font-family:monospace,monospace;font-size:1em}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sub{bottom:-.25em}sup{top:-.5em}img{border-style:none}button,input,optgroup,select,textarea{font-family:inherit;font-size:100%;line-height:1.15;margin:0}button,input{overflow:visible}button,select{text-transform:none}[type=button],[type=reset],[type=submit],button{-webkit-appearance:button}[type=button]::-moz-focus-inner,[type=reset]::-moz-focus-inner,[type=submit]::-moz-focus-inner,button::-moz-focus-inner{border-style:none;padding:0}[type=button]:-moz-focusring,[type=reset]:-moz-focusring,[type=submit]:-moz-focusring,button:-moz-focusring{outline:1px dotted ButtonText}fieldset{padding:.35em .75em .625em}legend{box-sizing:border-box;color:inherit;display:table;max-width:100%;padding:0;white-space:normal}progress{vertical-align:baseline}textarea{overflow:auto}[type=checkbox],[type=radio]{box-sizing:border-box;padding:0}[type=number]::-webkit-inner-spin-button,[type=number]::-webkit-outer-spin-button{height:auto}[type=search]{-webkit-appearance:textfield;outline-offset:-2px}[type=search]::-webkit-search-decoration{-webkit-appearance:none}::-webkit-file-upload-button{-webkit-appearance:button;font:inherit}details{display:block}summary{display:list-item}template{display:none}[hidden]{display:none} +html{line-height:1.15;-webkit-text-size-adjust:100%}body{margin:0}main{display:block}h1{font-size:2em;margin:.67em 0}hr{box-sizing:content-box;height:0;overflow:visible}pre{font-family:monospace,monospace;font-size:1em}a{background-color:transparent}abbr[title]{border-bottom:none;text-decoration:underline;text-decoration:underline dotted}b,strong{font-weight:bolder}code,kbd,samp{font-family:'Google Sans';font-size:1em}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sub{bottom:-.25em}sup{top:-.5em}img{border-style:none}button,input,optgroup,select,textarea{font-family:inherit;font-size:100%;line-height:1.15;margin:0}button,input{overflow:visible}button,select{text-transform:none}[type=button],[type=reset],[type=submit],button{-webkit-appearance:button}[type=button]::-moz-focus-inner,[type=reset]::-moz-focus-inner,[type=submit]::-moz-focus-inner,button::-moz-focus-inner{border-style:none;padding:0}[type=button]:-moz-focusring,[type=reset]:-moz-focusring,[type=submit]:-moz-focusring,button:-moz-focusring{outline:1px dotted ButtonText}fieldset{padding:.35em .75em .625em}legend{box-sizing:border-box;color:inherit;display:table;max-width:100%;padding:0;white-space:normal}progress{vertical-align:baseline}textarea{overflow:auto}[type=checkbox],[type=radio]{box-sizing:border-box;padding:0}[type=number]::-webkit-inner-spin-button,[type=number]::-webkit-outer-spin-button{height:auto}[type=search]{-webkit-appearance:textfield;outline-offset:-2px}[type=search]::-webkit-search-decoration{-webkit-appearance:none}::-webkit-file-upload-button{-webkit-appearance:button;font:inherit}details{display:block}summary{display:list-item}template{display:none}[hidden]{display:none} /*# sourceMappingURL=/sm/5d8a97cdb40a6c49031b52d63494a6eca084416b5b035e5698fdc5fa0969b2c3.map */ \ No newline at end of file diff --git a/assets/lib/prismjs/prism.css b/assets/lib/prismjs/prism.css index f3df8c80e..b2a99b058 100644 --- a/assets/lib/prismjs/prism.css +++ b/assets/lib/prismjs/prism.css @@ -11,7 +11,7 @@ pre[class*="language-"] { color: black; background: none; text-shadow: 0 1px white; - font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace; + font-family: 'Google Sans', Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace; font-size: 1em; text-align: left; white-space: pre; diff --git a/layouts/_default/section.html b/layouts/_default/section.html index 10d953c57..8b93c501a 100644 --- a/layouts/_default/section.html +++ b/layouts/_default/section.html @@ -28,7 +28,7 @@

{{- .Key }}
{{- range .Pages -}}
- + {{- .Title -}} diff --git a/layouts/_default/summary.html b/layouts/_default/summary.html index 433ce619c..138fe6cef 100644 --- a/layouts/_default/summary.html +++ b/layouts/_default/summary.html @@ -26,7 +26,7 @@ {{- end -}} {{- end -}} - + {{- dict "Src" . "Title" $.Description "Resources" $.Resources "Alt" $.Title "Height" 798 "Width" 238 | partial "plugin/image.html" -}} @@ -36,7 +36,7 @@
{{- /* Title */ -}}

- {{ .Title }} + {{ .Title }}

{{- if not $params.summaryStyle.hiddenMeta -}} @@ -59,7 +59,7 @@

{{ $author := index .Site.Data.authors $authorName }} {{- $authorLink := $author.link | default .Site.Home.RelPermalink -}} - {{- $options := dict "Class" "author" "Destination" $authorLink "Title" "Author" "Rel" "author" "Icon" (dict "Class" "svg-icon icon-user") "Content" $author.nickname -}} + {{- $options := dict "Class" "author" "Destination" $authorLink "Title" "Author" "Rel" "author" "Icon" (dict "Class" "svg-icon icon-pencil") "Content" $author.nickname -}} {{- partial "plugin/link.html" $options -}} {{- end -}} diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index ad257ad34..ceae8bfee 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -31,16 +31,18 @@ {{- end -}} {{- /* Author */ -}} - {{- $authorName := .Site.Author.name | default " " -}} - {{- if ne $authorName " " -}} - {{ $author := index .Site.Data.authors $authorName }} - {{- $authorLink := $author.link | default .Site.Home.RelPermalink -}} -  {{ $author.nickname }} + {{- if ne .Site.Params.footer.author false -}} + {{- $authorName := .Site.Author.name | default " " -}} + {{- if ne $authorName " " -}} + {{ $author := index .Site.Data.authors $authorName }} + {{- $authorLink := $author.link | default .Site.Home.RelPermalink -}} +  {{ $author.nickname }} + {{- end -}} {{- end -}} {{- /* License */ -}} {{- with .Site.Params.footer.license -}} -  | {{ . | safeHTML }} + {{ . | safeHTML }} {{- end -}} {{- /* ICP */ -}} diff --git a/layouts/partials/paginator.html b/layouts/partials/paginator.html index 265d3ffa8..fdad8b83f 100644 --- a/layouts/partials/paginator.html +++ b/layouts/partials/paginator.html @@ -5,12 +5,12 @@

Пагинация

diff --git a/layouts/taxonomy/list.html b/layouts/taxonomy/list.html index afdc4bebd..9da328e3d 100644 --- a/layouts/taxonomy/list.html +++ b/layouts/taxonomy/list.html @@ -26,7 +26,7 @@

{{ .Key }}

{{- range .Pages -}}
- + {{- .Title -}} diff --git a/layouts/taxonomy/terms.html b/layouts/taxonomy/terms.html index 6e6edc42d..5704819ef 100644 --- a/layouts/taxonomy/terms.html +++ b/layouts/taxonomy/terms.html @@ -33,7 +33,7 @@

{{- range first 5 $pages -}}