Skip to content

Commit

Permalink
Use SCSS join() rather than prepend() (#1736)
Browse files Browse the repository at this point in the history
  • Loading branch information
chalin committed Nov 13, 2023
1 parent 889cd68 commit e6c28d3
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 7 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,15 @@ For the full list of changes, see the [release][0.8.0] notes.

**Breaking changes**:

- SCSS: `@function prepend()` and file `assets/scss/support/_functions.scss`
have been dropped. Instead use the more general SASS/SCSS list `join()`
function ([#1385]).

**New**:

**Other changes**:

[#1385]: https://github.com/google/docsy/issues/1385
[0.8.0]: https://github.com/google/docsy/releases/v0.8.0/#FIXME

## 0.7.2
Expand Down
2 changes: 1 addition & 1 deletion assets/scss/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ $td-fonts-serif: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto,
"Segoe UI Symbol";

@if $td-enable-google-fonts {
$td-fonts-serif: prepend($td-fonts-serif, "#{$google_font_name}");
$td-fonts-serif: join("#{$google_font_name}", $td-fonts-serif);
}

$font-family-sans-serif: $td-fonts-serif !default; // TODO: consider moving into UG SCSS or namespace the var (td-)
Expand Down
1 change: 0 additions & 1 deletion assets/scss/main.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
@import "../vendor/bootstrap/scss/functions";

@import "support/functions";
@import "_variables_forward";
@import "variables_project";
@import "variables";
Expand Down
5 changes: 0 additions & 5 deletions assets/scss/support/_functions.scss

This file was deleted.

0 comments on commit e6c28d3

Please sign in to comment.