diff --git a/static/styles/_header.scss b/static/styles/_header.scss new file mode 100644 index 000000000..e5fa310a3 --- /dev/null +++ b/static/styles/_header.scss @@ -0,0 +1,10 @@ + +$logo-height: 0.8 * $navbar-height; +$logo-margin: ($navbar-height - $logo-height) / 2; + +.logo img { + width: $logo-height; + height: $logo-height; + margin: $logo-margin $navbar-padding-horizontal; +} + diff --git a/static/styles/app.scss b/static/styles/app.scss index cbd46a7af..a36f11de7 100644 --- a/static/styles/app.scss +++ b/static/styles/app.scss @@ -1 +1,3 @@ @import "bootstrap"; +@import "header"; + diff --git a/templates/base.html b/templates/base.html index 9c84d5c98..e43dd814a 100644 --- a/templates/base.html +++ b/templates/base.html @@ -15,17 +15,11 @@ {# Styles #} - - {# Scripts #} {# modernizr must be in head (see http://modernizr.com/docs/#installing) #} - - - - {% endblock %} @@ -34,49 +28,53 @@
- {# Navigation #} {% block navigation %} -
+ {% endblock navigation %} {# Header #} @@ -215,19 +218,15 @@ {% block foot_js %} - - - - + + + + + - - - {% block extra_js %} - {% endblock %} + {% block extra_js %}{% endblock %} {% endblock foot_js %}