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-29 18:38:21 +0300
committerHe Yeshuang <yeshuanghe@gmail.com>2020-05-18 15:15:49 +0300
commit6c6ab7864c3788ed450a515f0b046f11cd083dc1 (patch)
treed7441218061f79c9dad7ab27b01fd1dad9cd73a2
parent7215ad22c5d2a19b6e457410c2867a3f0b9e5be3 (diff)
2020-4-29
Diffstat
-rwxr-xr-xlayouts/_default/baseof.html15
-rwxr-xr-xlayouts/_default/single.html13
-rw-r--r--layouts/page/single.html15
-rwxr-xr-xlayouts/partials/page-aside.html (renamed from layouts/partials/site-footer.html)4
-rw-r--r--layouts/partials/page-footer.html7
-rw-r--r--layouts/partials/page-header.html6
-rwxr-xr-xlayouts/partials/site-aside.html3
-rw-r--r--layouts/partials/site-navigation.html1
-rw-r--r--layouts/partials/tags.html22
-rw-r--r--src/sass/style.scss10
-rw-r--r--static/dist/app.css11
11 files changed, 61 insertions, 46 deletions
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index 09a79e1..a14495a 100755
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -38,21 +38,24 @@
</head>
<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-20 xl:pr-32 order-1 md:order-1 md:min-h-70vh">
+ <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-20 xl:pr-24 order-1 md:order-1 max-w-2xl md:min-h-70vh">
<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">
+ <main role="main" class="w-full md:w-3/5 xl:w-1/2 max-w-3xl order-2 md:order-2 pt-2 pb-4">
{{ 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-4 md:order-3 md:sticky md:bottom-0 self-end ">
+ <aside role="contentinfo" class="w-full md:w-2/5 xl:w-1/2 md:pr-12 lg:pr-20 xl:pr-24 order-4 md:order-3 md:sticky md:bottom-0 self-end max-w-2xl">
<div class="md:float-right md:text-right leading-loose tracking-tight md:mb-16">
- {{ block "footer" . }}{{ partial "site-footer.html" . }}{{ end }}
+ {{ block "aside" . }}{{ partial "site-aside.html" . }}{{ end }}
</div>
+ </aside>
+ <footer class="w-full md:w-3/5 xl:w-1/2 order-3 md:order-4">
+ {{ block "footer" . }}
+ {{ end }}
</footer>
- <footer class="w-full md:w-3/5 xl:w-1/2 order-3 md:order-4">TODO:disqus</footer>
{{ block "scripts" . }}{{ partial "site-scripts.html" . }}{{ end }}
</div>
</body>
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 71d2479..8d708ce 100755
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -9,14 +9,15 @@
<div class="c-rich-text">
{{- .Content -}}
</div>
- <div>
- {{ template "_internal/disqus.html" . }}
- </div>
</section>
- <aside>
- {{- partial "menu-contextual.html" . -}}
- </aside>
</article>
+{{ end }}
+
+{{ define "aside" }}
+ {{ partial "page-aside.html" . }}
+{{ end }}
+{{ define "footer" }}
+{{ partial "page-footer.html" . }}
{{ end }} \ No newline at end of file
diff --git a/layouts/page/single.html b/layouts/page/single.html
deleted file mode 100644
index 844a991..0000000
--- a/layouts/page/single.html
+++ /dev/null
@@ -1,15 +0,0 @@
-{{ define "header" }}{{ partial "page-header.html" . }}{{ end }}
-{{ define "main" }}
-<div>
- <article>
- <header>
- <p>
- {{ humanize .Section | upper }}
- </p>
- </header>
- <div class="c-rich-text">
- {{ .Content }}
- </div>
- </article>
-</div>
-{{ end }} \ No newline at end of file
diff --git a/layouts/partials/site-footer.html b/layouts/partials/page-aside.html
index ab3408b..7c802bc 100755
--- a/layouts/partials/site-footer.html
+++ b/layouts/partials/page-aside.html
@@ -1,4 +1,4 @@
+{{ partial "site-navigation.html" . }}
<a href="{{ .Site.BaseURL }}">
&copy; {{ now.Format "2006" }} {{ .Site.Title }}
-</a>
-<div>{{ partial "social-follow.html" . }}</div> \ No newline at end of file
+</a> \ No newline at end of file
diff --git a/layouts/partials/page-footer.html b/layouts/partials/page-footer.html
new file mode 100644
index 0000000..d3e29f0
--- /dev/null
+++ b/layouts/partials/page-footer.html
@@ -0,0 +1,7 @@
+<div>TODO:prev/next</div>
+<div>
+ {{ template "_internal/disqus.html" . }}
+</div>
+<aside>
+ {{- partial "menu-contextual.html" . -}}
+</aside> \ No newline at end of file
diff --git a/layouts/partials/page-header.html b/layouts/partials/page-header.html
index 6396a4c..14638ca 100644
--- a/layouts/partials/page-header.html
+++ b/layouts/partials/page-header.html
@@ -11,9 +11,9 @@
{{end}}
<div class="flex flex-wrap justify-between pt-2 ">
{{- partial "tags.html" . -}}
- <time class="text-eucalyptus-600 md:text-right md:flex-grow" datetime="{{ .Date.Format "2006-01-02T15:04:05Z07:00" }}">
+ <time class="text-eucalyptus-600 md:text-right md:flex-grow"
+ datetime="{{ .Date.Format "2006-01-02T15:04:05Z07:00" }}">
&nbsp;{{- .Date.Format "2006年1月2日" -}}
</time>
</div>
-<hr class=" pb-4" />
-{{ partial "site-navigation.html" . }} \ No newline at end of file
+<hr /> \ No newline at end of file
diff --git a/layouts/partials/site-aside.html b/layouts/partials/site-aside.html
new file mode 100755
index 0000000..a35c438
--- /dev/null
+++ b/layouts/partials/site-aside.html
@@ -0,0 +1,3 @@
+<a href="{{ .Site.BaseURL }}">
+ &copy; {{ now.Format "2006" }} {{ .Site.Title }}
+</a> \ No newline at end of file
diff --git a/layouts/partials/site-navigation.html b/layouts/partials/site-navigation.html
index d6f2779..aa4eb4d 100644
--- a/layouts/partials/site-navigation.html
+++ b/layouts/partials/site-navigation.html
@@ -16,7 +16,6 @@
{{ end }}
</ul>
{{ end }}
- {{ partial "social-follow.html" . }}
</div>
</div>
</nav> \ No newline at end of file
diff --git a/layouts/partials/tags.html b/layouts/partials/tags.html
index 3eabe80..16b527b 100644
--- a/layouts/partials/tags.html
+++ b/layouts/partials/tags.html
@@ -1,15 +1,19 @@
-{{ if isset .Params "tags" }}
-{{ $count := len .Params.tags }}
-{{ if gt $count 0 }}
-<div>
+<div class="md:flex-grow">
+ {{ if isset .Params "categories" }}
+ {{ $count := len .Params.categories}}
+ {{ if gt $count 0 }}
{{ 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}}&nbsp;
{{end}}
+ {{end}}
+ {{ if isset .Params "tags" }}
+ {{ $count := len .Params.tags }}
+ {{ if gt $count 0 }}
{{ range $k, $v := .Params.tags }}
- <a class="post-taxonomy-tag"
- href="/tags/{{ . | urlize }}">{{ . }}</a>{{ if lt $k (sub $count 1) }}&nbsp;&#47;{{ end }}
+ <a class="post-taxonomy-tag" href="/tags/{{ . | urlize }}">{{ . }}</a>{{ if lt $k (sub $count 1) }}&nbsp;&#47;{{ end }}
+ {{ end }}
+ {{ end }}
{{ end }}
-</div>
-{{ end }}
-{{ end }} \ No newline at end of file
+</div> \ No newline at end of file
diff --git a/src/sass/style.scss b/src/sass/style.scss
index 9e91be6..12bb802 100644
--- a/src/sass/style.scss
+++ b/src/sass/style.scss
@@ -11,13 +11,13 @@
h1 {
@apply heading text-3xl;
- @screen sm {
+ @screen lg {
@apply text-4xl;
}
}
h2 {
@apply heading text-2xl;
- @screen sm {
+ @screen lg {
@apply text-3xl;
}
}
@@ -33,6 +33,12 @@ h5 {
h6 {
@apply heading text-lg;
}
+hr {
+ border: none;
+ border-bottom: 1px solid theme("colors.eucalyptus.300");
+ margin-bottom: 0.8em;
+ height: 10px;
+}
a {
color: theme('colors.eucalyptus.500');
diff --git a/static/dist/app.css b/static/dist/app.css
index 5f09951..9fdf245 100644
--- a/static/dist/app.css
+++ b/static/dist/app.css
@@ -640,7 +640,7 @@ h1 {
font-size: 1.875rem;
}
-@media (min-width: 640px) {
+@media (min-width: 1024px) {
h1 {
font-size: 2.25rem;
}
@@ -654,7 +654,7 @@ h2 {
font-size: 1.5rem;
}
-@media (min-width: 640px) {
+@media (min-width: 1024px) {
h2 {
font-size: 1.875rem;
}
@@ -692,6 +692,13 @@ h6 {
font-size: 1.125rem;
}
+hr {
+ border: none;
+ border-bottom: 1px solid #9ACFBF;
+ margin-bottom: 0.8em;
+ height: 10px;
+}
+
a {
color: #028760;
text-decoration: none;
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-23 10:54:27 +0300