diff --git a/CHANGELOG.md b/CHANGELOG.md index 179b6c938a..5c642c4b43 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 diff --git a/assets/scss/_variables.scss b/assets/scss/_variables.scss index 0dd43d8e2a..5fdd86c76e 100644 --- a/assets/scss/_variables.scss +++ b/assets/scss/_variables.scss @@ -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-) diff --git a/assets/scss/main.scss b/assets/scss/main.scss index 1944856a49..3e81ecca2d 100644 --- a/assets/scss/main.scss +++ b/assets/scss/main.scss @@ -1,6 +1,5 @@ @import "../vendor/bootstrap/scss/functions"; -@import "support/functions"; @import "_variables_forward"; @import "variables_project"; @import "variables"; diff --git a/assets/scss/support/_functions.scss b/assets/scss/support/_functions.scss deleted file mode 100644 index e0d0b6b87f..0000000000 --- a/assets/scss/support/_functions.scss +++ /dev/null @@ -1,5 +0,0 @@ -// Common functions. - -@function prepend($list, $value) { - @return join($value, $list); -}