diff options
author | Joway.CI <joway.w@gmail.com> | 2020-03-19 07:05:48 +0300 |
---|---|---|
committer | Joway.CI <joway.w@gmail.com> | 2020-03-19 07:05:48 +0300 |
commit | a612ccd826d6b12d73f1add25b3b2ebb9fc2c980 (patch) | |
tree | 27bebe565be7bb78da6d7173cfb0e7136d4d8126 | |
parent | 55dfd59d47d9de535f40c70f9e24aac4753af7b9 (diff) |
feat: update fonts
-rw-r--r-- | exampleSite/content/cn/posts/cn.md | 15 | ||||
-rw-r--r-- | layouts/_default/list.html | 2 | ||||
-rw-r--r-- | layouts/_default/single.html | 2 | ||||
-rw-r--r-- | layouts/gallery/single.html | 2 | ||||
-rw-r--r-- | layouts/index.html | 2 | ||||
-rw-r--r-- | layouts/partials/head.html | 4 | ||||
-rw-r--r-- | static/css/github-markdown.css | 566 | ||||
-rw-r--r-- | static/css/index.css | 15 |
8 files changed, 592 insertions, 16 deletions
diff --git a/exampleSite/content/cn/posts/cn.md b/exampleSite/content/cn/posts/cn.md index 1d99dfc..94f27ab 100644 --- a/exampleSite/content/cn/posts/cn.md +++ b/exampleSite/content/cn/posts/cn.md @@ -1,10 +1,17 @@ --- -title: 中文题目 +title: 赤壁赋 date: 2018-03-04 -categories: ['随笔'] +categories: ['诗歌'] draft: false --- -## 中文信息 +## 原文 -中文 +壬戌之秋,七月既望,蘇子與客泛舟遊於赤壁之下。清風徐來,水波不興。舉酒屬客,誦明月之詩,歌窈窕之章。少焉,月出於東山之上,徘徊於斗牛之間。白露橫江,水光接天。縱一葦之所如,凌萬頃之茫然。浩浩乎如馮虛御風,而不知其所止;飄飄乎如遺世獨立,羽化而登仙。 + +於是飲酒樂甚,扣舷而歌之。歌曰:“桂棹兮蘭槳,擊空明兮溯流光。渺渺兮予懷,望美人兮天一方。”客有吹洞簫者,倚歌而和之。其聲嗚嗚然,如怨如慕,如泣如訴;餘音嫋嫋,不絕如縷。舞幽壑之潛蛟,泣孤舟之嫠婦。 + +蘇子愀然,正襟危坐,而問客曰:“何爲其然也?”客曰:“‘月明星稀,烏鵲南飛。’此非曹孟德之詩乎?西望夏口,東望武昌,山川相繆,鬱乎蒼蒼,此非孟德之困於周郎者乎?方其破荊州,下江陵,順流而東也,舳艫千里,旌旗蔽空,釃酒臨江,橫槊賦詩,固一世之雄也,而今安在哉?況吾與子漁樵於江渚之上,侶魚蝦而友麋鹿,駕一葉之扁舟,舉匏樽以相屬。寄蜉蝣於天地,渺滄海之一粟。哀吾生之須臾,羨長 江之無窮。挾飛仙以遨遊,抱明月而長終。知不可乎驟得,託遺響於悲風。” + +蘇子曰:“客亦知夫水與月乎?逝者如斯,而未嘗往也;盈虛者如彼,而卒莫消長也。蓋將自其變者而觀之,則天地曾不能以一瞬;自其不變者而觀之,則物與我皆無盡也,而又何羨乎!且夫天地之間,物各有主,苟非吾之所有,雖一毫而莫取。惟江上之清風,與山間之明月,耳得之而爲聲,目遇之而成色,取之無禁,用之不竭。是造物者之無盡藏也,而吾與子之所共適。”(共適 一作:共食) +客喜而笑,洗盞更酌。餚核既盡,杯盤狼籍。相與枕藉乎舟中,不知東方之既白。 diff --git a/layouts/_default/list.html b/layouts/_default/list.html index 9ecaa8c..f02c986 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -5,7 +5,7 @@ <body> <article class="posts"> <div class="row"> - <div class="col-xs-12 col-sm-10 col-md-8 col-sm-offset-1 col-md-offset-2 col-lg-6 col-lg-offset-3"> + <div class="col-xs-12"> {{ partial "header.html" . }} <h1 class="taxonomy-term">{{.Data.Term}}</h1> diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 2244787..ccb950b 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -5,7 +5,7 @@ <body> <article class="post {{ .Site.Language.LanguageName }}" id="article"> <div class="row"> - <div class="col-xs-12 col-sm-10 col-md-8 col-sm-offset-1 col-md-offset-2 col-lg-6 col-lg-offset-3"> + <div class="col-xs-12"> <div class="site-header"> {{ partial "header.html" . }} </div> diff --git a/layouts/gallery/single.html b/layouts/gallery/single.html index 479e482..2f6c2ec 100644 --- a/layouts/gallery/single.html +++ b/layouts/gallery/single.html @@ -5,7 +5,7 @@ <body> <article class="post {{ .Site.Language.LanguageName }}" id="article"> <div class="row"> - <div class="col-xs-12 col-sm-10 col-md-8 col-sm-offset-1 col-md-offset-2 col-lg-6 col-lg-offset-3"> + <div class="col-xs-12"> <div class="site-header"> {{ partial "header.html" . }} </div> diff --git a/layouts/index.html b/layouts/index.html index 80ef6a7..4fda3cf 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -5,7 +5,7 @@ <body> <article class="posts"> <div class="row"> - <div class="col-xs-12 col-sm-10 col-md-8 col-sm-offset-1 col-md-offset-2 col-lg-6 col-lg-offset-3"> + <div class="col-xs-12"> {{ partial "header.html" . }} <div id="posts-list"> {{ range (where site.RegularPages "Type" "in" site.Params.mainSections).GroupByDate "2006" -}} diff --git a/layouts/partials/head.html b/layouts/partials/head.html index c04cf9f..334c1c3 100644 --- a/layouts/partials/head.html +++ b/layouts/partials/head.html @@ -36,14 +36,14 @@ <link rel="stylesheet" href="{{ .Site.Params.staticPrefix }}{{ "css/flexboxgrid-6.3.1.min.css" | relURL }}" /> {{ if not .IsHome -}} - <link rel="stylesheet" href="{{ .Site.Params.staticPrefix }}{{ "css/github-markdown.min.css" | relURL }}" /> + <link rel="stylesheet" href="{{ .Site.Params.staticPrefix }}{{ "css/github-markdown.css" | relURL }}" /> <link rel="stylesheet" href="{{ .Site.Params.staticPrefix }}{{ "css/highlight/tomorrow.min.css" | relURL }}" /> {{- end }} <link rel="stylesheet" href="{{ "css/index.css" | relURL }}"> <link href="{{ .Site.Params.staticPrefix }}{{ "index.xml" | relURL }}" rel="alternate" type="application/rss+xml" title="{{ .Site.Title }}"> <!-- fonts --> - <link href="https://fonts.googleapis.com/css?family=Arvo|Permanent+Marker" rel="stylesheet"> + <link href="https://fonts.googleapis.com/css?family=Arvo|Permanent+Marker|Bree+Serif" rel="stylesheet"> <!-- quicklink require --> <!-- <script> /* Disable minification (remove `.min` from URL path) for more info diff --git a/static/css/github-markdown.css b/static/css/github-markdown.css new file mode 100644 index 0000000..4614361 --- /dev/null +++ b/static/css/github-markdown.css @@ -0,0 +1,566 @@ +.markdown-body { + -ms-text-size-adjust: 100%; + -webkit-text-size-adjust: 100%; + line-height: 1.5; + color: #24292e; +} +.markdown-body .pl-c { + color: #6a737d; +} +.markdown-body .pl-c1, +.markdown-body .pl-s .pl-v { + color: #005cc5; +} +.markdown-body .pl-e, +.markdown-body .pl-en { + color: #6f42c1; +} +.markdown-body .pl-s .pl-s1, +.markdown-body .pl-smi { + color: #24292e; +} +.markdown-body .pl-ent { + color: #22863a; +} +.markdown-body .pl-k { + color: #d73a49; +} +.markdown-body .pl-pds, +.markdown-body .pl-s, +.markdown-body .pl-s .pl-pse .pl-s1, +.markdown-body .pl-sr, +.markdown-body .pl-sr .pl-cce, +.markdown-body .pl-sr .pl-sra, +.markdown-body .pl-sr .pl-sre { + color: #032f62; +} +.markdown-body .pl-smw, +.markdown-body .pl-v { + color: #e36209; +} +.markdown-body .pl-bu { + color: #b31d28; +} +.markdown-body .pl-ii { + color: #fafbfc; + background-color: #b31d28; +} +.markdown-body .pl-c2 { + color: #fafbfc; + background-color: #d73a49; +} +.markdown-body .pl-c2::before { + content: "^M"; +} +.markdown-body .pl-sr .pl-cce { + font-weight: 700; + color: #22863a; +} +.markdown-body .pl-ml { + color: #735c0f; +} +.markdown-body .pl-mh, +.markdown-body .pl-mh .pl-en, +.markdown-body .pl-ms { + font-weight: 700; + color: #005cc5; +} +.markdown-body .pl-mi { + font-style: italic; + color: #24292e; +} +.markdown-body .pl-mb { + font-weight: 700; + color: #24292e; +} +.markdown-body .pl-md { + color: #b31d28; + background-color: #ffeef0; +} +.markdown-body .pl-mi1 { + color: #22863a; + background-color: #f0fff4; +} +.markdown-body .pl-mc { + color: #e36209; + background-color: #ffebda; +} +.markdown-body .pl-mi2 { + color: #f6f8fa; + background-color: #005cc5; +} +.markdown-body .pl-mdr { + font-weight: 700; + color: #6f42c1; +} +.markdown-body .pl-ba { + color: #586069; +} +.markdown-body .pl-sg { + color: #959da5; +} +.markdown-body .pl-corl { + text-decoration: underline; + color: #032f62; +} +.markdown-body .octicon { + display: inline-block; + vertical-align: text-top; + fill: currentColor; +} +.markdown-body a { + background-color: transparent; +} +.markdown-body a:active, +.markdown-body a:hover { + outline-width: 0; +} +.markdown-body strong { + font-weight: inherit; +} +.markdown-body strong { + font-weight: bolder; +} +.markdown-body h1 { + font-size: 2em; + margin: 0.67em 0; +} +.markdown-body img { + border-style: none; +} +.markdown-body code, +.markdown-body kbd, +.markdown-body pre { + font-family: monospace, monospace; + font-size: 1em; +} +.markdown-body hr { + box-sizing: content-box; + height: 0; + overflow: visible; +} +.markdown-body input { + font: inherit; + margin: 0; +} +.markdown-body input { + overflow: visible; +} +.markdown-body [type="checkbox"] { + box-sizing: border-box; + padding: 0; +} +.markdown-body * { + box-sizing: border-box; +} +.markdown-body input { + font-family: inherit; + font-size: inherit; + line-height: inherit; +} +.markdown-body a { + color: #0366d6; + text-decoration: none; +} +.markdown-body a:hover { + text-decoration: underline; +} +.markdown-body strong { + font-weight: 600; +} +.markdown-body hr { + height: 0; + margin: 15px 0; + overflow: hidden; + background: 0 0; + border: 0; + border-bottom: 1px solid #dfe2e5; +} +.markdown-body hr::before { + display: table; + content: ""; +} +.markdown-body hr::after { + display: table; + clear: both; + content: ""; +} +.markdown-body table { + border-spacing: 0; + border-collapse: collapse; +} +.markdown-body td, +.markdown-body th { + padding: 0; +} +.markdown-body h1, +.markdown-body h2, +.markdown-body h3, +.markdown-body h4, +.markdown-body h5, +.markdown-body h6 { + margin-top: 0; + margin-bottom: 0; +} +.markdown-body h1 { + font-size: 32px; + font-weight: 600; +} +.markdown-body h2 { + font-size: 24px; + font-weight: 600; +} +.markdown-body h3 { + font-size: 20px; + font-weight: 600; +} +.markdown-body h4 { + font-size: 16px; + font-weight: 600; +} +.markdown-body h5 { + font-size: 14px; + font-weight: 600; +} +.markdown-body h6 { + font-size: 12px; + font-weight: 600; +} +.markdown-body p { + margin-top: 0; + margin-bottom: 10px; +} +.markdown-body blockquote { + margin: 0; +} +.markdown-body ol, +.markdown-body ul { + padding-left: 0; + margin-top: 0; + margin-bottom: 0; +} +.markdown-body ol ol, +.markdown-body ul ol { + list-style-type: lower-roman; +} +.markdown-body ol ol ol, +.markdown-body ol ul ol, +.markdown-body ul ol ol, +.markdown-body ul ul ol { + list-style-type: lower-alpha; +} +.markdown-body dd { + margin-left: 0; +} +.markdown-body code { + font-family: SFMono-Regular, Consolas, "Liberation Mono", Menlo, Courier, + monospace; + font-size: 12px; +} +.markdown-body pre { + margin-top: 0; + margin-bottom: 0; + font-family: SFMono-Regular, Consolas, "Liberation Mono", Menlo, Courier, + monospace; + font-size: 12px; +} +.markdown-body .octicon { + vertical-align: text-bottom; +} +.markdown-body .pl-0 { + padding-left: 0 !important; +} +.markdown-body .pl-1 { + padding-left: 4px !important; +} +.markdown-body .pl-2 { + padding-left: 8px !important; +} +.markdown-body .pl-3 { + padding-left: 16px !important; +} +.markdown-body .pl-4 { + padding-left: 24px !important; +} +.markdown-body .pl-5 { + padding-left: 32px !important; +} +.markdown-body .pl-6 { + padding-left: 40px !important; +} +.markdown-body::before { + display: table; + content: ""; +} +.markdown-body::after { + display: table; + clear: both; + content: ""; +} +.markdown-body > :first-child { + margin-top: 0 !important; +} +.markdown-body > :last-child { + margin-bottom: 0 !important; +} +.markdown-body a:not([href]) { + color: inherit; + text-decoration: none; +} +.markdown-body .anchor { + float: left; + padding-right: 4px; + margin-left: -20px; + line-height: 1; +} +.markdown-body .anchor:focus { + outline: 0; +} +.markdown-body blockquote, +.markdown-body dl, +.markdown-body ol, +.markdown-body p, +.markdown-body pre, +.markdown-body table, +.markdown-body ul { + margin-top: 0; + margin-bottom: 16px; +} +.markdown-body hr { + height: 0.25em; + padding: 0; + margin: 24px 0; + background-color: #e1e4e8; + border: 0; +} +.markdown-body blockquote { + padding: 0 1em; + color: #6a737d; + border-left: 0.25em solid #dfe2e5; +} +.markdown-body blockquote > :first-child { + margin-top: 0; +} +.markdown-body blockquote > :last-child { + margin-bottom: 0; +} +.markdown-body kbd { + display: inline-block; + padding: 3px 5px; + font-size: 11px; + line-height: 10px; + color: #444d56; + vertical-align: middle; + background-color: #fafbfc; + border: solid 1px #c6cbd1; + border-bottom-color: #959da5; + border-radius: 3px; + box-shadow: inset 0 -1px 0 #959da5; +} +.markdown-body h1, +.markdown-body h2, +.markdown-body h3, +.markdown-body h4, +.markdown-body h5, +.markdown-body h6 { + margin-top: 24px; + margin-bottom: 16px; + font-weight: 600; + line-height: 1.25; +} +.markdown-body h1 .octicon-link, +.markdown-body h2 .octicon-link, +.markdown-body h3 .octicon-link, +.markdown-body h4 .octicon-link, +.markdown-body h5 .octicon-link, +.markdown-body h6 .octicon-link { + color: #1b1f23; + vertical-align: middle; + visibility: hidden; +} +.markdown-body h1:hover .anchor, +.markdown-body h2:hover .anchor, +.markdown-body h3:hover .anchor, +.markdown-body h4:hover .anchor, +.markdown-body h5:hover .anchor, +.markdown-body h6:hover .anchor { + text-decoration: none; +} +.markdown-body h1:hover .anchor .octicon-link, +.markdown-body h2:hover .anchor .octicon-link, +.markdown-body h3:hover .anchor .octicon-link, +.markdown-body h4:hover .anchor .octicon-link, +.markdown-body h5:hover .anchor .octicon-link, +.markdown-body h6:hover .anchor .octicon-link { + visibility: visible; +} +.markdown-body h1 { + padding-bottom: 0.3em; + font-size: 2em; + border-bottom: 1px solid #eaecef; +} +.markdown-body h2 { + padding-bottom: 0.3em; + font-size: 1.5em; + border-bottom: 1px solid #eaecef; +} +.markdown-body h3 { + font-size: 1.25em; +} +.markdown-body h4 { + font-size: 1em; +} +.markdown-body h5 { + font-size: 0.875em; +} +.markdown-body h6 { + font-size: 0.85em; + color: #6a737d; +} +.markdown-body ol, +.markdown-body ul { + padding-left: 2em; +} +.markdown-body ol ol, +.markdown-body ol ul, +.markdown-body ul ol, +.markdown-body ul ul { + margin-top: 0; + margin-bottom: 0; +} +.markdown-body li { + word-wrap: break-all; +} +.markdown-body li > p { + margin-top: 16px; +} +.markdown-body li + li { + margin-top: 0.25em; +} +.markdown-body dl { + padding: 0; +} +.markdown-body dl dt { + padding: 0; + margin-top: 16px; + font-size: 1em; + font-style: italic; + font-weight: 600; +} +.markdown-body dl dd { + padding: 0 16px; + margin-bottom: 16px; +} +.markdown-body table { + display: block; + width: 100%; + overflow: auto; +} +.markdown-body table th { + font-weight: 600; +} +.markdown-body table td, +.markdown-body table th { + padding: 6px 13px; + border: 1px solid #dfe2e5; +} +.markdown-body table tr { + background-color: #fff; + border-top: 1px solid #c6cbd1; +} +.markdown-body table tr:nth-child(2n) { + background-color: #f6f8fa; +} +.markdown-body img { + max-width: 100%; + box-sizing: content-box; + background-color: #fff; +} +.markdown-body img[align="right"] { + padding-left: 20px; +} +.markdown-body img[align="left"] { + padding-right: 20px; +} +.markdown-body code { + padding: 0.2em 0.4em; + margin: 0; + font-size: 85%; + background-color: rgba(27, 31, 35, 0.05); + border-radius: 3px; +} +.markdown-body pre { + word-wrap: normal; +} +.markdown-body pre > code { + padding: 0; + margin: 0; + font-size: 100%; + word-break: normal; + white-space: pre; + background: 0 0; + border: 0; +} +.markdown-body .highlight { + margin-bottom: 16px; +} +.markdown-body .highlight pre { + margin-bottom: 0; + word-break: normal; +} +.markdown-body .highlight pre, +.markdown-body pre { + padding: 16px; + overflow: auto; + font-size: 85%; + line-height: 1.45; + background-color: #f6f8fa; + border-radius: 3px; +} +.markdown-body pre code { + display: inline; + max-width: auto; + padding: 0; + margin: 0; + overflow: visible; + line-height: inherit; + word-wrap: normal; + background-color: transparent; + border: 0; +} +.markdown-body .full-commit .btn-outline:not(:disabled):hover { + color: #005cc5; + border-color: #005cc5; +} +.markdown-body kbd { + display: inline-block; + padding: 3px 5px; + font: 11px SFMono-Regular, Consolas, "Liberation Mono", Menlo, Courier, + monospace; + line-height: 10px; + color: #444d56; + vertical-align: middle; + background-color: #fafbfc; + border: solid 1px #d1d5da; + border-bottom-color: #c6cbd1; + border-radius: 3px; + box-shadow: inset 0 -1px 0 #c6cbd1; +} +.markdown-body :checked + .radio-label { + position: relative; + z-index: 1; + border-color: #0366d6; +} +.markdown-body .task-list-item { + list-style-type: none; +} +.markdown-body .task-list-item + .task-list-item { + margin-top: 3px; +} +.markdown-body .task-list-item input { + margin: 0 0.2em 0.25em -1.6em; + vertical-align: middle; +} +.markdown-body hr { + border-bottom-color: #eee; +} diff --git a/static/css/index.css b/static/css/index.css index bcbf154..a2bf744 100644 --- a/static/css/index.css +++ b/static/css/index.css @@ -1,14 +1,17 @@ /* global */ body { - font-family: "Arvo", "Helvetica Neue", Helvetica, "Nimbus Sans L", Arial, - "Liberation Sans", "PingFang SC", "Hiragino Sans GB", "Noto Sans CJK SC", - "Source Han Sans SC", "Source Han Sans CN", "Microsoft YaHei", - "Wenquanyi Micro Hei", "WenQuanYi Zen Hei", "ST Heiti", SimHei, - "WenQuanYi Zen Hei Sharp", sans-serif; + font-family: "Bree Serif", sans-serif; + -webkit-font-smoothing: antialiased; margin: 0 20px; } +article { + max-width: 800px; + margin-left: auto; + margin-right: auto; +} + a { color: #000; text-decoration: none; @@ -161,7 +164,7 @@ a:hover { .post-content p { hyphens: auto; - line-height: 1.6; + line-height: 1.8; text-align: justify; text-justify: ideographic; margin-bottom: 1em; |