summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2020-04-27 16:06:04 +0000
committerGerrit Code Review <review@openstack.org>2020-04-27 16:06:04 +0000
commit6b32ff44ea88772a2b9b668e6efa9181058c2f02 (patch)
tree57fedba6825675d2f7ed9824cfca164268c0fbb4
parent5b9655153ba05d095a455b24a6de6382a43941ca (diff)
parentd4028b97db87f54ba2c43268b5adccfa497ed594 (diff)
downloadhorizon-6b32ff44ea88772a2b9b668e6efa9181058c2f02.tar.gz
Merge "Implement 'selector-append' sass function" into stable/stein15.3.0
-rw-r--r--openstack_dashboard/themes/material/static/horizon/_styles.scss9
-rw-r--r--releasenotes/notes/pyscss-and-setuptools-7634dcee9d62bde9.yaml12
2 files changed, 13 insertions, 8 deletions
diff --git a/openstack_dashboard/themes/material/static/horizon/_styles.scss b/openstack_dashboard/themes/material/static/horizon/_styles.scss
index 047af9943..8b0775727 100644
--- a/openstack_dashboard/themes/material/static/horizon/_styles.scss
+++ b/openstack_dashboard/themes/material/static/horizon/_styles.scss
@@ -1,3 +1,12 @@
+// NOTE(e0ne): it's temporary workaround to until specified function will
+// be supported by pyScss. We need to define this function before any MDI
+// usage.
+@if not function-exists("selector-append") {
+ @function selector-append($selector, $to-append) {
+ @return append-selector($selector, $to-append);
+ }
+}
+
@import "animations";
@import "icons";
@import "components/checkboxes";
diff --git a/releasenotes/notes/pyscss-and-setuptools-7634dcee9d62bde9.yaml b/releasenotes/notes/pyscss-and-setuptools-7634dcee9d62bde9.yaml
index cdf8a2a0c..ed0b35118 100644
--- a/releasenotes/notes/pyscss-and-setuptools-7634dcee9d62bde9.yaml
+++ b/releasenotes/notes/pyscss-and-setuptools-7634dcee9d62bde9.yaml
@@ -1,13 +1,9 @@
---
-issues:
- - |
- The material design theme is now broken with pyScss 1.3.7
- (also see the upgrade notice section).
- If you really depends on the material design theme, keep using
- pyScss 1.3.4 with setuptools<45 (while the horizon dependencies list
- says pyScss>=1.3.7 is required).
- The issue is tracked via [:bug:`1771559`].
upgrade:
- |
pyScss 1.3.7 is now required due to the incompatibility that
pyScss 1.3.4 used before in horizon does not work with setuptools 46.
+ - |
+ Along with the upgrade of pyScss to 1.3.7, a workaround for the
+ material design theme is added to make it work properly.
+ See [:bug:`1771559`] for detail.