diff options
| -rw-r--r-- | mediagoblin/static/css/base.css | 17 | ||||
| -rw-r--r-- | mediagoblin/templates/mediagoblin/base.html | 6 |
2 files changed, 10 insertions, 13 deletions
diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css index 2ba17936..4ccebfe1 100644 --- a/mediagoblin/static/css/base.css +++ b/mediagoblin/static/css/base.css @@ -127,21 +127,16 @@ header { float: right; } -.header_right ul { - display: none; - position: absolute; - top: 42px; - right: 0px; - background: #252525; - padding: 20px; +.header_dropdown { + margin-bottom: 20px; } -.header_right li { +.header_dropdown li { list-style: none; } -.header_dropdown { - margin: 20px; +.dropdown_title { + font-size: 20px; } a.logo { @@ -151,7 +146,7 @@ a.logo { .logo img { vertical-align: middle; - margin: 6px 8px; + margin: 6px 8px 6px 0; } .mediagoblin_content { diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html index da5bd388..904a69d9 100644 --- a/mediagoblin/templates/mediagoblin/base.html +++ b/mediagoblin/templates/mediagoblin/base.html @@ -62,6 +62,7 @@ user=request.user.username) }}" class="button_action_highlight"> {% trans %}Verify your email!{% endtrans %}</a> + or <a href="{{ request.urlgen('mediagoblin.auth.logout') }}">{% trans %}log out{% endtrans %}</a> {% endif %} {% else %} <a href="{{ request.urlgen('mediagoblin.auth.login') }}"> @@ -71,8 +72,9 @@ <div class="clear"></div> {% if request.user and request.user.status == 'active' %} <div class="header_dropdown"> - <a href="{{ request.urlgen('mediagoblin.user_pages.user_home', user= request.user.username) }}">{{ request.user.username }}</a>{% trans %}'s account{% endtrans %} - (<a href="{{ request.urlgen('mediagoblin.auth.logout') }}">{% trans %}log out{% endtrans %}</a>) + <p><span class="dropdown_title"> + <a href="{{ request.urlgen('mediagoblin.user_pages.user_home', user= request.user.username) }}">{{ request.user.username }}</a>{% trans %}'s account{% endtrans %}</span> + (<a href="{{ request.urlgen('mediagoblin.auth.logout') }}">{% trans %}log out{% endtrans %}</a>)</p> <ul> <li><a class="button_action" href="{{ request.urlgen('mediagoblin.submit.start') }}"> {%- trans %}Add media{% endtrans -%} |