openstack
/
horizon
Code Issues Proposed changes

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
This commit is contained in:
Diana Whitten 2015-09-03 17:22:32 -07:00
parent fc1244708b
commit 39e75e2bab
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openstack_dashboard/themes/material/static/bootstrap/_styles.scss
View File

@ -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';

4
openstack_dashboard/themes/material/static/bootstrap/_variables.scss
View File

@ -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

2
requirements.txt
View File

@ -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