openstack/horizon
Code Issues Proposed changes

Merge "Add Font Awesome icons"

Browse Source
This commit is contained in:
Jenkins
2014-09-02 22:24:32 +00:00
committed by Gerrit Code Review
parent 6d8a59bec3 f7cc64bb0f
commit 93f81b4811
4 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
horizon/test/settings.py
View File

@@ -27,6 +27,7 @@ import xstatic.pkg.angular
import xstatic.pkg.angular_cookies
import xstatic.pkg.angular_mock
import xstatic.pkg.d3
import xstatic.pkg.font_awesome
import xstatic.pkg.hogan
import xstatic.pkg.jasmine
import xstatic.pkg.jquery
@@ -162,6 +163,8 @@ STATICFILES_DIRS = (
xstatic.main.XStatic(xstatic.pkg.d3).base_dir),
('horizon/lib',
xstatic.main.XStatic(xstatic.pkg.hogan).base_dir),
('horizon/lib/font-awesome',
xstatic.main.XStatic(xstatic.pkg.font_awesome).base_dir),
('horizon/lib/jasmine-1.3.1',
xstatic.main.XStatic(xstatic.pkg.jasmine).base_dir),
('horizon/lib/jquery',

3
openstack_dashboard/settings.py
View File

@@ -27,6 +27,7 @@ import xstatic.pkg.angular
import xstatic.pkg.angular_cookies
import xstatic.pkg.angular_mock
import xstatic.pkg.d3
import xstatic.pkg.font_awesome
import xstatic.pkg.hogan
import xstatic.pkg.jasmine
import xstatic.pkg.jquery
@@ -159,6 +160,8 @@ STATICFILES_DIRS = (
xstatic.main.XStatic(xstatic.pkg.d3).base_dir),
('horizon/lib',
xstatic.main.XStatic(xstatic.pkg.hogan).base_dir),
('horizon/lib/font-awesome',
xstatic.main.XStatic(xstatic.pkg.font_awesome).base_dir),
('horizon/lib/jasmine-1.3.1',
xstatic.main.XStatic(xstatic.pkg.jasmine).base_dir),
('horizon/lib/jquery',

1
openstack_dashboard/templates/_stylesheets.html
View File

@@ -5,6 +5,7 @@
<link href='{{ STATIC_URL }}dashboard/css/rickshaw.css' type='text/css' media='screen' rel='stylesheet' />
<link href='{{ STATIC_URL }}dashboard/scss/horizon_charts.scss' type='text/scss' media='screen' rel='stylesheet' />
<link href='{{ STATIC_URL }}dashboard/scss/horizon_workflow.scss' type='text/scss' media='screen' rel='stylesheet' />
<link href="{{ STATIC_URL }}horizon/lib/font-awesome/scss/font-awesome.scss" type="text/scss" media="screen" rel="stylesheet" />
{% endcompress %}
<link rel="shortcut icon" href="{{ STATIC_URL }}dashboard/img/favicon.ico"/>

1
requirements.txt
View File

@@ -37,6 +37,7 @@ xstatic-angular-cookies>=1.2.1.1 # MIT License
xstatic-angular-mock>=1.2.1.1 # 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.1.0 # SIL OFL 1.1 License, MIT License
xstatic-jasmine>=1.3.1.1 # MIT License
xstatic-jquery>=1.7.2 # MIT License
xstatic-jquery-migrate>=1.2.1.1 # MIT License