Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/heyeshuang/hugo-theme-tokiwa.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHe Yeshuang <yeshuanghe@gmail.com>2020-04-27 15:18:30 +0300
committerHe Yeshuang <yeshuanghe@gmail.com>2020-05-18 15:15:48 +0300
commitb41804b44927aa924e2a9f4c1dd5b21a6ce30cf8 (patch)
treeacb8887f6be240f159a73f24c4cc2ba6cf9a3731
parentb098a18793983e28d6a2b1979adc7d91774a2c61 (diff)
before playing with flexbox
-rwxr-xr-xlayouts/_default/baseof.html33
-rwxr-xr-xlayouts/_default/single.html21
-rw-r--r--layouts/partials/page-header.html18
-rwxr-xr-xlayouts/partials/site-footer.html6
-rwxr-xr-xlayouts/partials/site-header.html17
-rw-r--r--layouts/partials/tags.html22
-rw-r--r--src/sass/style.scss72
-rw-r--r--static/dist/app.css143
-rw-r--r--tailwind.config.js10
9 files changed, 207 insertions, 135 deletions
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index 84ed70c..6990026 100755
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -7,7 +7,7 @@
{{/* NOTE: the Site's title, and if there is a page title, that is set too */}}
<title>{{ block "title" . }}{{ .Site.Title }} {{ with .Params.Title }} | {{ . }}{{ end }}{{ end }}</title>
<meta name="viewport" content="width=device-width,minimum-scale=1">
- {{ .Hugo.Generator }}
+ {{ hugo.Generator }}
{{/* NOTE: For Production make sure you add `HUGO_ENV="production"` before your build command */}}
{{ if eq (getenv "HUGO_ENV") "production" | or (eq .Site.Params.env "production") }}
<META NAME="ROBOTS" CONTENT="INDEX, FOLLOW">
@@ -28,23 +28,30 @@
{{ partial "site-favicon.html" . }}
{{ end }}
- {{ if .RSSLink }}
- <link href="{{ .RSSLink }}" rel="alternate" type="application/rss+xml" title="{{ .Site.Title }}" />
- <link href="{{ .RSSLink }}" rel="feed" type="application/rss+xml" title="{{ .Site.Title }}" />
- {{ end }}
-
+ {{ with .OutputFormats.Get "RSS" }}
+ <link rel="alternate" href="{{ .RelPermalink }}" type="application/rss+xml" title="{{ site.Title }}">
+ <link rel="feed" href="{{ .RelPermalink }}" type="application/rss+xml" title="{{ site.Title }}">
+ {{end}}
{{ if eq (getenv "HUGO_ENV") "production" | or (eq .Site.Params.env "production") }}
{{ template "_internal/google_analytics_async.html" . }}
{{ end }}
</head>
-<body>
- {{ block "header" . }}{{ partial "site-header.html" .}}{{ end }}
- <main role="main">
- {{ block "main" . }}{{ end }}
- </main>
- {{ block "footer" . }}{{ partial "site-footer.html" . }}{{ end }}
- {{ block "scripts" . }}{{ partial "site-scripts.html" . }}{{ end }}
+<body class="bg-gray-100 text-gray-700">
+ <div class="p-6 sm:p-10 md:p-16 flex flex-wrap ">
+ <header class="w-full md:w-2/5 xl:w-1/2 md:pr-12 lg:pr-24 xl:pr-32 order-1 md:order-1 ">
+ <div class="max-w-xl md:float-right md:text-right leading-loose tracking-tight md:sticky md:top-0 pt-2">
+ {{ block "header" . }}{{ partial "site-header.html" .}}{{ end }}
+ </div>
+ </header>
+ <main role="main" class="w-full md:w-3/5 xl:w-1/2 max-w-2xl order-2 md:order-2 pt-2">
+ {{ block "main" . }}{{ end }}
+ </main>
+ <footer role="contentinfo" class="w-full md:w-2/5 xl:w-1/2 md:pr-12 lg:pr-24 xl:pr-32 order-3 md:order-3 md:sticky md:bottom-0 ">
+ {{ block "footer" . }}{{ partial "site-footer.html" . }}{{ end }}
+ </footer>
+ {{ block "scripts" . }}{{ partial "site-scripts.html" . }}{{ end }}
+ </div>
</body>
</html> \ No newline at end of file
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 5e79100..a5e68e3 100755
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -1,5 +1,4 @@
{{ define "header" }}
-{{/* We can override any block in the baseof file be defining it in the template */}}
{{ partial "page-header.html" . }}
{{ end }}
@@ -7,28 +6,10 @@
{{ $section := .Site.GetPage "section" .Section }}
<article>
- <header>
- <p>
- {{/*
- CurrentSection allows us to use the section title instead of inferring from the folder.
- https://gohugo.io/variables/page/#section-variables-and-methods
- */}}
- {{with .CurrentSection.Title }}{{. | upper }}{{end}}
- </p>
- <h1>
- {{- .Title -}}
- </h1>
- {{/* Hugo uses Go's date formatting is set by example. Here are two formats */}}
- <time datetime="{{ .Date.Format "2006-01-02T15:04:05Z07:00" }}">
- {{- .Date.Format "January 2, 2006" -}}
- </time>
- </header>
-
- <section class="mx-auto px-4 content">
+ <section class="mx-auto content">
<div class="c-rich-text">
{{- .Content -}}
</div>
- {{- partial "tags.html" . -}}
<div>
{{ template "_internal/disqus.html" . }}
</div>
diff --git a/layouts/partials/page-header.html b/layouts/partials/page-header.html
index 68e6733..b785195 100644
--- a/layouts/partials/page-header.html
+++ b/layouts/partials/page-header.html
@@ -1,5 +1,13 @@
-<header>
- <div>
- {{ partial "site-navigation.html" . }}
- </div>
-</header> \ No newline at end of file
+<div>
+ <h3>
+ <a href="{{ .Site.BaseURL }}" title="{{ .Site.Title }}" class="heading">{{ .Site.Title }}</a>
+ </h3>
+</div>
+<h1>
+ {{- .Title -}}
+</h1>
+{{- partial "tags.html" . -}}
+<time class="text-eucalyptus-600" datetime="{{ .Date.Format "2006-01-02T15:04:05Z07:00" }}">
+ {{- .Date.Format "2006年1月2日" -}}
+</time>
+{{ partial "site-navigation.html" . }} \ No newline at end of file
diff --git a/layouts/partials/site-footer.html b/layouts/partials/site-footer.html
index a921a4e..2d0a5a8 100755
--- a/layouts/partials/site-footer.html
+++ b/layouts/partials/site-footer.html
@@ -1,8 +1,6 @@
-<footer role="contentinfo">
- <div>
+ <div class="max-w-md leading-loose tracking-tight">
<a href="{{ .Site.BaseURL }}">
&copy; {{ now.Format "2006" }} {{ .Site.Title }}
</a>
<div>{{ partial "social-follow.html" . }}</div>
- </div>
-</footer> \ No newline at end of file
+ </div> \ No newline at end of file
diff --git a/layouts/partials/site-header.html b/layouts/partials/site-header.html
index cdb90e5..6e7d984 100755
--- a/layouts/partials/site-header.html
+++ b/layouts/partials/site-header.html
@@ -1,15 +1,6 @@
-<header>
<div>
- {{ partial "site-navigation.html" . }}
- <div>
- <h1>
- {{ .Title | default .Site.Title }}
- </h1>
- {{ with .Params.description }}
- <h2>
- {{ . }}
- </h2>
- {{ end }}
- </div>
+ <h1>
+ {{ .Site.Title }}
+ </h1>
</div>
-</header> \ No newline at end of file
+ {{ partial "site-navigation.html" . }} \ No newline at end of file
diff --git a/layouts/partials/tags.html b/layouts/partials/tags.html
index d675e58..3eabe80 100644
--- a/layouts/partials/tags.html
+++ b/layouts/partials/tags.html
@@ -1,9 +1,15 @@
-<ul>
- {{ range .Params.tags }}
- <li>
- <a href="{{ "/tags/" | relLangURL }}{{ . | urlize }}">
- {{- . -}}
- </a>
- </li>
+{{ if isset .Params "tags" }}
+{{ $count := len .Params.tags }}
+{{ if gt $count 0 }}
+<div>
+ {{ range $k, $v := .Params.categories}}
+ <a class="post-taxonomy-category text-eucalyptus-700"
+ href="/categories/{{ . | urlize }}">{{ . }}</a>{{ if lt $k (sub $count 1) }}&nbsp;&#47;{{ end }}
+ {{end}}
+ {{ range $k, $v := .Params.tags }}
+ <a class="post-taxonomy-tag"
+ href="/tags/{{ . | urlize }}">{{ . }}</a>{{ if lt $k (sub $count 1) }}&nbsp;&#47;{{ end }}
{{ end }}
-</ul> \ No newline at end of file
+</div>
+{{ end }}
+{{ end }} \ No newline at end of file
diff --git a/src/sass/style.scss b/src/sass/style.scss
index 2add56f..9e91be6 100644
--- a/src/sass/style.scss
+++ b/src/sass/style.scss
@@ -6,37 +6,58 @@
@import "tailwindcss/components";
.heading {
- @apply font-serif font-bold leading-tight;
+ @apply font-serif font-bold leading-tight text-eucalyptus-700;
}
h1 {
- @apply heading text-5xl;
+ @apply heading text-3xl;
@screen sm {
- @apply text-6xl;
+ @apply text-4xl;
}
}
h2 {
- @apply heading text-4xl;
+ @apply heading text-2xl;
@screen sm {
- @apply text-5xl;
+ @apply text-3xl;
}
}
h3 {
- @apply heading text-4xl;
+ @apply heading text-xl;
}
h4 {
- @apply heading text-3xl;
+ @apply heading text-lg;
}
h5 {
- @apply heading text-2xl;
+ @apply heading text-lg;
}
h6 {
- @apply heading text-xl;
+ @apply heading text-lg;
+}
+
+a {
+ color: theme('colors.eucalyptus.500');
+ text-decoration: none;
+ background-image: linear-gradient(currentColor, currentColor);
+ background-position: 0% 100%;
+ background-repeat: no-repeat;
+ background-size: 0% 2px;
+ transition: background-size cubic-bezier(0,.5,0,1) 0.3s;
}
+a:hover,
+a:focus {
+ color: theme('colors.java.500');
+ text-decoration: none;
+ background-size: 100% 2px;
+}
.c-rich-text {
@apply font-sans font-normal text-base leading-relaxed;
+ ::selection {
+ color:theme('colors.java.100');
+ // background-color: theme('colors.eucalyptus.600');
+ background-color: theme('colors.java.700');
+ }
> * + * {
margin-top: 1rem;
}
@@ -63,6 +84,7 @@ h6 {
margin: 0 5px
}
table {
+ @apply overflow-x-auto scrolling-auto;
table-layout: auto
}
th,td {
@@ -78,16 +100,10 @@ h6 {
background-color:theme("colors.java.100");
border-top-color: theme("colors.java.600")
}
- a {
- // @apply font-bold;
- color: theme('colors.eucalyptus.500');
- &:hover {
- color: theme('colors.java.500');
- text-decoration: underline;
- }
- }
+
b, strong {
- font-weight: theme('fontWeight.bold'),
+ font-weight: theme('fontWeight.bold');
+ color: theme('colors.eucalyptus.600')
}
i, em {
font-style: italic
@@ -117,23 +133,27 @@ h6 {
background: none;
}
- pre {
- @apply overflow-x-auto border border-solid rounded-br-lg border-java-500 bg-java-100;
+ pre{
+ @apply scrolling-auto overflow-x-auto border border-solid rounded-br-lg border-java-500 bg-java-100;
padding: 1em 1.5em;
display: block;
- }
- hr {
+ }
+ .highlight{
+ @apply scrolling-auto overflow-x-auto
+ }
+ hr {
border: none;
border-bottom: 1px solid theme('colors.java.500');
+ border-top: 1px solid theme('colors.java.300');
margin-bottom: 0.8em;
- height: 10px;
- }
- blockquote {
+ height: 1px;
+ }
+ blockquote {
@apply relative font-light ml-8 mr-6 pl-3 ;
@apply border-l-2 border-java-500;
// padding-left: 1em;
// margin: 1em 3em 1em 2em;
- }
+ }
}
/* purgecss end ignore */
diff --git a/static/dist/app.css b/static/dist/app.css
index 8659146..972ed80 100644
--- a/static/dist/app.css
+++ b/static/dist/app.css
@@ -417,7 +417,7 @@ ul {
*/
html {
- font-family: system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; /* 1 */
+ font-family: -apple-system, "Noto Sans", "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; /* 1 */
line-height: 1.5; /* 2 */
}
@@ -561,7 +561,7 @@ pre,
code,
kbd,
samp {
- font-family: Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
+ font-family: 'Fira Code','Cascadia Code',Menlo, Monaco, Consolas, 'Liberation Mono', 'Courier New','Sarasa Mono SC','Noto Sans CJK SC','monospace', monospace;
}
/**
@@ -626,72 +626,106 @@ video {
}
.heading {
- font-family: Georgia, Cambria, "Times New Roman", Times, serif;
+ font-family: Georgia, "Nimbus Roman No9 L", "Songti SC", "Noto Serif CJK SC", "Source Han Serif SC", "Source Han Serif CN", STSong, "AR PL New Sung", "AR PL SungtiL GB", NSimSun, SimSun, "TW-Sung", "WenQuanYi Bitmap Song", "AR PL UMing CN", "AR PL UMing HK", "AR PL UMing TW", "AR PL UMing TW MBE", PMingLiU, MingLiU, serif;
font-weight: 700;
line-height: 1.25;
+ color: #01513A;
}
h1 {
- font-family: Georgia, Cambria, "Times New Roman", Times, serif;
+ font-family: Georgia, "Nimbus Roman No9 L", "Songti SC", "Noto Serif CJK SC", "Source Han Serif SC", "Source Han Serif CN", STSong, "AR PL New Sung", "AR PL SungtiL GB", NSimSun, SimSun, "TW-Sung", "WenQuanYi Bitmap Song", "AR PL UMing CN", "AR PL UMing HK", "AR PL UMing TW", "AR PL UMing TW MBE", PMingLiU, MingLiU, serif;
font-weight: 700;
line-height: 1.25;
- font-size: 3rem;
+ color: #01513A;
+ font-size: 1.875rem;
}
@media (min-width: 640px) {
h1 {
- font-size: 4rem;
+ font-size: 2.25rem;
}
}
h2 {
- font-family: Georgia, Cambria, "Times New Roman", Times, serif;
+ font-family: Georgia, "Nimbus Roman No9 L", "Songti SC", "Noto Serif CJK SC", "Source Han Serif SC", "Source Han Serif CN", STSong, "AR PL New Sung", "AR PL SungtiL GB", NSimSun, SimSun, "TW-Sung", "WenQuanYi Bitmap Song", "AR PL UMing CN", "AR PL UMing HK", "AR PL UMing TW", "AR PL UMing TW MBE", PMingLiU, MingLiU, serif;
font-weight: 700;
line-height: 1.25;
- font-size: 2.25rem;
+ color: #01513A;
+ font-size: 1.5rem;
}
@media (min-width: 640px) {
h2 {
- font-size: 3rem;
+ font-size: 1.875rem;
}
}
h3 {
- font-family: Georgia, Cambria, "Times New Roman", Times, serif;
+ font-family: Georgia, "Nimbus Roman No9 L", "Songti SC", "Noto Serif CJK SC", "Source Han Serif SC", "Source Han Serif CN", STSong, "AR PL New Sung", "AR PL SungtiL GB", NSimSun, SimSun, "TW-Sung", "WenQuanYi Bitmap Song", "AR PL UMing CN", "AR PL UMing HK", "AR PL UMing TW", "AR PL UMing TW MBE", PMingLiU, MingLiU, serif;
font-weight: 700;
line-height: 1.25;
- font-size: 2.25rem;
+ color: #01513A;
+ font-size: 1.25rem;
}
h4 {
- font-family: Georgia, Cambria, "Times New Roman", Times, serif;
+ font-family: Georgia, "Nimbus Roman No9 L", "Songti SC", "Noto Serif CJK SC", "Source Han Serif SC", "Source Han Serif CN", STSong, "AR PL New Sung", "AR PL SungtiL GB", NSimSun, SimSun, "TW-Sung", "WenQuanYi Bitmap Song", "AR PL UMing CN", "AR PL UMing HK", "AR PL UMing TW", "AR PL UMing TW MBE", PMingLiU, MingLiU, serif;
font-weight: 700;
line-height: 1.25;
- font-size: 1.875rem;
+ color: #01513A;
+ font-size: 1.125rem;
}
h5 {
- font-family: Georgia, Cambria, "Times New Roman", Times, serif;
+ font-family: Georgia, "Nimbus Roman No9 L", "Songti SC", "Noto Serif CJK SC", "Source Han Serif SC", "Source Han Serif CN", STSong, "AR PL New Sung", "AR PL SungtiL GB", NSimSun, SimSun, "TW-Sung", "WenQuanYi Bitmap Song", "AR PL UMing CN", "AR PL UMing HK", "AR PL UMing TW", "AR PL UMing TW MBE", PMingLiU, MingLiU, serif;
font-weight: 700;
line-height: 1.25;
- font-size: 1.5rem;
+ color: #01513A;
+ font-size: 1.125rem;
}
h6 {
- font-family: Georgia, Cambria, "Times New Roman", Times, serif;
+ font-family: Georgia, "Nimbus Roman No9 L", "Songti SC", "Noto Serif CJK SC", "Source Han Serif SC", "Source Han Serif CN", STSong, "AR PL New Sung", "AR PL SungtiL GB", NSimSun, SimSun, "TW-Sung", "WenQuanYi Bitmap Song", "AR PL UMing CN", "AR PL UMing HK", "AR PL UMing TW", "AR PL UMing TW MBE", PMingLiU, MingLiU, serif;
font-weight: 700;
line-height: 1.25;
- font-size: 1.25rem;
+ color: #01513A;
+ font-size: 1.125rem;
+}
+
+a {
+ color: #028760;
+ text-decoration: none;
+ background-image: linear-gradient(currentColor, currentColor);
+ background-position: 0% 100%;
+ background-repeat: no-repeat;
+ background-size: 0% 2px;
+ transition: background-size cubic-bezier(0, 0.5, 0, 1) 0.3s;
+}
+
+a:hover,
+a:focus {
+ color: #49BEB7;
+ text-decoration: none;
+ background-size: 100% 2px;
}
.c-rich-text {
- font-family: system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
+ font-family: -apple-system, "Noto Sans", "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-weight: 400;
font-size: 1rem;
line-height: 1.625;
}
+.c-rich-text ::-moz-selection {
+ color: #EDF9F8;
+ background-color: #2C726E;
+}
+
+.c-rich-text ::selection {
+ color: #EDF9F8;
+ background-color: #2C726E;
+}
+
.c-rich-text > * + * {
margin-top: 1rem;
}
@@ -724,6 +758,8 @@ h6 {
}
.c-rich-text table {
+ overflow-x: auto;
+ -webkit-overflow-scrolling: auto;
table-layout: auto;
}
@@ -742,17 +778,9 @@ h6 {
border-top-color: #42ABA5;
}
-.c-rich-text a {
- color: #028760;
-}
-
-.c-rich-text a:hover {
- color: #49BEB7;
- text-decoration: underline;
-}
-
.c-rich-text b, .c-rich-text strong {
font-weight: 700;
+ color: #027A56;
}
.c-rich-text i, .c-rich-text em {
@@ -775,7 +803,7 @@ h6 {
}
.c-rich-text pre, .c-rich-text code, .c-rich-text pre tt {
- font-family: Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
+ font-family: 'Fira Code','Cascadia Code',Menlo, Monaco, Consolas, 'Liberation Mono', 'Courier New','Sarasa Mono SC','Noto Sans CJK SC','monospace', monospace;
}
.c-rich-text code, .c-rich-text pre tt, .c-rich-text kbd {
@@ -794,6 +822,7 @@ h6 {
}
.c-rich-text pre {
+ -webkit-overflow-scrolling: auto;
overflow-x: auto;
border-width: 1px;
border-style: solid;
@@ -804,11 +833,17 @@ h6 {
display: block;
}
+.c-rich-text .highlight {
+ -webkit-overflow-scrolling: auto;
+ overflow-x: auto;
+}
+
.c-rich-text hr {
border: none;
border-bottom: 1px solid #49BEB7;
+ border-top: 1px solid #B6E5E2;
margin-bottom: 0.8em;
- height: 10px;
+ height: 1px;
}
.c-rich-text blockquote {
@@ -4758,15 +4793,15 @@ h6 {
}
.font-sans {
- font-family: system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
+ font-family: -apple-system, "Noto Sans", "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-serif {
- font-family: Georgia, Cambria, "Times New Roman", Times, serif;
+ font-family: Georgia, "Nimbus Roman No9 L", "Songti SC", "Noto Serif CJK SC", "Source Han Serif SC", "Source Han Serif CN", STSong, "AR PL New Sung", "AR PL SungtiL GB", NSimSun, SimSun, "TW-Sung", "WenQuanYi Bitmap Song", "AR PL UMing CN", "AR PL UMing HK", "AR PL UMing TW", "AR PL UMing TW MBE", PMingLiU, MingLiU, serif;
}
.font-mono {
- font-family: Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
+ font-family: 'Fira Code','Cascadia Code',Menlo, Monaco, Consolas, 'Liberation Mono', 'Courier New','Sarasa Mono SC','Noto Sans CJK SC','monospace', monospace;
}
.font-hairline {
@@ -6265,6 +6300,10 @@ h6 {
min-height: 100vh;
}
+.min-h-80vh {
+ min-height: 80vh;
+}
+
.min-w-0 {
min-width: 0;
}
@@ -21027,15 +21066,15 @@ h6 {
}
.sm\:font-sans {
- font-family: system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
+ font-family: -apple-system, "Noto Sans", "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;
}
.sm\:font-serif {
- font-family: Georgia, Cambria, "Times New Roman", Times, serif;
+ font-family: Georgia, "Nimbus Roman No9 L", "Songti SC", "Noto Serif CJK SC", "Source Han Serif SC", "Source Han Serif CN", STSong, "AR PL New Sung", "AR PL SungtiL GB", NSimSun, SimSun, "TW-Sung", "WenQuanYi Bitmap Song", "AR PL UMing CN", "AR PL UMing HK", "AR PL UMing TW", "AR PL UMing TW MBE", PMingLiU, MingLiU, serif;
}
.sm\:font-mono {
- font-family: Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
+ font-family: 'Fira Code','Cascadia Code',Menlo, Monaco, Consolas, 'Liberation Mono', 'Courier New','Sarasa Mono SC','Noto Sans CJK SC','monospace', monospace;
}
.sm\:font-hairline {
@@ -22534,6 +22573,10 @@ h6 {
min-height: 100vh;
}
+ .sm\:min-h-80vh {
+ min-height: 80vh;
+ }
+
.sm\:min-w-0 {
min-width: 0;
}
@@ -37297,15 +37340,15 @@ h6 {
}
.md\:font-sans {
- font-family: system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
+ font-family: -apple-system, "Noto Sans", "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;
}
.md\:font-serif {
- font-family: Georgia, Cambria, "Times New Roman", Times, serif;
+ font-family: Georgia, "Nimbus Roman No9 L", "Songti SC", "Noto Serif CJK SC", "Source Han Serif SC", "Source Han Serif CN", STSong, "AR PL New Sung", "AR PL SungtiL GB", NSimSun, SimSun, "TW-Sung", "WenQuanYi Bitmap Song", "AR PL UMing CN", "AR PL UMing HK", "AR PL UMing TW", "AR PL UMing TW MBE", PMingLiU, MingLiU, serif;
}
.md\:font-mono {
- font-family: Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
+ font-family: 'Fira Code','Cascadia Code',Menlo, Monaco, Consolas, 'Liberation Mono', 'Courier New','Sarasa Mono SC','Noto Sans CJK SC','monospace', monospace;
}
.md\:font-hairline {
@@ -38804,6 +38847,10 @@ h6 {
min-height: 100vh;
}
+ .md\:min-h-80vh {
+ min-height: 80vh;
+ }
+
.md\:min-w-0 {
min-width: 0;
}
@@ -53567,15 +53614,15 @@ h6 {
}
.lg\:font-sans {
- font-family: system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
+ font-family: -apple-system, "Noto Sans", "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;
}
.lg\:font-serif {
- font-family: Georgia, Cambria, "Times New Roman", Times, serif;
+ font-family: Georgia, "Nimbus Roman No9 L", "Songti SC", "Noto Serif CJK SC", "Source Han Serif SC", "Source Han Serif CN", STSong, "AR PL New Sung", "AR PL SungtiL GB", NSimSun, SimSun, "TW-Sung", "WenQuanYi Bitmap Song", "AR PL UMing CN", "AR PL UMing HK", "AR PL UMing TW", "AR PL UMing TW MBE", PMingLiU, MingLiU, serif;
}
.lg\:font-mono {
- font-family: Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
+ font-family: 'Fira Code','Cascadia Code',Menlo, Monaco, Consolas, 'Liberation Mono', 'Courier New','Sarasa Mono SC','Noto Sans CJK SC','monospace', monospace;
}
.lg\:font-hairline {
@@ -55074,6 +55121,10 @@ h6 {
min-height: 100vh;
}
+ .lg\:min-h-80vh {
+ min-height: 80vh;
+ }
+
.lg\:min-w-0 {
min-width: 0;
}
@@ -69837,15 +69888,15 @@ h6 {
}
.xl\:font-sans {
- font-family: system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
+ font-family: -apple-system, "Noto Sans", "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;
}
.xl\:font-serif {
- font-family: Georgia, Cambria, "Times New Roman", Times, serif;
+ font-family: Georgia, "Nimbus Roman No9 L", "Songti SC", "Noto Serif CJK SC", "Source Han Serif SC", "Source Han Serif CN", STSong, "AR PL New Sung", "AR PL SungtiL GB", NSimSun, SimSun, "TW-Sung", "WenQuanYi Bitmap Song", "AR PL UMing CN", "AR PL UMing HK", "AR PL UMing TW", "AR PL UMing TW MBE", PMingLiU, MingLiU, serif;
}
.xl\:font-mono {
- font-family: Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
+ font-family: 'Fira Code','Cascadia Code',Menlo, Monaco, Consolas, 'Liberation Mono', 'Courier New','Sarasa Mono SC','Noto Sans CJK SC','monospace', monospace;
}
.xl\:font-hairline {
@@ -71344,6 +71395,10 @@ h6 {
min-height: 100vh;
}
+ .xl\:min-h-80vh {
+ min-height: 80vh;
+ }
+
.xl\:min-w-0 {
min-width: 0;
}
diff --git a/tailwind.config.js b/tailwind.config.js
index dc887bf..234208a 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -8,9 +8,15 @@ module.exports = {
'default': '0 2px 5px rgba(0, 0, 0, 0.5)',
'lg': '0 2px 10px rgba(0, 0, 0, 0.5)',
},
- textStyles: theme => ({ // defaults to {}
- }),
extend: {
+ fontFamily: {
+ 'sans': '-apple-system, "Noto Sans", "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',
+ 'serif': 'Georgia, "Nimbus Roman No9 L", "Songti SC", "Noto Serif CJK SC", "Source Han Serif SC", "Source Han Serif CN", STSong, "AR PL New Sung", "AR PL SungtiL GB", NSimSun, SimSun, "TW\-Sung", "WenQuanYi Bitmap Song", "AR PL UMing CN", "AR PL UMing HK", "AR PL UMing TW", "AR PL UMing TW MBE", PMingLiU, MingLiU, serif',
+ 'mono':"'Fira Code','Cascadia Code',Menlo, Monaco, Consolas, 'Liberation Mono', 'Courier New','Sarasa Mono SC','Noto Sans CJK SC','monospace', monospace"
+ },
+ minHeight:{
+ '80vh':'80vh'
+ },
colors: { // color scheme:
// https://javisperez.github.io/tailwindcolorshades/#/?blue-stone=085f63&java=49beb7&golden-tainoi=facf5a&eucalyptus=028760&Medium%20Red%20Violet=c64191&tv=1
'eucalyptus': {