diff options
| author | Joe Carstairs <65492573+Sycamost@users.noreply.github.com> | 2023-12-17 14:06:23 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-17 14:06:23 +0000 |
| commit | fe9844b8eac1daf3eeedf141e223d0733c892fa0 (patch) | |
| tree | e89ac30c35b3cd518c563db965fd44197cf0a6a0 /scss | |
| parent | 250152cc1b6a67bd18f4b211856fa98ec06d8eda (diff) | |
Update production from staging (#48)
* Edit README (#28)
* Corrects Lallans instructions
* Adds instructions for adding a Scotsoun release
* Documents infrastructure
* Better contribution guidance
* Update README (#29)
* Updates references to branch names in README
* ESLint ignores Markdown
* Documents Coding Style
* Specifies upstream branch in README where salient
* Fixes Sangschaw winners list in Eiks 30 (#35)
* Fixes Sangschaw winners list in Eiks 30 (#36)
* Fixes Sangschaw winners list in Eiks 30 (#38)
* Eiks 31 (#41)
* Eiks 31
* Prettier dl's
* Prettier headings
---------
Co-authored-by: Joe Carstairs <jcarstairs@scottlogic.com>
* Reorder news (#42)
* Reslugs news items
* Fixes typo in getMostRecentNewsItem()
* Fixes typo in newUtils.getDate()
* Sorts news index from most recent to oldest
* Eiks 31 fixes (#43)
* Eiks 31 fixes
* Improves list styling
* Links to Leid title track on YouTube (#45)
* Eiks 31 fixes (#47)
* Links to Leid title track on YouTube
* Corrects Sangschaw pricing
* Update production (#37) (#49)
* Edit README (#28)
* Corrects Lallans instructions
* Adds instructions for adding a Scotsoun release
* Documents infrastructure
* Better contribution guidance
* Update README (#29)
* Updates references to branch names in README
* ESLint ignores Markdown
* Documents Coding Style
* Specifies upstream branch in README where salient
* Fixes Sangschaw winners list in Eiks 30 (#35)
* Fixes Sangschaw winners list in Eiks 30 (#36)
* Fixes Sangschaw winners list in Eiks 30 (#38)
---------
Co-authored-by: Joe Carstairs <jcarstairs@scottlogic.com>
Diffstat (limited to 'scss')
| -rw-r--r-- | scss/base/dl.scss | 5 | ||||
| -rw-r--r-- | scss/base/index.scss | 6 | ||||
| -rw-r--r-- | scss/base/typography.scss | 5 | ||||
| -rw-r--r-- | scss/modules/committee.scss | 3 | ||||
| -rw-r--r-- | scss/modules/link-gallery.scss | 1 | ||||
| -rw-r--r-- | scss/modules/nav.scss | 9 | ||||
| -rw-r--r-- | scss/modules/product.scss | 11 | ||||
| -rw-r--r-- | scss/modules/schedule.scss | 1 | ||||
| -rw-r--r-- | scss/normalize.scss | 4 |
9 files changed, 32 insertions, 13 deletions
diff --git a/scss/base/dl.scss b/scss/base/dl.scss new file mode 100644 index 0000000..95cc836 --- /dev/null +++ b/scss/base/dl.scss @@ -0,0 +1,5 @@ +dt { + font-weight: 700; + text-decoration: underline; + margin-top: 1rem; +}
\ No newline at end of file diff --git a/scss/base/index.scss b/scss/base/index.scss index da4f59e..f338772 100644 --- a/scss/base/index.scss +++ b/scss/base/index.scss @@ -1,4 +1,4 @@ -@use 'typography'; -@use 'theme'; +@use 'dl'; @use 'list'; - +@use 'theme'; +@use 'typography'; diff --git a/scss/base/typography.scss b/scss/base/typography.scss index fb2ac17..9f40bcc 100644 --- a/scss/base/typography.scss +++ b/scss/base/typography.scss @@ -45,6 +45,8 @@ h3, h4 { font-family: var(--font-serif); font-weight: 700; + line-height: 1.15; + text-wrap: balance; } .title { @@ -52,6 +54,7 @@ h4 { font-size: var(--font-size-6); font-weight: 700; margin-block-start: var(--margin-block-sm); + text-wrap: balance; } .title--small { @@ -59,7 +62,7 @@ h4 { margin-block-start: 0; } -p:not(:first-child) { +:is(p, ol, ul):not(:first-child) { margin-block-start: var(--margin-block-sm); } diff --git a/scss/modules/committee.scss b/scss/modules/committee.scss index 8817fc1..2badf57 100644 --- a/scss/modules/committee.scss +++ b/scss/modules/committee.scss @@ -1,4 +1,5 @@ .committee__member { + list-style-type: none; margin-block-start: var(--margin-block-sm); } @@ -6,4 +7,4 @@ margin-inline: calc(var(--grid-column-width) + var(--grid-gutter-width)); width: calc(var(--grid-gutter-width) + 2 * var(--grid-column-width)); border-radius: 50%; -}
\ No newline at end of file +} diff --git a/scss/modules/link-gallery.scss b/scss/modules/link-gallery.scss index c3788dc..56949e2 100644 --- a/scss/modules/link-gallery.scss +++ b/scss/modules/link-gallery.scss @@ -9,6 +9,7 @@ text-align: center; li { + list-style-type: none; grid-column: span var(--gallery-item-column-span); } diff --git a/scss/modules/nav.scss b/scss/modules/nav.scss index 44ec5c6..aebcbcf 100644 --- a/scss/modules/nav.scss +++ b/scss/modules/nav.scss @@ -1,5 +1,5 @@ .nav > :not(:last-child) { - margin-block-end: var(--margin-block-sm); + margin-block: 0 var(--margin-block-sm); } .nav__bottom-row { @@ -11,10 +11,11 @@ display: grid; grid-template-columns: repeat(var(--grid-column-count), var(--grid-column-width)); column-gap: var(--grid-gutter-width); -} -.nav__nav-links li { - margin: 0; + li { + list-style-type: none; + margin: 0; + } } .nav__logo { diff --git a/scss/modules/product.scss b/scss/modules/product.scss index 32fa37f..bc05dfd 100644 --- a/scss/modules/product.scss +++ b/scss/modules/product.scss @@ -18,3 +18,14 @@ width: 100%; height: auto; } + +:is(.product__contributors, .product__contributions) { + list-style-type: none; +} + +.product__contribution__title { + font-style: italic; + &:has(+ .product__contribution__author) { + margin-inline-end: 0.3em; + } +} diff --git a/scss/modules/schedule.scss b/scss/modules/schedule.scss index 140767c..40a9fee 100644 --- a/scss/modules/schedule.scss +++ b/scss/modules/schedule.scss @@ -6,6 +6,7 @@ font-weight: 700; margin-block-start: var(--margin-block-sm); text-align: center; + text-decoration: none; } .schedule dd { diff --git a/scss/normalize.scss b/scss/normalize.scss index 0130a0b..9d59ef8 100644 --- a/scss/normalize.scss +++ b/scss/normalize.scss @@ -110,7 +110,3 @@ a, :link, :visited { color: currentColor; text-decoration: none; } - -li { - list-style: none; -} |
