Skip to content
This repository was archived by the owner on Dec 20, 2021. It is now read-only.

fix: params.footer.author not work #143

Open
ryderfang wants to merge 9 commits into
base: master
Choose a base branch
from
Open

fix: params.footer.author not work #143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f0d5b8a
fix: params.footer.author not work
ryderfang Nov 1, 2021
83741e4
custom css by ryder
ryderfang Nov 8, 2021
b5e3aed
change icon for user
ryderfang Nov 12, 2021
c42c097
update font
ryderfang Nov 16, 2021
97f3533
make header smaller
ryderfang Nov 16, 2021
15e9f28
modify margin-top
ryderfang Dec 23, 2021
c4e13aa
update footer
ryderfang Dec 28, 2021
187790d
add highlight css
ryderfang Feb 25, 2022
ad70982
style: add border for header & footer
ryderfang Mar 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
82 changes: 82 additions & 0 deletions assets/css/_highlight.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 }
6 changes: 3 additions & 3 deletions assets/css/_page/_single.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -91,7 +91,7 @@
h2 {
margin-bottom: 1.2rem;
font-size: 2rem;
margin-top: 7rem;
margin-top: 3rem;
}

h3 {
Expand Down Expand Up @@ -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] & {
Expand Down
2 changes: 1 addition & 1 deletion assets/css/_partial/_archive/_terms.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
}

span {
float: right;
float: left;
padding-right: 1rem;
}
}
Expand Down
6 changes: 4 additions & 2 deletions assets/css/_partial/_footer.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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%;
Expand Down
1 change: 1 addition & 0 deletions assets/css/_partial/_header.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions assets/css/_partial/_pagination.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
62 changes: 57 additions & 5 deletions assets/css/_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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',
Expand Down Expand Up @@ -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,
Expand Down
2 changes: 2 additions & 0 deletions assets/css/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
@charset "utf-8";

@import "_highlight";

@import "_variables";
@import "_override";

Expand Down
2 changes: 1 addition & 1 deletion assets/lib/normalize/normalize.min.css
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion assets/lib/prismjs/prism.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion layouts/_default/section.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ <h2 class="single-title pulse faster">
<div class="group-title-month">{{- .Key }}</div>
{{- range .Pages -}}
<article class="archive-item">
<a href="{{ .RelPermalink }}" class="archive-item-link">
<a target="_self" href="{{ .RelPermalink }}" class="archive-item-link">
{{- .Title -}}
</a>
<span class="archive-item-date">
Expand Down
6 changes: 3 additions & 3 deletions layouts/_default/summary.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
</div>
{{- end -}}
{{- end -}}
<a href="{{ $.RelPermalink }}" target="_blank">
<a href="{{ $.RelPermalink }}" target="_self">
{{- dict "Src" . "Title" $.Description "Resources" $.Resources "Alt" $.Title "Height" 798 "Width" 238 | partial "plugin/image.html" -}}
</a>
</div>
Expand All @@ -36,7 +36,7 @@
<div style="padding-top: 20px;padding-left: 20px;padding-right: 20px;">
{{- /* Title */ -}}
<h2 class="summary-title" itemprop="name headline">
<a href="{{ $.RelPermalink }}" target="_blank">{{ .Title }}</a>
<a href="{{ $.RelPermalink }}" target="_self">{{ .Title }}</a>
</h2>

{{- if not $params.summaryStyle.hiddenMeta -}}
Expand All @@ -59,7 +59,7 @@ <h2 class="summary-title" itemprop="name headline">
{{ $author := index .Site.Data.authors $authorName }}
{{- $authorLink := $author.link | default .Site.Home.RelPermalink -}}
<span class="meta-item post-author">
{{- $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 -}}
</span>
{{- end -}}
Expand Down
14 changes: 8 additions & 6 deletions layouts/partials/footer.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 -}}
<span class="author">&nbsp;<a href="{{ $authorLink }}" target="_blank">{{ $author.nickname }}</a></span>
{{- 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 -}}
<span class="author">&nbsp;<a href="{{ $authorLink }}" target="_blank">{{ $author.nickname }}</a></span>
{{- end -}}
{{- end -}}

{{- /* License */ -}}
{{- with .Site.Params.footer.license -}}
&nbsp;|&nbsp;<span class="license">{{ . | safeHTML }}</span>
<!-- &nbsp;|&nbsp; --><span class="license">{{ . | safeHTML }}</span>
{{- end -}}

{{- /* ICP */ -}}
Expand Down
4 changes: 2 additions & 2 deletions layouts/partials/paginator.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ <h3 class="display-hidden">Пагинация</h3>
<ul class="pagination">
{{ if .HasPrev }}
<li class="page-item">
<a class="page-link" aria-hidden="true" href="{{ .Prev.URL }}"><< Next</a>
<a class="page-link" aria-hidden="true" href="{{ .Prev.URL }}"><< Prev</a>
</li>
{{end }}
{{ if .HasNext }}
<li class="page-item">
<a class="page-link" aria-hidden="true" href="{{ .Next.URL }}">Prev >></a>
<a class="page-link" aria-hidden="true" href="{{ .Next.URL }}">Next >></a>
</li>
{{end }}
</ul>
Expand Down
2 changes: 1 addition & 1 deletion layouts/taxonomy/list.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ <h2 class="single-title pulse faster">
<h3 class="group-title">{{ .Key }}</h3>
{{- range .Pages -}}
<article class="archive-item">
<a href="{{ .RelPermalink }}" class="archive-item-link">
<a target="_self" href="{{ .RelPermalink }}" class="archive-item-link">
{{- .Title -}}
</a>
<span class="archive-item-date">
Expand Down
2 changes: 1 addition & 1 deletion layouts/taxonomy/terms.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ <h3 class="card-item-title">
</h3>
{{- range first 5 $pages -}}
<article class="archive-item">
<a href="{{ .RelPermalink }}" class="archive-item-link">
<a target="_self" href="{{ .RelPermalink }}" class="archive-item-link">
{{- .Title -}}
</a>
</article>
Expand Down