diff options
| -rw-r--r-- | mediagoblin/static/css/base.css | 13 | ||||
| -rw-r--r-- | mediagoblin/templates/mediagoblin/base.html | 66 |
2 files changed, 36 insertions, 43 deletions
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 @@ </head> <body> {% block mediagoblin_body %} - <div class="container"> {% block mediagoblin_header %} - <header> - {% block mediagoblin_logo %} - <a class="logo" - href="{{ request.urlgen('index') }}" - ><img src="{{ request.staticdirect('/images/logo.png') }}" - alt="{% trans %}MediaGoblin logo{% endtrans %}" /></a> - {% endblock mediagoblin_logo %} - {% if request.user and request.user.status == 'active' %} - <a class="button_action" - href="{{ request.urlgen('mediagoblin.submit.start') }}"> - {% trans %}Add media{% endtrans %} - </a> - {% endif %} - {% block mediagoblin_header_title %}{% endblock %} - <div class="header_right"> - {% if request.user %} - {# the following link should only appear when verification is needed #} - {% if request.user.status == "needs_email_verification" %} - <a href="{{ request.urlgen('mediagoblin.user_pages.user_home', - user=request.user.username) }}" - class="button_action_highlight"> - {% trans %}Verify your email!{% endtrans %}</a> - {% endif %} - + <header> + {% block mediagoblin_logo %} + <a class="logo" + href="{{ request.urlgen('index') }}" + ><img src="{{ request.staticdirect('/images/logo.png') }}" + alt="{% trans %}MediaGoblin logo{% endtrans %}" /></a> + {% endblock mediagoblin_logo %} + {% if request.user and request.user.status == 'active' %} + <a class="button_action" + href="{{ request.urlgen('mediagoblin.submit.start') }}"> + {% trans %}Add media{% endtrans %} + </a> + {% endif %} + {% block mediagoblin_header_title %}{% endblock %} + <div class="header_right"> + {% if request.user %} + {# the following link should only appear when verification is needed #} + {% if request.user.status == "needs_email_verification" %} <a href="{{ request.urlgen('mediagoblin.user_pages.user_home', - user= request.user.username) }}"> - {{ request.user.username }}</a> - - (<a href="{{ request.urlgen('mediagoblin.auth.logout') }}">{% trans %}log out{% endtrans %}</a>) - {% else %} - <a href="{{ request.urlgen('mediagoblin.auth.login') }}"> - {% trans %}Log in{% endtrans %}</a> + user=request.user.username) }}" + class="button_action_highlight"> + {% trans %}Verify your email!{% endtrans %}</a> {% endif %} - </div> - </header> + <a href="{{ request.urlgen('mediagoblin.user_pages.user_home', + user= request.user.username) }}"> + {{ request.user.username }}</a> + (<a href="{{ request.urlgen('mediagoblin.auth.logout') }}">{% trans %}log out{% endtrans %}</a>) + {% else %} + <a href="{{ request.urlgen('mediagoblin.auth.login') }}"> + {% trans %}Log in{% endtrans %}</a> + {% endif %} + </div> + </header> {% endblock %} + <div class="container"> <div class="mediagoblin_content"> {% include "mediagoblin/utils/messages.html" %} {% block mediagoblin_content %} |