From 900fe7ed066801819e6423db2691a15c55bffb7a Mon Sep 17 00:00:00 2001 From: Landon Taylor Date: Fri, 6 Jun 2025 18:05:19 -0600 Subject: [PATCH] fix taxonomy issues --- assets/sass/_layout.sass | 5 +- assets/sass/_links.sass | 9 ++- assets/sass/_publications.sass | 13 +++++ assets/sass/_taxonomy.sass | 102 ++++++++++++++++----------------- assets/sass/main.sass | 3 +- layouts/tools/page.html | 40 ++++++++----- 6 files changed, 101 insertions(+), 71 deletions(-) create mode 100644 assets/sass/_publications.sass diff --git a/assets/sass/_layout.sass b/assets/sass/_layout.sass index cc26f8b..f9240b3 100644 --- a/assets/sass/_layout.sass +++ b/assets/sass/_layout.sass @@ -39,7 +39,7 @@ header h1, header h1 a color: $text text-decoration: none padding: 0 - transition: color 0.4s + transition: color 0.4s ease-in-out &:hover, &:focus color: $accent-light @@ -67,9 +67,10 @@ nav ul li a color: $text text-decoration: none font-weight: 500 - transition: background 0.4s + transition: background 0.4s ease-in-out &:hover, &:focus background: $accent-dark + color: $text @media (max-width: 600px) header diff --git a/assets/sass/_links.sass b/assets/sass/_links.sass index 8178585..2aeec35 100644 --- a/assets/sass/_links.sass +++ b/assets/sass/_links.sass @@ -1,5 +1,12 @@ /* _text.sass */ +a + color: $primary + text-decoration: underline + transition: color 0.3s ease-in-out + &:hover, &:focus + color: $accent + #quick-links text-align: left @@ -31,6 +38,6 @@ color: $darkest text-decoration: none font-weight: 500 - transition: background 0.4s + transition: background 0.3s ease-in-out &:hover, &:focus background: $accent-light diff --git a/assets/sass/_publications.sass b/assets/sass/_publications.sass new file mode 100644 index 0000000..e3302d6 --- /dev/null +++ b/assets/sass/_publications.sass @@ -0,0 +1,13 @@ +#publications + ul + list-style: none + margin: 0 + padding: 0 + display: flex + flex-direction: column + gap: 1em + + li + background: $surface + border-radius: 8px + padding: 1em 1.5em diff --git a/assets/sass/_taxonomy.sass b/assets/sass/_taxonomy.sass index 41dcea0..3fb0b90 100644 --- a/assets/sass/_taxonomy.sass +++ b/assets/sass/_taxonomy.sass @@ -7,62 +7,60 @@ table#taxonomy-table background: $surface text-align: left - tr:nth-child(even) - background: darken($surface, 2%) - transition: background 0.4s - tr:nth-child(odd) - background: lighten($surface, 3%) - transition: background 0.4s - tr:hover, tr:focus - background: $border + tr + border-bottom: 3px solid $background + &:nth-child(even) + background: darken($surface, 2%) + transition: background 0.4s ease-in-out + &:nth-child(odd) + background: lighten($surface, 3%) + transition: background 0.4s ease-in-out + &:hover, &:focus + background: $border -#taxonomy-table thead - text-align: left - border: none - background: $darkest - border-radius: $border-radius $border-radius 0 0 + thead + text-align: left + border: none + background: $darkest + border-radius: $border-radius $border-radius 0 0 -#taxonomy-table th - color: $text - padding: 0.6rem 0.6rem - text-align: left - font-weight: 600 - border: none + th + color: $text + padding: 0.6rem 0.6rem + text-align: left + font-weight: 600 + border: none -#taxonomy-table td - padding: 0.3rem 0.6rem - text-align: left - font-weight: 600 - border: none + td + padding: 0.3rem 0.6rem + text-align: left + font-weight: 600 + border: none -#taxonomy-table tr - border-bottom: 3px solid $background - &:hover, &:focus - background: $primary-light + a.term-link + padding: 0.2rem 0.6rem + margin: 0.2rem + display: inline-block + border-radius: $border-radius + text-decoration: none + font-weight: 500 + color: $text + transition: color 0.4s ease-in-out, background 0.4s ease-in-out + &:hover, &:focus + color: $darkest !important + background: $text-subtle !important -#taxonomy-table a.term-link - padding: 0.2rem 0.6rem - margin: 0.2rem - display: inline-block - border-radius: $border-radius - text-decoration: none - font-weight: 500 - color: $text - transition: color 0.4s - &:hover, &:focus - color: $darkest - -#taxonomy-table a.taxonomy-name - padding: 0 - margin: 0.2rem - display: inline-block - border-radius: $border-radius - text-decoration: none - font-weight: 500 - color: $text - transition: color 0.4s - &:hover, &:focus - color: $accent-light + a.taxonomy-name + padding: 0 + margin: 0.2rem + display: inline-block + border-radius: $border-radius + text-decoration: none + font-weight: 500 + color: $text + transition: color 0.4s ease-in-out + &:hover, &:focus + color: $accent-light #taxonomy-page a.term-link padding: 0.3rem 1.2rem @@ -72,7 +70,7 @@ table#taxonomy-table text-decoration: none font-weight: 500 color: $text - transition: color 0.4s + transition: color 0.4s ease-in-out font-size: 1.2rem &:hover, &:focus color: $darkest diff --git a/assets/sass/main.sass b/assets/sass/main.sass index 2d28d0a..3b5d9f5 100644 --- a/assets/sass/main.sass +++ b/assets/sass/main.sass @@ -2,4 +2,5 @@ @import "colors" @import "layout" @import "taxonomy" -@import "links" \ No newline at end of file +@import "links" +@import "publications" \ No newline at end of file diff --git a/layouts/tools/page.html b/layouts/tools/page.html index 43180de..e37813f 100644 --- a/layouts/tools/page.html +++ b/layouts/tools/page.html @@ -26,19 +26,21 @@

