diff options
author | WANG Chucheng <me@wangchucheng.com> | 2022-02-07 01:01:39 +0300 |
---|---|---|
committer | WANG Chucheng <me@wangchucheng.com> | 2022-02-07 01:01:39 +0300 |
commit | 27dd13c1bba6160519247f6a73e6be1770fe7b89 (patch) | |
tree | 648e1fb5e2a5b24e1083d3aaf5103612116ca5e3 /layouts | |
parent | b0eb9e83ba1d09269c936fcf1fa29284d0c88083 (diff) |
style: make colors more coordinated
Diffstat (limited to 'layouts')
-rw-r--r-- | layouts/partials/components/list-article.html | 2 | ||||
-rw-r--r-- | layouts/partials/components/post-author.html | 57 | ||||
-rw-r--r-- | layouts/partials/components/post-footer.html | 24 | ||||
-rw-r--r-- | layouts/partials/components/summary-masonry.html | 24 | ||||
-rw-r--r-- | layouts/partials/utils/get-summary.html | 51 | ||||
-rw-r--r-- | layouts/partials/widgets/about.html | 2 | ||||
-rw-r--r-- | layouts/partials/widgets/experience.html | 38 |
7 files changed, 102 insertions, 96 deletions
diff --git a/layouts/partials/components/list-article.html b/layouts/partials/components/list-article.html index 6f37b2d..edd6096 100644 --- a/layouts/partials/components/list-article.html +++ b/layouts/partials/components/list-article.html @@ -1,5 +1,5 @@ <article class="prose mx-6 my-8 max-w-none"> - <h1 class="text-primary-text text-3xl font-bold">{{ .Title }}</h1> + <h1>{{ .Title }}</h1> {{ with .Content }} {{ . }} {{ end }} diff --git a/layouts/partials/components/post-author.html b/layouts/partials/components/post-author.html index c809763..4ca43ab 100644 --- a/layouts/partials/components/post-author.html +++ b/layouts/partials/components/post-author.html @@ -1,27 +1,36 @@ <div class="py-2"> - {{ range . }} - <div class="flex flex-col md:flex-row items-center my-8"> - <a href="{{ .Permalink }}" class="w-24 h-24 md:me-4"> - {{ $img := partial "utils/get-image" (dict "context" . "url" .Params.avatar "keyword" "*avatar*")}} - {{ with $img }} - <img src="{{ . }}" class="w-full bg-primary-bg rounded-full" alt="Avatar"> - {{ else }} - <i class="fas fa-user-circle fa-6x"></i> - {{ end }} + {{ range . }} + <div class="my-8 flex flex-col items-center md:flex-row"> + <a href="{{ .Permalink }}" class="md:me-4 text-primary-text h-24 w-24"> + {{ $img := partial "utils/get-image" (dict "context" . "url" .Params.avatar "keyword" "*avatar*") }} + {{ with $img }} + <img + src="{{ . }}" + class="bg-primary-bg w-full rounded-full" + alt="Avatar" + /> + {{ else }} + <i class="fas fa-user-circle fa-6x"></i> + {{ end }} + </a> + <div class="mt-4 w-full md:mt-0 md:w-auto"> + <a + href="{{ .Permalink }}" + class="mb-2 block border-b pb-1 text-lg font-bold" + > + <h3>{{ .LinkTitle }}</h3> </a> - <div class="w-full md:w-auto mt-4 md:mt-0"> - <a href="{{ .Permalink }}" class="block font-bold text-lg pb-1 mb-2 border-b">{{ .LinkTitle }}</a> - <span class="block pb-2">{{ .Params.bio }}</span> - {{ range .Params.social }} - {{/* Deprecation warning(v1.0.0) starts */}} - {{ $iconPack := .iconPack | default .icon_pack }} - {{/* Deprecation warning(v1.0.0) ends */}} - {{ $src := print $iconPack " fa-" .icon }} - <a href="{{ .url }}" class="me-1"> - <i class="{{ print $src }}"></i> - </a> - {{ end }} - </div> + <span class="block pb-2">{{ .Params.bio }}</span> + {{ range .Params.social }} + {{/* Deprecation warning(v1.0.0) starts */}} + {{ $iconPack := .iconPack | default .icon_pack }} + {{/* Deprecation warning(v1.0.0) ends */}} + {{ $src := print $iconPack " fa-" .icon }} + <a href="{{ .url }}" class="me-1"> + <i class="{{ print $src }}"></i> + </a> + {{ end }} + </div> </div> - {{ end }} -</div>
\ No newline at end of file + {{ end }} +</div> diff --git a/layouts/partials/components/post-footer.html b/layouts/partials/components/post-footer.html index 90db30f..108bdac 100644 --- a/layouts/partials/components/post-footer.html +++ b/layouts/partials/components/post-footer.html @@ -1,16 +1,20 @@ {{ if or .PrevInSection .NextInSection }} -<div class="flex flex-col md:flex-row md:justify-between -mx-2 mt-4 px-2 pt-4 border-t"> + <div + class="-mx-2 mt-4 flex flex-col border-t px-2 pt-4 md:flex-row md:justify-between" + > <div> - {{ with .NextInSection }} - <span class="block font-bold">{{ i18n "previous" }}</span> + {{ with .NextInSection }} + <span class="text-primary-text block font-bold" + >{{ i18n "previous" }}</span + > <a href="{{ .Permalink }}" class="block">{{ .LinkTitle }}</a> - {{ end }} + {{ end }} </div> - <div class="md:text-right mt-4 md:mt-0"> - {{ with .PrevInSection }} - <span class="block font-bold">{{ i18n "next" }}</span> + <div class="mt-4 md:mt-0 md:text-right"> + {{ with .PrevInSection }} + <span class="text-primary-text block font-bold">{{ i18n "next" }}</span> <a href="{{ .Permalink }}" class="block">{{ .LinkTitle }}</a> - {{ end }} + {{ end }} </div> -</div> -{{ end }}
\ No newline at end of file + </div> +{{ end }} diff --git a/layouts/partials/components/summary-masonry.html b/layouts/partials/components/summary-masonry.html index 8984b04..a9186cd 100644 --- a/layouts/partials/components/summary-masonry.html +++ b/layouts/partials/components/summary-masonry.html @@ -1,23 +1,19 @@ <div - class="bg-secondary-bg overflow-hidden rounded border transition duration-200 ease-in-out hover:shadow-lg" + class="bg-secondary-bg dark:border-tertiary-bg overflow-hidden rounded border transition duration-200 ease-in-out hover:shadow-lg" > {{ $featured := partial "utils/get-featured" . }} {{ with $featured }} {{ . }} {{ end }} - <div class="px-6 pt-6"> - <div class="text-primary-text mb-2 text-xl font-bold"> - <a href="{{ .Permalink }}" class="hover:text-eureka">{{ .LinkTitle }}</a> - </div> - <div class="prose max-w-none"> - {{ if .Description }} - {{ .Description | plainify | htmlUnescape }} - {{ else if .Summary }} - {{ .Summary | plainify | htmlUnescape }} - {{ end }} - </div> - </div> - <div class="px-6 pb-2"> + <div class="prose max-w-none px-6 pt-6 pb-4"> + <a href="{{ .Permalink }}" class="no-underline"> + <h3 class="mt-0">{{ .LinkTitle }}</h3> + </a> + {{ if .Description }} + {{ .Description | plainify | htmlUnescape }} + {{ else if .Summary }} + {{ .Summary | plainify | htmlUnescape }} + {{ end }} {{ partial "components/post-metadata" . }} </div> </div> diff --git a/layouts/partials/utils/get-summary.html b/layouts/partials/utils/get-summary.html index c6e972e..0909938 100644 --- a/layouts/partials/utils/get-summary.html +++ b/layouts/partials/utils/get-summary.html @@ -1,37 +1,38 @@ -<div class="mb-4"> - <a href="{{ .Permalink }}" class="text-xl font-bold">{{ .LinkTitle }}</a> -</div> <div class="prose max-w-none"> + <a href="{{ .Permalink }}" class="no-underline"> + <h3 class="mt-0">{{ .LinkTitle }}</h3> + </a> {{ if .Description }} {{ .Description | plainify | htmlUnescape }} {{ else if .Summary }} {{ .Summary | plainify | htmlUnescape }} {{ end }} -</div> -{{ if eq .Type "docs" }} - <div class="px-6 pt-4"> - {{ range $index, $value := first 3 .Pages }} - {{ if gt $index 0 }} - <div class="-mx-4 my-4 border-t"></div> - {{ end -}} - <div class="mb-2"> - <a href="{{ .Permalink }}" class="font-semibold">{{ .LinkTitle }}</a> - </div> - <div class="prose max-w-none"> + + {{ if eq .Type "docs" }} + <div class="mx-6"> + {{ range $index, $value := first 3 .Pages }} + {{ if gt $index 0 }} + <div class="-mx-4 my-4 border-t"></div> + {{ end -}} + <a href="{{ .Permalink }}" class="no-underline"> + <h4>{{ .LinkTitle }}</h4> + </a> {{ if .Description }} {{ .Description | plainify | htmlUnescape }} {{ else if .Summary }} {{ .Summary | plainify | htmlUnescape }} {{ end }} - </div> - {{ end }} - <div class="hover:text-eureka pt-6"> - <a href="{{ .Permalink }}" class="font-semibold">{{ i18n "readMore" }}</a> - <i - class="fas {{ cond (eq .Site.Language.LanguageDirection "rtl") "fa-caret-left" "fa-caret-right" }} ms-1" - ></i> + {{ end }} + <a href="{{ .Permalink }}" class="no-underline"> + <h4> + {{ i18n "readMore" }} + <i + class="fas {{ cond (eq .Site.Language.LanguageDirection "rtl") "fa-caret-left" "fa-caret-right" }} ms-1" + ></i> + </h4> + </a> </div> - </div> -{{ else }} - {{ partial "components/post-metadata" . }} -{{ end }} + {{ else }} + {{ partial "components/post-metadata" . }} + {{ end }} +</div> diff --git a/layouts/partials/widgets/about.html b/layouts/partials/widgets/about.html index 4f4bb6d..9633439 100644 --- a/layouts/partials/widgets/about.html +++ b/layouts/partials/widgets/about.html @@ -6,7 +6,7 @@ </div> {{ end }} <div class="mt-4 grow md:mt-0"> - <div class="py-4 text-3xl">{{ .Title }}</div> + <h1 class="py-4 text-3xl">{{ .Title }}</h1> <div class="w-3/12 border-b xl:w-2/12"></div> <div class="flex items-center pt-4"> diff --git a/layouts/partials/widgets/experience.html b/layouts/partials/widgets/experience.html index c380b68..5b2d508 100644 --- a/layouts/partials/widgets/experience.html +++ b/layouts/partials/widgets/experience.html @@ -1,34 +1,30 @@ {{ range .Params.experiences }} <div class="mb-6"> <div - class="bg-secondary-bg rounded border px-6 pt-6 pb-4 transition duration-200 ease-in-out hover:shadow-lg" + class="bg-secondary-bg prose dark:border-tertiary-bg max-w-none rounded border p-6 transition duration-200 ease-in-out hover:shadow-lg" > - <div class="mb-4"> - <div class="text-xl font-bold">{{ .title }}</div> - <div class="flex flex-col md:flex-row md:justify-between"> - <div> - {{ if .organization.url }} - <a href="{{ .organization.url }}" - >{{ .organization.name | markdownify }}</a - > - {{ else }} - <span>{{ .organization.name | markdownify }}</span> - {{ end }} + <h3 class="">{{ .title }}</h3> + <div class="flex flex-col md:flex-row md:justify-between"> + <div> + {{ if .organization.url }} + <a href="{{ .organization.url }}" class="no-underline"> + {{ .organization.name | markdownify }} + </a> + {{ else }} + <span>{{ .organization.name | markdownify }}</span> + {{ end }} - {{ if and .organization.name .location }} - <span class="ms-2 me-2">·</span> - {{ end }} + {{ if and .organization.name .location }} + <span class="ms-2 me-2">·</span> + {{ end }} - <span>{{ .location | markdownify }} </span> - </div> - <div class="shrink-0">{{ .dates | markdownify }}</div> + <span>{{ .location | markdownify }} </span> </div> + <div class="shrink-0">{{ .dates | markdownify }}</div> </div> - <div class="prose max-w-none"> - {{ .writeup | markdownify }} - </div> + <div class="mt-5">{{ .writeup | markdownify }}</div> </div> </div> {{ end }} |