Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin

mediagoblin/static/css/base.css

@@ -234,13 +234,14 @@ text-align: center;
   height: 0;
 }
 
-h3.sidedata {
-	border: none;
-	background-color: #212121;
-	border-radius: 4px 4px 0 0;
-	padding: 3px 8px;
-	margin: 20px 0 5px 0;
+.media_sidebar h3 {
 	font-size: 1em;
+	margin: 0 0 5px;
+	border: none;
+}
+
+.media_sidebar p {
+	padding-left: 8px;
 }
 
 /* forms */

mediagoblin/templates/mediagoblin/user_pages/media.html

@@ -172,7 +172,7 @@
   </div>
   <div class="media_sidebar">
     {% trans date=media.created.strftime("%Y-%m-%d") -%}
-      <h3 class="sidedata">Added on</h3>
+      <h3>Added on</h3>
       <p>{{ date }}</p>
     {%- endtrans %}
     {% if media.tags %}

mediagoblin/templates/mediagoblin/utils/exif.html

@@ -20,7 +20,7 @@
   {% if app_config['exif_visible']
         and media.media_data.exif is defined
         and media.media_data.exif.has_key('useful') %}
-    <h3 class="sidedata">EXIF</h3>
+    <h3>EXIF</h3>
     <table>
       {% for key, tag in media.media_data.exif.useful.items() %}
         <tr>

mediagoblin/templates/mediagoblin/utils/geolocation_map.html

@@ -22,7 +22,7 @@
         and media.media_data.gps_latitude
         and media.media_data.gps_longitude is defined
         and media.media_data.gps_longitude %}
-    <h3 class="sidedata">{% trans %}Location{% endtrans %}</h3>
+    <h3>{% trans %}Location{% endtrans %}</h3>
     <div>
       {%- set lon = media.media_data.gps_longitude %}
       {%- set lat = media.media_data.gps_latitude %}

mediagoblin/templates/mediagoblin/utils/license.html

@@ -17,7 +17,7 @@
 #}
 
 {% block license_content -%}
-  <h3 class="sidedata">{% trans %}License{% endtrans %}</h3>
+  <h3>{% trans %}License{% endtrans %}</h3>
   <p>
     {% if media.license %}
       <a href="{{ media.license }}">{{ media.get_license_data().abbreviation }}</a>

mediagoblin/templates/mediagoblin/utils/tags.html

@@ -17,7 +17,7 @@
 #}
 
 {% block tags_content -%}
-  <h3 class="sidedata">{% trans %}Tagged with{% endtrans %}</h3>
+  <h3>{% trans %}Tagged with{% endtrans %}</h3>
   <p>
     {% for tag in media.tags %}
       {% if loop.last %}