From 49e568faacfda72894ae39ada1844fca93e457de Mon Sep 17 00:00:00 2001 From: Jimmy Cai Date: Mon, 12 Oct 2020 20:49:56 +0200 Subject: [PATCH] refactor: add .section-title (#36) For the small title before the card Remove .widget-title, .archive-date, .taxonomy-type from SCSS, as they all share the same style. --- assets/scss/partials/layout/archives.scss | 10 ---------- assets/scss/partials/layout/taxonomy.scss | 8 -------- assets/scss/partials/widgets.scss | 9 --------- assets/scss/style.scss | 16 +++++++++++++++- layouts/_default/archives.html | 16 +++++++--------- layouts/_default/term.html | 2 +- .../article/components/related-contents.html | 4 ++-- layouts/partials/widget/archives.html | 2 +- layouts/partials/widget/tag-cloud.html | 2 +- 9 files changed, 27 insertions(+), 42 deletions(-) diff --git a/assets/scss/partials/layout/archives.scss b/assets/scss/partials/layout/archives.scss index 569348e..2ac3836 100644 --- a/assets/scss/partials/layout/archives.scss +++ b/assets/scss/partials/layout/archives.scss @@ -1,15 +1,5 @@ .archives-group { margin-bottom: var(--section-separation); - .archives-date { - text-transform: uppercase; - margin-bottom: 10px; - font-size: 1.6rem; - font-weight: bold; - - a { - color: var(--body-text-color); - } - } } .template-archives { diff --git a/assets/scss/partials/layout/taxonomy.scss b/assets/scss/partials/layout/taxonomy.scss index d594b23..4575a20 100644 --- a/assets/scss/partials/layout/taxonomy.scss +++ b/assets/scss/partials/layout/taxonomy.scss @@ -1,11 +1,3 @@ -.taxonomy-type { - text-transform: uppercase; - color: var(--body-text-color); - font-weight: bold; - margin-bottom: 5px; - font-size: 1.6rem; -} - .taxonomy-card { border-radius: var(--card-border-radius); background-color: var(--card-background); diff --git a/assets/scss/partials/widgets.scss b/assets/scss/partials/widgets.scss index 25661e7..63fa300 100644 --- a/assets/scss/partials/widgets.scss +++ b/assets/scss/partials/widgets.scss @@ -1,13 +1,4 @@ .widget { - .widget-title { - text-transform: uppercase; - color: var(--body-text-color); - font-weight: bold; - margin: 0; - margin-bottom: 10px; - font-size: 1.6rem; - } - .widget-icon { svg { width: 32px; diff --git a/assets/scss/style.scss b/assets/scss/style.scss index 5e07b9c..178c0ef 100644 --- a/assets/scss/style.scss +++ b/assets/scss/style.scss @@ -40,4 +40,18 @@ a { box-shadow: 0px -10px 0px rgba(var(--link-background-color), var(--link-background-opacity-hover)) inset; } } -} \ No newline at end of file +} + +.section-title { + text-transform: uppercase; + margin-top: 0; + margin-bottom: 10px; + display: block; + font-size: 1.6rem; + font-weight: bold; + color: var(--body-text-color); + + a { + color: var(--body-text-color); + } +} diff --git a/layouts/_default/archives.html b/layouts/_default/archives.html index cf9ef94..0304832 100644 --- a/layouts/_default/archives.html +++ b/layouts/_default/archives.html @@ -2,14 +2,12 @@ {{ define "main" }} {{ $categories := ($.Site.GetPage "taxonomyTerm" "categories").Pages }} {{ if $categories }} -
-

Categories

-
-
- {{ range $categories }} - {{ partial "article-list/tile" (dict "context" . "size" "250x150" "Type" "taxonomy") }} - {{ end }} -
+

Categories

+
+
+ {{ range $categories }} + {{ partial "article-list/tile" (dict "context" . "size" "250x150" "Type" "taxonomy") }} + {{ end }}
{{ end }} @@ -21,7 +19,7 @@ {{ range $filtered.GroupByDate "2006" }} {{ $id := lower (replace .Key " " "-") }}
-

{{ .Key }}

+

{{ .Key }}

{{ range .Pages }} {{ partial "article-list/compact" . }} diff --git a/layouts/_default/term.html b/layouts/_default/term.html index 3189e9a..3bfcc28 100644 --- a/layouts/_default/term.html +++ b/layouts/_default/term.html @@ -1,5 +1,5 @@ {{ define "main" }} -

{{ .Type | singularize | humanize }}

+

{{ .Type | singularize | humanize }}

{{ len .Pages }} post{{ if gt (len .Pages) 1 }}s{{ end }}

diff --git a/layouts/partials/article/components/related-contents.html b/layouts/partials/article/components/related-contents.html index b06fce6..1265387 100644 --- a/layouts/partials/article/components/related-contents.html +++ b/layouts/partials/article/components/related-contents.html @@ -1,7 +1,7 @@ -