At a Glance

+ {{ $params := .Params }} {{ range $taxonomyname, $taxonomy := .Site.Taxonomies }} - {{ with $taxonomy }} - - + @@ -54,21 +56,29 @@ {{ with .Params.publications}} -
+

Publications

    {{ range $citation, $pub := site.Data.publications }} {{ range $pub }} {{ if in $.Params.publications .key }}
  • - {{ if .year }} {{ .year }}: {{ end }} - {{ if .title }} {{ .title }} {{ end }} - {{ if .author }}
    by {{ delimit .author " | " | html }} {{ end }} - {{ if .booktitle }}
    Appears in {{ .booktitle }} {{ end }} - {{ if .journal }}
    Appears in {{ .journal }} {{ end }} - {{ if .volume }} {{ .volume }} {{ end }} + {{ if .title }} {{ .title }} {{ end }} + {{ if .year }} + {{ if .month }} + ({{ .month }} {{.year }}) + {{ else }} + ({{ .year }}) + {{ end }} + {{ end }} + {{ if .author }} by {{ index .author 0 }}{{ if (gt (len .author) 1) }} et. al. {{ end }}{{ end }} + {{ if .booktitle }} | Appears in {{ .booktitle }} {{ end }} {{ if .pages }} ({{ .pages }}) {{ end }} - {{ if .doi }}
    DOI: {{ .doi }} {{ end }} + {{ if .journal }} | Appears in {{ .journal }} {{ end }} + {{ if .volume }} | Volume {{ .volume }} {{ end }} + {{ if .publisher }} | Published by {{ .publisher }} {{ end }} + {{ if .doi }}
    {{ .doi }} + {{ else if .url }}
    {{ .url }} {{ end }}
    • {{ end }} {{ end }}
- + + {{ $taxonomyname | strings.FirstUpper }} - - {{ range $key, $value := $taxonomy }} - {{ partial "term-link.html" (dict "name" $key "taxonomy" $taxonomyname) }} + {{ range $term := $terms }} + {{ partial "term-link.html" (dict "name" $term "taxonomy" $taxonomyname) }} {{ end }}