heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

debone and redo the header

Browse Source
This commit is contained in:
jpope 2014-01-07 01:05:01 -06:00
parent ff9b6b51b0
commit a5ac282c9b
2 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
mediagoblin/static/css/base.css
View File

@ -78,6 +78,11 @@ a.highlight {
color: #fff; color: #fff;
} }
.header_right a {
text-decoration: none;
color: #fff;
}
em { em {
font-style: italic; font-style: italic;
} }
@ -112,10 +117,19 @@ header {
border-bottom: 1px solid #333; border-bottom: 1px solid #333;
} }
.header_left {
width: 47%;
margin: 0 0 0 8px;
display: inline-block;
}
.header_right { .header_right {
margin: 8px; width: 47%;
margin: 8px 8px 4px 0;
display: inline-block; display: inline-block;
float: right; float: right;
text-align: right;
line-height: 1.6em;
} }
.header_dropdown { .header_dropdown {
@ -801,22 +815,9 @@ pre {
} }
.button_action, .button_action_highlight, .button_form { .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 */ /* desktop resolutions */
@media screen and (min-width: 960px) { @media screen and (min-width: 960px) {
@ -858,7 +859,7 @@ pre {
} }
.header_right { .header_right {
float: none; text-align: center;
} }
} }

8
mediagoblin/templates/mediagoblin/base.html
View File

@ -66,11 +66,10 @@
<div class="container"> <div class="container">
<header> <header>
<div class="row hell"> <div class="row hell">
<div class="eight columns alpha omega"> <div class="header_left">
{%- include "mediagoblin/bits/logo.html" -%} {%- include "mediagoblin/bits/logo.html" -%}
{% block mediagoblin_header_title %}{% endblock %} {% block mediagoblin_header_title %}{% endblock %}
</div> </div>
<div class="eight columns alpha omega pull-right">
<div class="header_right"> <div class="header_right">
{%- if request.user %} {%- if request.user %}
{% if request.user and {% if request.user and
@ -118,7 +117,6 @@
</a> </a>
{%- endif %} {%- endif %}
</div> </div>
</div><!--end eight columns pull-right-->
<div class="clear"></div> <div class="clear"></div>
{% if request.user and request.user.has_privilege('active') %} {% if request.user and request.user.has_privilege('active') %}
<div class="header_dropdown"> <div class="header_dropdown">