diff options
Diffstat (limited to 'mediagoblin')
| -rw-r--r-- | mediagoblin/static/css/base.css | 14 | ||||
| l--------- | mediagoblin/static/js/extlib/html5shiv.js | 1 | ||||
| -rw-r--r-- | mediagoblin/templates/mediagoblin/base.html | 24 |
3 files changed, 21 insertions, 18 deletions
diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css index d8fc86bf..54de5a5b 100644 --- a/mediagoblin/static/css/base.css +++ b/mediagoblin/static/css/base.css @@ -84,13 +84,13 @@ input, textarea { /* website structure */ -.mediagoblin_body { +.container { margin: auto; width: 96%; - max-width: 960px; + max-width: 940px; } -.mediagoblin_header { +header { width: 100%; height: 36px; padding-top: 14px; @@ -98,17 +98,17 @@ input, textarea { border-bottom: 1px solid #333; } -.mediagoblin_header_right { +.header_right { float: right; } -a.mediagoblin_logo { +a.logo { color: #fff; font-weight: bold; margin-right: 8px; } -.mediagoblin_logo img { +.logo img { vertical-align: middle; } @@ -117,7 +117,7 @@ a.mediagoblin_logo { padding-bottom: 74px; } -.mediagoblin_footer { +footer { width: 100%; height: 30px; border-top: 1px solid #333; diff --git a/mediagoblin/static/js/extlib/html5shiv.js b/mediagoblin/static/js/extlib/html5shiv.js new file mode 120000 index 00000000..ca7358c7 --- /dev/null +++ b/mediagoblin/static/js/extlib/html5shiv.js @@ -0,0 +1 @@ +../../../../extlib/html5shiv/html5shiv.js
\ No newline at end of file diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html index f3912752..82ee41b7 100644 --- a/mediagoblin/templates/mediagoblin/base.html +++ b/mediagoblin/templates/mediagoblin/base.html @@ -29,22 +29,24 @@ href="{{ request.staticdirect('/css/video-js.css') }}"/> <link rel="shortcut icon" href="{{ request.staticdirect('/images/goblin.ico') }}" /> - <script type="text/javascript" - src="{{ request.staticdirect('/js/extlib/jquery.js') }}"></script> + <script src="{{ request.staticdirect('/js/extlib/jquery.js') }}"></script> + <!--[if lt IE 9]> + <script src="{{ request.staticdirect('/js/extlib/html5shiv.js') }}"></script> + <![endif]--> {% block mediagoblin_head %} {% endblock mediagoblin_head %} </head> <body> {% block mediagoblin_body %} - <div class="mediagoblin_body"> + <div class="container"> {% block mediagoblin_header %} - <div class="mediagoblin_header"> + <header> {% block mediagoblin_logo %} - <a class="mediagoblin_logo" + <a class="logo" href="{{ request.urlgen('index') }}" ><img src="{{ request.staticdirect('/images/logo.png') }}" alt="{% trans %}MediaGoblin logo{% endtrans %}" /></a> - {% endblock %} + {% endblock mediagoblin_logo %} {% if request.user and request.user.status == 'active' %} <a class="button_action" href="{{ request.urlgen('mediagoblin.submit.start') }}"> @@ -52,7 +54,7 @@ </a> {% endif %} {% block mediagoblin_header_title %}{% endblock %} - <div class="mediagoblin_header_right"> + <div class="header_right"> {% if request.user %} {# the following link should only appear when verification is needed #} {% if request.user.status == "needs_email_verification" %} @@ -72,7 +74,7 @@ {% trans %}Log in{% endtrans %}</a> {% endif %} </div> - </div> + </header> {% endblock %} <div class="mediagoblin_content"> {% include "mediagoblin/utils/messages.html" %} @@ -80,12 +82,12 @@ {% endblock mediagoblin_content %} </div> {% block mediagoblin_footer %} - <div class="mediagoblin_footer"> + <footer> {% trans -%} Powered by <a href="http://mediagoblin.org">MediaGoblin</a>, a <a href="http://gnu.org/">GNU</a> project {%- endtrans %} - </div> - {% endblock %} + </footer> + {% endblock mediagoblin_footer %} {% endblock mediagoblin_body %} </div> </body> |