Skip to content

Commit

Permalink
Merge pull request #202 from ralphbean/feature/configurable-bootstrap
Browse files Browse the repository at this point in the history
Make bootstrap css url configurable.
  • Loading branch information
jeremycline committed Jun 23, 2017
2 parents 6aeb7c1 + 1e3aeca commit 3bf2460
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 6 deletions.
16 changes: 11 additions & 5 deletions fmn/web/app.py
Original file line number Diff line number Diff line change
Expand Up @@ -229,11 +229,17 @@ def inject_variable():

fmn_version = get_distribution('fmn').version

return dict(openid=openid,
contexts=contexts,
valid_paths=valid_paths,
rule_types=rule_types,
fmn_version=fmn_version)
default = flask.url_for('static', filename='bootstrap/css/bootstrap.css')
theme_css_url = fedmsg_config.get('fmn.web.theme_css_url', default)

return dict(
openid=openid,
contexts=contexts,
valid_paths=valid_paths,
rule_types=rule_types,
fmn_version=fmn_version,
theme_css_url=theme_css_url,
)


@app.route('/_heartbeat')
Expand Down
2 changes: 1 addition & 1 deletion fmn/web/templates/master.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

<title>Fedora Notifications</title>

<link href="{{ url_for('static', filename='bootstrap/css/bootstrap.css') }}" rel="stylesheet" />
<link href="{{ theme_css_url }}" rel="stylesheet" />
<link href="{{ url_for('static', filename='css/text.css') }}" rel="stylesheet" />
<link href="{{ url_for('static', filename='css/navbar.css') }}" rel="stylesheet" />
<link href="{{ url_for('static', filename='css/footer.css') }}" rel="stylesheet" />
Expand Down

0 comments on commit 3bf2460

Please sign in to comment.