diff --git a/CHANGELOG.md b/CHANGELOG.md index 487c18c..e6d8cd5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,12 +19,16 @@ Code changes to `main` that are *not* in the latest release: - Added: `nav_enabled` site, layout, and page-level variable to selectively show or hide the side/mobile menu by [@kevinlin1] in [#1441]. The minimal layout was reimplemented using this feature, and now has support for the site-wide search bar and auxiliary links. - Fixed: protect `search-data.json` file from front matter default for layout by [@mattxwang] in [#1468] +- Fixed: Sass mixed declarations by [@bobvandevijver] in [#1495] Docs changes made since the latest release: - Docs: Explained the `nav_enabled` variables as an alternative to using the minimal layout [@kevinlin1] in [#1441]. +[@bobvandevijver]: https://github.com/bobvandevijver + [#1468]: https://github.com/just-the-docs/just-the-docs/pull/1468 +[#1495]: https://github.com/just-the-docs/just-the-docs/pull/1495 ## Release v0.8.2 diff --git a/_sass/base.scss b/_sass/base.scss index 0068d71..afa67a4 100644 --- a/_sass/base.scss +++ b/_sass/base.scss @@ -10,9 +10,9 @@ } html { - @include fs-4; - scroll-behavior: smooth; + + @include fs-4; } body { diff --git a/_sass/code.scss b/_sass/code.scss index d2a5ee1..df54f25 100644 --- a/_sass/code.scss +++ b/_sass/code.scss @@ -142,10 +142,10 @@ div.highlighter-rouge { // for AsciiDoc. we also need to fix the margins for its parent container. div.listingblock { - @include scroll-and-spacing("div.content", "div.content > pre"); - margin-top: 0; margin-bottom: $sp-3; + + @include scroll-and-spacing("div.content", "div.content > pre"); } // {% highlight LANG %}...{% endhighlight %}, @@ -176,12 +176,12 @@ figure.highlight { td, pre { - @include fs-2; - min-width: 0; padding: 0; background-color: $code-background-color; border: 0; + + @include fs-2; } td.gl { diff --git a/_sass/labels.scss b/_sass/labels.scss index 98cc8f9..fdf714e 100644 --- a/_sass/labels.scss +++ b/_sass/labels.scss @@ -14,9 +14,9 @@ text-transform: uppercase; vertical-align: middle; background-color: $blue-100; - @include fs-2; - border-radius: 12px; + + @include fs-2; } .label-green:not(g) { diff --git a/_sass/layout.scss b/_sass/layout.scss index 43ec5a5..4cc6ee4 100644 --- a/_sass/layout.scss +++ b/_sass/layout.scss @@ -65,11 +65,11 @@ } .main-content-wrap { - @include container; - padding-top: $gutter-spacing-sm; padding-bottom: $gutter-spacing-sm; + @include container; + @include mq(md) { padding-top: $gutter-spacing; padding-bottom: $gutter-spacing; @@ -126,8 +126,6 @@ } .site-title { - @include container; - flex-grow: 1; display: flex; height: 100%; @@ -135,6 +133,9 @@ padding-top: $sp-3; padding-bottom: $sp-3; color: $body-heading-color; + + @include container; + @include fs-6; @include mq(md) { @@ -200,14 +201,15 @@ body { // stylelint-enable selector-max-type .site-footer { - @include container; - position: absolute; bottom: 0; left: 0; padding-top: $sp-4; padding-bottom: $sp-4; color: $grey-dk-000; + + @include container; + @include fs-2; @include mq(md) { diff --git a/_sass/navigation.scss b/_sass/navigation.scss index 011a32e..a99d9dc 100644 --- a/_sass/navigation.scss +++ b/_sass/navigation.scss @@ -8,11 +8,11 @@ list-style: none; .nav-list-item { - @include fs-4; - position: relative; margin: 0; + @include fs-4; + @include mq(md) { @include fs-3; } diff --git a/_sass/support/mixins/_typography.scss b/_sass/support/mixins/_typography.scss index 5207fcd..760b0e9 100644 --- a/_sass/support/mixins/_typography.scss +++ b/_sass/support/mixins/_typography.scss @@ -1,5 +1,7 @@ @mixin fs-1 { - font-size: $font-size-1 !important; + & { + font-size: $font-size-1 !important; + } @include mq(sm) { font-size: $font-size-1-sm !important; @@ -7,7 +9,9 @@ } @mixin fs-2 { - font-size: $font-size-2 !important; + & { + font-size: $font-size-2 !important; + } @include mq(sm) { font-size: $font-size-3 !important; @@ -15,7 +19,9 @@ } @mixin fs-3 { - font-size: $font-size-3 !important; + & { + font-size: $font-size-3 !important; + } @include mq(sm) { font-size: $font-size-4 !important; @@ -23,7 +29,9 @@ } @mixin fs-4 { - font-size: $font-size-4 !important; + & { + font-size: $font-size-4 !important; + } @include mq(sm) { font-size: $font-size-5 !important; @@ -31,7 +39,9 @@ } @mixin fs-5 { - font-size: $font-size-5 !important; + & { + font-size: $font-size-5 !important; + } @include mq(sm) { font-size: $font-size-6 !important; @@ -39,7 +49,9 @@ } @mixin fs-6 { - font-size: $font-size-6 !important; + & { + font-size: $font-size-6 !important; + } @include mq(sm) { font-size: $font-size-7 !important; @@ -48,8 +60,10 @@ } @mixin fs-7 { - font-size: $font-size-7 !important; - line-height: $body-heading-line-height; + & { + font-size: $font-size-7 !important; + line-height: $body-heading-line-height; + } @include mq(sm) { font-size: $font-size-8 !important; @@ -57,8 +71,10 @@ } @mixin fs-8 { - font-size: $font-size-8 !important; - line-height: $body-heading-line-height; + & { + font-size: $font-size-8 !important; + line-height: $body-heading-line-height; + } @include mq(sm) { font-size: $font-size-9 !important; @@ -66,8 +82,10 @@ } @mixin fs-9 { - font-size: $font-size-9 !important; - line-height: $body-heading-line-height; + & { + font-size: $font-size-9 !important; + line-height: $body-heading-line-height; + } @include mq(sm) { font-size: $font-size-10 !important; @@ -75,8 +93,10 @@ } @mixin fs-10 { - font-size: $font-size-10 !important; - line-height: $body-heading-line-height; + & { + font-size: $font-size-10 !important; + line-height: $body-heading-line-height; + } @include mq(sm) { font-size: $font-size-10-sm !important; diff --git a/_sass/tables.scss b/_sass/tables.scss index c5d8491..3574323 100644 --- a/_sass/tables.scss +++ b/_sass/tables.scss @@ -21,14 +21,14 @@ table { th, td { - @include fs-3; - min-width: 7.5rem; padding: $sp-2 $sp-3; background-color: $table-background-color; border-bottom: $border rgba($border-color, 0.5); border-left: $border $border-color; + @include fs-3; + &:first-of-type { border-left: 0; } diff --git a/_sass/typography.scss b/_sass/typography.scss index 441dcae..0d0eaf2 100644 --- a/_sass/typography.scss +++ b/_sass/typography.scss @@ -3,9 +3,9 @@ h1, .text-alpha { - @include fs-8; - font-weight: 300; + + @include fs-8; } h2, @@ -21,11 +21,11 @@ h3, h4, .text-delta { - @include fs-2; - font-weight: 400; text-transform: uppercase; letter-spacing: 0.1em; + + @include fs-2; } h4 code {