diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css index 909c9790..34be4f16 100644 --- a/mediagoblin/static/css/base.css +++ b/mediagoblin/static/css/base.css @@ -113,10 +113,10 @@ input, textarea { } header { - width: 100%; - padding-top: 14px; + width: 98%; + padding: 6px 1% 0; margin-bottom: 20px; - border-bottom: 1px solid #333; + background-color: #222; } .header_right { @@ -144,7 +144,7 @@ footer { height: 30px; border-top: 1px solid #333; bottom: 0px; - padding-top: 8px; + padding: 8px 0; text-align: center; font-size: 0.875em; clear: both; @@ -560,11 +560,6 @@ table.media_panel th { padding: 9px 14px; } - .header_right { - float: none; - display: inline-block; - } - header { text-align: center; } diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html index be81c27b..c2d5457d 100644 --- a/mediagoblin/templates/mediagoblin/base.html +++ b/mediagoblin/templates/mediagoblin/base.html @@ -36,44 +36,42 @@ {% block mediagoblin_body %} -
{% block mediagoblin_header %} -
- {% block mediagoblin_logo %} - - {% endblock mediagoblin_logo %} - {% if request.user and request.user.status == 'active' %} - - {% trans %}Add media{% endtrans %} - - {% endif %} - {% block mediagoblin_header_title %}{% endblock %} -
- {% if request.user %} - {# the following link should only appear when verification is needed #} - {% if request.user.status == "needs_email_verification" %} - - {% trans %}Verify your email!{% endtrans %} - {% endif %} - +
+ {% block mediagoblin_logo %} + + {% endblock mediagoblin_logo %} + {% if request.user and request.user.status == 'active' %} + + {% trans %}Add media{% endtrans %} + + {% endif %} + {% block mediagoblin_header_title %}{% endblock %} +
+ {% if request.user %} + {# the following link should only appear when verification is needed #} + {% if request.user.status == "needs_email_verification" %} - {{ request.user.username }} - - ({% trans %}log out{% endtrans %}) - {% else %} - - {% trans %}Log in{% endtrans %} + user=request.user.username) }}" + class="button_action_highlight"> + {% trans %}Verify your email!{% endtrans %} {% endif %} -
-
+ + {{ request.user.username }} + ({% trans %}log out{% endtrans %}) + {% else %} + + {% trans %}Log in{% endtrans %} + {% endif %} +
+
{% endblock %} +
{% include "mediagoblin/utils/messages.html" %} {% block mediagoblin_content %}