From d4c85118d770e77bd7eef0bcd032367d7fa84270 Mon Sep 17 00:00:00 2001 From: at055612 <22818309+at055612@users.noreply.github.com> Date: Tue, 17 May 2022 14:10:54 +0100 Subject: [PATCH 1/3] gh-1004 Add breadcrumbs and cards to taxonomy result list --- assets/scss/_taxonomy.scss | 50 ++++++++++++++++++++++------------ layouts/_default/taxonomy.html | 7 +++-- 2 files changed, 38 insertions(+), 19 deletions(-) diff --git a/assets/scss/_taxonomy.scss b/assets/scss/_taxonomy.scss index 538014057..bd5660d77 100644 --- a/assets/scss/_taxonomy.scss +++ b/assets/scss/_taxonomy.scss @@ -6,7 +6,7 @@ font-size: 0.8rem; .taxonomy-title { - display: inline; + display: inline; font-size: 1.25em; height: 1em; line-height: 1em; @@ -21,7 +21,7 @@ font-size: 0.8rem; .taxonomy-title { - display: inline-block; + display: inline-block; width: 100%; font-size: 1rem; font-weight: 700; @@ -79,7 +79,7 @@ .taxonomy-terms { list-style: none; margin: 0; - overflow: hidden; + overflow: hidden; padding: 0; display: inline; @@ -127,7 +127,7 @@ -webkit-transition: color 0.2s; -webkit-clip-path: polygon(100% 0,100% 100%,0.8em 100%,0 50%,0.8em 0); clip-path: polygon(100% 0,100% 100%,0.8em 100%,0 50%,0.8em 0); - + &:hover { background-color: $primary; color: $white; @@ -136,9 +136,9 @@ color: $dark!important; } } - + &:hover::before { - background: $primary; + background: $primary; } } @@ -160,7 +160,7 @@ text-decoration: none; -webkit-clip-path: none; clip-path: none; - + &:hover { background: none; color: $link-color; @@ -169,7 +169,7 @@ color: $dark!important; } } - + &:hover::before { background: none; } @@ -207,8 +207,8 @@ font-variant: normal; text-rendering: auto; -webkit-font-smoothing: antialiased; - font-family: "Font Awesome 5 Free"; - // font-weight: 900; + font-family: "Font Awesome 5 Free"; + // font-weight: 900; padding-right: 0.5em; font-size: 2em; min-width: 1.5em; @@ -249,7 +249,7 @@ text-decoration: none; -webkit-clip-path: none; clip-path: none; - + &:hover { background: none; color: $link-color; @@ -258,7 +258,7 @@ color: $dark!important; } } - + &:hover::before { background: none; text-shadow: 0 0 3px $gray-900; @@ -276,7 +276,7 @@ .taxonomy-title { display: none; } - } + } } .taxonomy-taxonomy-page { @@ -298,7 +298,7 @@ font-variant: normal; text-rendering: auto; -webkit-font-smoothing: antialiased; - font-family: "Font Awesome 5 Free"; + font-family: "Font Awesome 5 Free"; content: "\f02d"; padding-right: 0.5em; } @@ -309,7 +309,7 @@ font-variant: normal; text-rendering: auto; -webkit-font-smoothing: antialiased; - font-family: "Font Awesome 5 Free"; + font-family: "Font Awesome 5 Free"; content: "\f781"; padding-right: 0.5em; } @@ -325,8 +325,24 @@ font-variant: normal; text-rendering: auto; -webkit-font-smoothing: antialiased; - font-family: "Font Awesome 5 Free"; + font-family: "Font Awesome 5 Free"; content: "\f122"; padding-right: 0.5em; } -} \ No newline at end of file +} + +.article-teaser { + &.card { + padding: 1.0em; + margin-bottom:1.5em; + } + + .breadcrumb { + margin-bottom:0em; + font-size: 0.85rem; + } + + .article-meta { + margin-bottom:0em; + } +} diff --git a/layouts/_default/taxonomy.html b/layouts/_default/taxonomy.html index 416652aff..57c154294 100644 --- a/layouts/_default/taxonomy.html +++ b/layouts/_default/taxonomy.html @@ -8,8 +8,11 @@

{{ with .Data.Singular }}{{ . | humanize }}: {{ end }}{{ .Title }} {{ range .Pages }} {{ $manualLink := cond (isset .Params "manuallink") .Params.manualLink ( cond (isset .Params "manuallinkrelref") (relref . .Params.manualLinkRelref) .RelPermalink) }} -
+

{{- .Title -}}

+ {{ if not .Site.Params.ui.taxonomy_breadcrumb_disable }} + {{- partial "breadcrumb.html" . -}} + {{ end }}

{{ .Description | markdownify }}

{{ partial "taxonomy_terms_article_wrapper.html" . }} @@ -23,4 +26,4 @@

{{ humanize ( T "ui_all" ) }} {{ with .Data.Plural }}{{ . | humanize }}{{ end }} -{{ end }} \ No newline at end of file +{{ end }} From 33a6ebc2f0e5ba26ee59404b3453529d5a10fadf Mon Sep 17 00:00:00 2001 From: at055612 <22818309+at055612@users.noreply.github.com> Date: Tue, 17 May 2022 14:11:20 +0100 Subject: [PATCH 2/3] gh-1004 Change breadcrumb partial so leaf item is not a link --- layouts/partials/breadcrumb.html | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/layouts/partials/breadcrumb.html b/layouts/partials/breadcrumb.html index 832b7848f..9479fd4ad 100644 --- a/layouts/partials/breadcrumb.html +++ b/layouts/partials/breadcrumb.html @@ -18,8 +18,11 @@ {{ template "breadcrumbnav" (dict "p1" .p1.Site.Home "p2" .p2 ) -}} {{ end -}} {{ $isActive := eq .p1 .p2 }} -
  • - {{ .p1.LinkTitle }} +
  • + {{- if $isActive }} + {{ .p1.LinkTitle }} + {{ else -}} + {{ .p1.LinkTitle }} + {{ end -}}
    • {{- end -}} From 89877c6f14ddb784a459030ffe16ca33fa4ccfd2 Mon Sep 17 00:00:00 2001 From: at055612 <22818309+at055612@users.noreply.github.com> Date: Tue, 17 May 2022 14:28:07 +0100 Subject: [PATCH 3/3] gh-1004 Format scss --- assets/scss/_taxonomy.scss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/assets/scss/_taxonomy.scss b/assets/scss/_taxonomy.scss index bd5660d77..8be1f4f2d 100644 --- a/assets/scss/_taxonomy.scss +++ b/assets/scss/_taxonomy.scss @@ -334,15 +334,15 @@ .article-teaser { &.card { padding: 1.0em; - margin-bottom:1.5em; + margin-bottom: 1.5em; } .breadcrumb { - margin-bottom:0em; + margin-bottom: 0em; font-size: 0.85rem; } .article-meta { - margin-bottom:0em; + margin-bottom: 0em; } }