diff --git a/CHANGELOG.md b/CHANGELOG.md index d0029dc5e0..f850cb53e8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,23 +14,24 @@ For a list of issues targeted for the next release, see the [23Q1][] milestone. **Breaking changes**: -- **[Upgraded Bootstrap (#470)][470]** to v5. For a list of Bootstrap breaking +- **[Upgraded Bootstrap ([#470][])** to v5. For a list of Bootstrap breaking changes, see the [Bootstrap migration guide][bsv5mig]. Other, Docsy-specific changes are listed below: - Clean up of unused, or rarely used, variables and functions: - Dropped `$primary-light`. - Dropped `color-diff()`. - BSv4 RTL support, being incompatible with BSv5, has been removed. For - progress in RTL support, see [#1442][1442]. - -[1442]: https://github.com/google/docsy/issues/1442 + progress in RTL support, see [#1442][]. + - Dropped the `bg-gradient-variant()` mixin. [#1369][]. **Other changes**: - Non-breaking changes that result from the Bootstrap v5 upgrade: - Draw.io diagram edit button: replace custom colors by BS's outline primary. -[470]: https://github.com/google/docsy/issues/470 +[#470]: https://github.com/google/docsy/issues/470 +[#1369]: https://github.com/google/docsy/issues/1369 +[#1442]: https://github.com/google/docsy/issues/1442 [bsv5mig]: https://getbootstrap.com/docs/5.2/migration/ ## [0.6.0][] diff --git a/assets/scss/_boxes.scss b/assets/scss/_boxes.scss index ac77a84fc0..562c77d5a5 100644 --- a/assets/scss/_boxes.scss +++ b/assets/scss/_boxes.scss @@ -1,8 +1,6 @@ -// Boxes on the home page and similar. -.td-box { -} +// Boxes on the home page and similar: .td-box -// box-variant creates the main style for a colored section used on the site. +// box-variant creates the main style for a colored section @mixin box-variant($parent, $color-name, $color-value) { $text-color: color-contrast($color-value); $link-color: mix($blue, $text-color, lightness($color-value)); @@ -38,22 +36,11 @@ $link-hover-color, false ); - - @if $enable-gradients { - @include bg-gradient-variant( - "#{$parent}--1#{$color-name}#{$parent}--gradient", - $color-value, - true - ); - } } // Common min-height modifiers used for boxes. @mixin td-box-height-modifiers($parent) { #{$parent} { - &--height-auto { - } - &--height-min { min-height: 300px; } diff --git a/assets/scss/support/_mixins.scss b/assets/scss/support/_mixins.scss index 333c6eaff3..0a0f79875a 100644 --- a/assets/scss/support/_mixins.scss +++ b/assets/scss/support/_mixins.scss @@ -1,12 +1,5 @@ // Some simple mixins. -@mixin bg-gradient-variant($parent, $color, $ignore-warning: false) { - #{$parent} { - background: $color - linear-gradient(180deg, mix($body-bg, $color, 15%), $color) repeat-x !important; - } -} - @mixin link-variant($parent, $color, $hover-color, $underline: false) { #{$parent} { color: $color; diff --git a/layouts/community/list.html b/layouts/community/list.html index 9cdcffc7f0..b00ea01bef 100644 --- a/layouts/community/list.html +++ b/layouts/community/list.html @@ -1,7 +1,7 @@ {{ define "main" -}} -
+

{{ T "community_join" . }}

diff --git a/layouts/partials/community_links.html b/layouts/partials/community_links.html index 298b10de82..690e19b539 100644 --- a/layouts/partials/community_links.html +++ b/layouts/partials/community_links.html @@ -1,6 +1,6 @@ {{ $links := .Site.Params.links -}} -
+

{{ T "community_learn" }}

{{ T "community_using" . }}

diff --git a/layouts/shortcodes/blocks/lead.html b/layouts/shortcodes/blocks/lead.html index 16e5da49e8..bae22630d6 100644 --- a/layouts/shortcodes/blocks/lead.html +++ b/layouts/shortcodes/blocks/lead.html @@ -1,16 +1,16 @@ -{{ $_hugo_config := `{ "version": 1 }` }} -{{ $col_id := .Get "color" | default .Ordinal }} -{{ $height := .Get "height" | default "auto" }} -{{/* Height can be one of: auto, min, med, max, full. */}} +{{ $_hugo_config := `{ "version": 1 }` -}} +{{ $col_id := .Get "color" | default .Ordinal -}} +{{ $height := .Get "height" | default "auto" -}} +{{/* Height can be one of: auto, min, med, max, full. */ -}} -
+
- {{ if eq .Page.File.Ext "md" }} - {{ .Inner | markdownify }} - {{ else }} - {{ .Inner | htmlUnescape | safeHTML }} - {{ end }} + {{ if eq .Page.File.Ext "md" -}} + {{ .Inner | markdownify -}} + {{ else -}} + {{ .Inner | htmlUnescape | safeHTML -}} + {{ end -}}
diff --git a/layouts/shortcodes/blocks/section.html b/layouts/shortcodes/blocks/section.html index 71fa7c3430..ed61e7e2a5 100644 --- a/layouts/shortcodes/blocks/section.html +++ b/layouts/shortcodes/blocks/section.html @@ -1,16 +1,16 @@ -{{ $_hugo_config := `{ "version": 1 }` }} -{{ $col_id := .Get "color" | default .Ordinal }} -{{ $height := .Get "height" | default "auto" }} -{{ $type := .Get "type" | default "" }} +{{ $_hugo_config := `{ "version": 1 }` -}} +{{ $col_id := .Get "color" | default .Ordinal -}} +{{ $height := .Get "height" | default "auto" -}} +{{ $type := .Get "type" | default "" -}} -
+
- {{ if eq .Page.File.Ext "md" }} - {{ .Inner | markdownify }} - {{ else }} - {{ .Inner | htmlUnescape | safeHTML }} - {{ end }} + {{ if eq .Page.File.Ext "md" -}} + {{ .Inner | markdownify -}} + {{ else -}} + {{ .Inner | htmlUnescape | safeHTML -}} + {{ end -}}
diff --git a/userguide/content/en/docs/adding-content/lookandfeel.md b/userguide/content/en/docs/adding-content/lookandfeel.md index ad04dd6cbb..fec0cd4e03 100644 --- a/userguide/content/en/docs/adding-content/lookandfeel.md +++ b/userguide/content/en/docs/adding-content/lookandfeel.md @@ -39,12 +39,9 @@ $primary: #390040; $secondary: #A23B72; ``` -The theme has features such as rounded corners and gradient backgrounds enabled by default. These can also be toggled in your project variables file: - -```scss -$enable-gradients: true; -$enable-shadows: true; -``` +The theme has features such as gradient backgrounds (`$enable-gradients`) and +shadows (`$enable-shadows`) enabled by default. These can also be toggled in +your project variables file by setting the variables to `false`. ## Fonts