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

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 {
@@ -349,7 +363,7 @@ text-align: center;
   border-top: 6px dashed #D49086
 }
 
-.form_field_input input, .form_field_input textarea {
+/*.form_field_input input,*/ .form_field_input textarea {
   width: 100%;
 }
 
@@ -801,26 +815,13 @@ 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) {
-  .container .three.columns { /* this needs to be more specific - inplace for the gallery... */
+  .container .three.columns.media_thumbnail {
     width:180px;
     margin-left:3px;
     margin-right:3px;
@@ -828,7 +829,7 @@ pre {
 }
 /* Tablet Portrait size to standard 960 (devices and browsers) */
 @media only screen and (min-width: 768px) and (max-width: 959px) {
-  .container .three.columns { /* this needs to be more specific - inplace for the gallery... */
+  .container .three.columns.media_thumbnail {
     width:147px;
     margin-left:2px;
     margin-right:2px;
@@ -858,7 +859,7 @@ pre {
   }
 
   .header_right {
-    float: none;
+    text-align: center;
   }
 }
 

mediagoblin/templates/mediagoblin/base.html

@@ -66,11 +66,10 @@
         <div class="container">
           <header>
             <div class="row hell">
-            <div class="eight columns alpha omega">
+            <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">

mediagoblin/templates/mediagoblin/moderation/report.html

@@ -26,10 +26,12 @@
 {% if not report %}
   {% trans %}Sorry, no such report found.{% endtrans %}
 {% else %}
+  <div class="row">
     <a href="{{ request.urlgen('mediagoblin.moderation.reports') }}"
        class="return_to_panel button_action"
        title="Return to Reports Panel">
       {% trans %}Return to Reports Panel{% endtrans %}</a>
+  </div>
   <h2>{% trans %}Report{% endtrans %} #{{ report.id }}</h2>
   {% if report.is_comment_report() and report.comment %}
 
@@ -66,7 +68,7 @@
   {% elif report.is_media_entry_report() and report.media_entry %}
 
     {% set media_entry = report.media_entry %}
-    <div class="media_thumbnail">
+    <div class="three columns media_thumbnail">
       <a href="{{ request.urlgen('mediagoblin.user_pages.media_home',
                             user=media_entry.get_uploader.username,
                             media=media_entry.slug_or_id) }}">