diff --git a/homepage/theme/static/css/style.css b/homepage/theme/static/css/style.css index 49442d9..27e7e95 100644 --- a/homepage/theme/static/css/style.css +++ b/homepage/theme/static/css/style.css @@ -406,14 +406,13 @@ MENU .nav-bar { height: 70px; } -.brand, -.brand-index { +.brand { position: absolute; padding: 12px 0 0 20px; float: left; line-height: 70px; } -.brand-index { +body.index .brand { opacity: 0; } .nav-container { diff --git a/homepage/theme/static/scripts/fade.js b/homepage/theme/static/scripts/fade.js index d00999b..f4710a9 100644 --- a/homepage/theme/static/scripts/fade.js +++ b/homepage/theme/static/scripts/fade.js @@ -2,7 +2,7 @@ $(document).ready(function () { $(window).scroll(function () { var scrollProgress = parseInt($(window).scrollTop(), 10) - $('.brand-index').css('opacity', Math.min(scrollProgress / 100, 1)) + $('body.index .brand').css('opacity', Math.min(scrollProgress / 100, 1)) }) }) })(window.jQuery) diff --git a/homepage/theme/templates/auditorium.html b/homepage/theme/templates/auditorium.html index ce81a54..1462aa3 100644 --- a/homepage/theme/templates/auditorium.html +++ b/homepage/theme/templates/auditorium.html @@ -1,11 +1,5 @@ {% extends "base.html" %} -{% block brand %} -
- {{ super() }} -
-{% endblock %} - {% block content %}
diff --git a/homepage/theme/templates/base.html b/homepage/theme/templates/base.html index 4f06d91..a4f9247 100644 --- a/homepage/theme/templates/base.html +++ b/homepage/theme/templates/base.html @@ -26,13 +26,13 @@ {% endif %} - +
- {% block brand %} +
- {% endblock %} +