diff options
| -rw-r--r-- | mediagoblin/static/css/base.css | 35 | ||||
| -rw-r--r-- | mediagoblin/templates/mediagoblin/base.html | 8 |
2 files changed, 21 insertions, 22 deletions
diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css index a3f4bf0e..950954cb 100644 --- a/mediagoblin/static/css/base.css +++ b/mediagoblin/static/css/base.css @@ -78,6 +78,11 @@ a.highlight { color: #fff; } +.header_right a { + text-decoration: none; + color: #fff; +} + em { font-style: italic; } @@ -112,10 +117,19 @@ header { border-bottom: 1px solid #333; } +.header_left { + width: 47%; + margin: 0 0 0 8px; + display: inline-block; +} + .header_right { - margin: 8px; + width: 47%; + margin: 8px 8px 4px 0; display: inline-block; float: right; + text-align: right; + line-height: 1.6em; } .header_dropdown { @@ -801,22 +815,9 @@ pre { } .button_action, .button_action_highlight, .button_form { - padding: 9px 14px; + padding: 5px 14px; } - - header { -/* text-align: center;*/ - } - - .header_right { -/* margin-right: 2%;*/ -/* float: none;*/ - } - - a.logo { -/* margin-left: 2%;*/ - } - + } /* desktop resolutions */ @media screen and (min-width: 960px) { @@ -858,7 +859,7 @@ pre { } .header_right { - float: none; + text-align: center; } } diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html index e430cfca..f60d5f10 100644 --- a/mediagoblin/templates/mediagoblin/base.html +++ b/mediagoblin/templates/mediagoblin/base.html @@ -66,11 +66,10 @@ <div class="container"> <header> <div class="row hell"> - <div class="eight columns alpha omega"> - {%- include "mediagoblin/bits/logo.html" -%} - {% block mediagoblin_header_title %}{% endblock %} + <div class="header_left"> + {%- include "mediagoblin/bits/logo.html" -%} + {% block mediagoblin_header_title %}{% endblock %} </div> - <div class="eight columns alpha omega pull-right"> <div class="header_right"> {%- if request.user %} {% if request.user and @@ -118,7 +117,6 @@ </a> {%- endif %} </div> - </div><!--end eight columns pull-right--> <div class="clear"></div> {% if request.user and request.user.has_privilege('active') %} <div class="header_dropdown"> |