Merge remote-tracking branch 'upstream/skeletongobblin' into skeleton

mediagoblin/static/css/base.css

@@ -205,13 +205,15 @@ footer {
 }
 
 .media_pane {
-  border-bottom: 1px solid #333333;
+/* in place for possible future wide view */
+/*  border-bottom: 1px solid #333333;*/
 }
 
 .media_sidebar {
-  border-left: 1px solid #333333;
-  padding-left: 1em;
-  padding-top: 1em;
+/* in place for possible future wide view */
+/*  border-left: 1px solid #333333;*/
+/*  padding-left: 1em;*/
+/*  padding-top: 1em;*/
 }
 
 .media_comments {
@@ -329,11 +331,11 @@ text-align: center;
   margin-right:0;
 }
 
-.heaven {
+.head {
   margin-top:0;
 }
 
-.hell {
+.foot {
   margin-bottom:0;
 }
 

mediagoblin/templates/mediagoblin/base.html

@@ -65,7 +65,7 @@
       {% block mediagoblin_header %}
         <div class="container">
           <header>
-            <div class="row hell">
+            <div class="row foot">
             <div class="header_left">
               {%- include "mediagoblin/bits/logo.html" -%}
               {% block mediagoblin_header_title %}{% endblock %}

mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html

@@ -19,7 +19,7 @@
 {% if request.user %}
     <h1>{% trans %}Explore{% endtrans %}</h1>
   {% else %}
-    <div class="row hell">
+    <div class="row foot">
       <div class="eleven columns">
         <h1>{% trans %}Hi there, welcome to this MediaGoblin site!{% endtrans %}</h1>
         <p>{% trans %}This site is running <a href="http://mediagoblin.org">MediaGoblin</a>, an extraordinarily great piece of media hosting software.{% endtrans %}</p>

mediagoblin/templates/mediagoblin/moderation/user.html

@@ -160,7 +160,7 @@
         </p>
       </div>
     </div>
-    <div class="row hell">
+    <div class="row foot">
     <h2>{% trans username=user.username -%}
           {{ username }}'s Privileges{% endtrans %}</h2>
     <div class="six columns">

mediagoblin/templates/mediagoblin/user_pages/media.html

@@ -33,7 +33,7 @@
   {% template_hook("media_head") %}
 {% endblock mediagoblin_head %}
 {% block mediagoblin_content %}
-<div class="row hell">
+<div class="row foot">
   <p class="eleven columns context">
     {%- trans user_url=request.urlgen(
               'mediagoblin.user_pages.user_home',
@@ -46,7 +46,7 @@
     {% include "mediagoblin/utils/prev_next.html" %}
   </div>
 </div>
-  <div class="media_pane sixteen columns">
+  <div class="media_pane eleven columns">
     <div class="media_image_container">
       {% block mediagoblin_media %}
         {% set display_media = request.app.public_store.file_url(
@@ -70,7 +70,7 @@
         {% endif %}
       {% endblock %}
     </div>
-    <div class="row heaven hell">
+    <div class="row head foot">
     <h2 class="media_title">
       {{ media.title }}
     </h2>
@@ -92,9 +92,6 @@
       <p>{{ media.description_html }}</p>
     {% endautoescape %}
     </div>
-    </div>
-
-    <div class="eleven columns omega">
     {% if comments and request.user and request.user.has_privilege('commenter') %}
     <div class="media_comments">
       {% if app_config['allow_comments'] %}
@@ -174,9 +171,11 @@
       <div class="empty_space no_background">
     {% endif %}
   </div>
-  </div>
 
-  <div class="five columns alpha media_sidebar">
+    </div>
+
+
+  <div class="five columns media_sidebar">
     <h3>{% trans %}Added{% endtrans %}</h3>
     <p><span title="{{ media.created.strftime("%I:%M%p %Y-%m-%d") }}">
         {%- trans formatted_time=timesince(media.created) -%}