From d6b55274984cacefbb98539b593036536ab8c269 Mon Sep 17 00:00:00 2001 From: Diana Whitten Date: Fri, 14 Aug 2015 20:54:34 -0700 Subject: [PATCH] Webroot Theme is no longer needed Because the $static_url scss variable is now available through the scss namespace by default via the settings.py value for STATIC_URL, it is no longer necessary to have an example theme on how to set this manually. Change-Id: I39ddfbd8e574768202233cfff09c8699486b3c01 Closes-Bug: #1478794 --- doc/source/topics/settings.rst | 4 ---- openstack_dashboard/themes/webroot/_styles.scss | 1 - openstack_dashboard/themes/webroot/_variables.scss | 5 ----- .../removal-of-webroot-theme-108db1d2f11da449.yaml | 11 +++++++++++ 4 files changed, 11 insertions(+), 10 deletions(-) delete mode 100644 openstack_dashboard/themes/webroot/_styles.scss delete mode 100644 openstack_dashboard/themes/webroot/_variables.scss create mode 100644 releasenotes/notes/removal-of-webroot-theme-108db1d2f11da449.yaml diff --git a/doc/source/topics/settings.rst b/doc/source/topics/settings.rst index f449854df0..05e6810469 100644 --- a/doc/source/topics/settings.rst +++ b/doc/source/topics/settings.rst @@ -1284,13 +1284,9 @@ This value is also available in the scss namespace with the variable name $static_url. Make sure you run ``python manage.py collectstatic`` and ``python manage.py compress`` after any changes to this value in settings.py. -For your convenience, a custom theme for only setting the static url has been -provided see: ``"/horizon/openstack_dashboard/themes/webroot"`` - For more information see: https://docs.djangoproject.com/en/1.7/ref/settings/#static-url - ``DISALLOW_IFRAME_EMBED`` ------------------------- diff --git a/openstack_dashboard/themes/webroot/_styles.scss b/openstack_dashboard/themes/webroot/_styles.scss deleted file mode 100644 index 504aff16ed..0000000000 --- a/openstack_dashboard/themes/webroot/_styles.scss +++ /dev/null @@ -1 +0,0 @@ -@import "../themes/default/styles"; \ No newline at end of file diff --git a/openstack_dashboard/themes/webroot/_variables.scss b/openstack_dashboard/themes/webroot/_variables.scss deleted file mode 100644 index e4edb9157e..0000000000 --- a/openstack_dashboard/themes/webroot/_variables.scss +++ /dev/null @@ -1,5 +0,0 @@ -/* This variable changes the web root of horizon to /dashboard rather -than the default '/' */ -$static_url: "/dashboard/static/"; - -@import "../themes/default/variables"; \ No newline at end of file diff --git a/releasenotes/notes/removal-of-webroot-theme-108db1d2f11da449.yaml b/releasenotes/notes/removal-of-webroot-theme-108db1d2f11da449.yaml new file mode 100644 index 0000000000..ab0315ebc9 --- /dev/null +++ b/releasenotes/notes/removal-of-webroot-theme-108db1d2f11da449.yaml @@ -0,0 +1,11 @@ +--- +deprecations: + - The 'webroot' theme has been removed. + +fixes: + - The 'webroot' theme was providing an example of + how to set the webroot value through SCSS for + accessing needed static URL prefixes for assets + like font paths. This value is now retrieved + directly from the Django settings and is available + directly in the SCSS namespace via $static_url.