From 39e75e2babbb0d1910c9d8b5d3ad8d60ff74f68c Mon Sep 17 00:00:00 2001 From: Diana Whitten Date: Thu, 3 Sep 2015 17:22:32 -0700 Subject: [PATCH] Upgrade to Bootswatch 3.3.5.3 Bootswatch 3.3.5.2 is trying to load external assets from googleapis.com Bootswatch 3.3.5.3 makes this variable configurable, so we should update and take advantage of this configuration. Change-Id: Ib0a61af9568c44ec15aa4bd8bb85bc5699ddc05b Closes-Bug: #1492070 --- .../themes/material/static/bootstrap/_styles.scss | 2 -- .../themes/material/static/bootstrap/_variables.scss | 4 ++++ requirements.txt | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/openstack_dashboard/themes/material/static/bootstrap/_styles.scss b/openstack_dashboard/themes/material/static/bootstrap/_styles.scss index 635cd7408e..be4ebf80f3 100644 --- a/openstack_dashboard/themes/material/static/bootstrap/_styles.scss +++ b/openstack_dashboard/themes/material/static/bootstrap/_styles.scss @@ -3,6 +3,4 @@ // ----------------------------------------------------- @import '/bootstrap/scss/bootstrap/mixins/vendor-prefixes'; @import '/horizon/lib/bootswatch/paper/bootswatch'; - -$roboto-font-path: $static_url + '/horizon/lib/roboto_fontface/fonts'; @import '/horizon/lib/roboto_fontface/css/roboto-fontface.scss'; diff --git a/openstack_dashboard/themes/material/static/bootstrap/_variables.scss b/openstack_dashboard/themes/material/static/bootstrap/_variables.scss index 891bac6d13..6c5d143d44 100644 --- a/openstack_dashboard/themes/material/static/bootstrap/_variables.scss +++ b/openstack_dashboard/themes/material/static/bootstrap/_variables.scss @@ -1,3 +1,7 @@ +// Override the web font path ... we want to set this ourselves +$web-font-path: '-'; +$roboto-font-path: $static_url + '/horizon/lib/roboto_fontface/fonts'; + @import 'variable_customizations'; // Bootswatch Paper diff --git a/requirements.txt b/requirements.txt index 3bd677c698..f2a90be96b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -48,7 +48,7 @@ XStatic-Angular-Gettext>=2.1.0.2 # MIT License XStatic-Angular-lrdragndrop>=1.0.2.2 # MIT License XStatic-Bootstrap-Datepicker>=1.3.1.0 # Apache 2.0 License XStatic-Bootstrap-SCSS>=3 # Apache 2.0 License -XStatic-bootswatch>=3.3.5.2 # MIT License +XStatic-bootswatch>=3.3.5.3 # MIT License XStatic-D3>=3.1.6.2 # BSD License (3 clause) XStatic-Hogan>=2.0.0.2 # Apache 2.0 License XStatic-Font-Awesome>=4.3.0 # SIL OFL 1.1 License, MIT License