Link to remote CSS to fix bootstrap and fontawesome issues introduced by browserify work.
Update the vagrant playbook to work with new playbook defaults.
This commit is contained in:
parent
088a060f3f
commit
7aae77767e
|
@ -53,13 +53,7 @@ def register_asset_bundles_with_app(web_app):
|
||||||
asset_env.config['browserify_extra_args'] = ['--debug']
|
asset_env.config['browserify_extra_args'] = ['--debug']
|
||||||
asset_env.config['browserify_transforms'] = ['coffee-reactify']
|
asset_env.config['browserify_transforms'] = ['coffee-reactify']
|
||||||
|
|
||||||
node_modules_path = os.path.normpath(os.path.join(web_app.root_path, os.pardir, 'node_modules'))
|
|
||||||
|
|
||||||
bundled_css = assets.Bundle(
|
bundled_css = assets.Bundle(
|
||||||
assets.Bundle(
|
|
||||||
node_modules_path + '/bootstrap/dist/css/bootstrap.css',
|
|
||||||
node_modules_path + '/font-awesome/css/font-awesome.css',
|
|
||||||
),
|
|
||||||
'css/*.less',
|
'css/*.less',
|
||||||
filters='less',
|
filters='less',
|
||||||
output='css/rookeries-bundle.css'
|
output='css/rookeries-bundle.css'
|
||||||
|
@ -71,6 +65,7 @@ def register_asset_bundles_with_app(web_app):
|
||||||
output='scripts/rookeries-bundle.js',
|
output='scripts/rookeries-bundle.js',
|
||||||
)
|
)
|
||||||
|
|
||||||
|
# TODO - Figure out nicer way to bundle normally remote assets with option to use CDNs for production.
|
||||||
openfonts_base_uri = 'http://openfontlibrary.org/face/'
|
openfonts_base_uri = 'http://openfontlibrary.org/face/'
|
||||||
remote_webfonts = assets.Bundle(
|
remote_webfonts = assets.Bundle(
|
||||||
openfonts_base_uri + 'lavoir',
|
openfonts_base_uri + 'lavoir',
|
||||||
|
@ -78,6 +73,12 @@ def register_asset_bundles_with_app(web_app):
|
||||||
openfonts_base_uri + 'consolamono',
|
openfonts_base_uri + 'consolamono',
|
||||||
)
|
)
|
||||||
|
|
||||||
|
remote_css = assets.Bundle(
|
||||||
|
'https://maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css',
|
||||||
|
'https://maxcdn.bootstrapcdn.com/bootstrap/3.3.4/css/bootstrap.min.css',
|
||||||
|
)
|
||||||
|
|
||||||
asset_env.register('bundled_css', bundled_css)
|
asset_env.register('bundled_css', bundled_css)
|
||||||
asset_env.register('bundled_js', bundled_js)
|
asset_env.register('bundled_js', bundled_js)
|
||||||
|
asset_env.register('vendor_css', remote_css)
|
||||||
asset_env.register('vendor_webfonts', remote_webfonts)
|
asset_env.register('vendor_webfonts', remote_webfonts)
|
||||||
|
|
|
@ -10,4 +10,7 @@
|
||||||
{# TODO Develop automate manner to cache web fonts. #}
|
{# TODO Develop automate manner to cache web fonts. #}
|
||||||
{% assets 'vendor_webfonts' %}
|
{% assets 'vendor_webfonts' %}
|
||||||
<link rel="stylesheet" type="text/css" media="screen" href="{{ ASSET_URL }}"/>
|
<link rel="stylesheet" type="text/css" media="screen" href="{{ ASSET_URL }}"/>
|
||||||
{% endassets %}
|
{% endassets %}
|
||||||
|
{% assets 'vendor_css' %}
|
||||||
|
<link rel="stylesheet" type="text/css" media="screen" href="{{ ASSET_URL }}"/>
|
||||||
|
{% endassets %}
|
||||||
|
|
|
@ -24,4 +24,8 @@
|
||||||
rookeries_mail_use_tls: false
|
rookeries_mail_use_tls: false
|
||||||
rookeries_mail_use_ssl: false
|
rookeries_mail_use_ssl: false
|
||||||
roles:
|
roles:
|
||||||
- { role: ansible-rookeries, rookeries_app_config: "{{ vagrant_rookeries_app_config }}" }
|
- {
|
||||||
|
role: ansible-rookeries,
|
||||||
|
rookeries_app_config: "{{ vagrant_rookeries_app_config }}",
|
||||||
|
rookeries_package_path: "../../{{ rookeries_package }}"
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in New Issue