diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2012-03-17 17:09:26 -0500 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2012-03-17 17:09:26 -0500 |
| commit | 2011f2d89eebd56a5b141ccedb0968b018459bc1 (patch) | |
| tree | 300ae9a0c75fdba3cadcf1438b01ca8b91143603 | |
| parent | 9e55431143e48d0ee923e5b6904f450ccf3ca903 (diff) | |
| parent | 327a1bb2794c98127460e74658e03b37acb0efd6 (diff) | |
| download | mediagoblin-2011f2d89eebd56a5b141ccedb0968b018459bc1.tar.lz mediagoblin-2011f2d89eebd56a5b141ccedb0968b018459bc1.tar.xz mediagoblin-2011f2d89eebd56a5b141ccedb0968b018459bc1.zip | |
Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
6 files changed, 12 insertions, 11 deletions
diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css index 94d7aa63..0a0d0dcd 100644 --- a/mediagoblin/static/css/base.css +++ b/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 */ diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html index f4d7220e..70a367f9 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/media.html +++ b/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 %} diff --git a/mediagoblin/templates/mediagoblin/utils/exif.html b/mediagoblin/templates/mediagoblin/utils/exif.html index 3c1f4ceb..37f274fe 100644 --- a/mediagoblin/templates/mediagoblin/utils/exif.html +++ b/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> diff --git a/mediagoblin/templates/mediagoblin/utils/geolocation_map.html b/mediagoblin/templates/mediagoblin/utils/geolocation_map.html index e8baa247..cd57d1f8 100644 --- a/mediagoblin/templates/mediagoblin/utils/geolocation_map.html +++ b/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 %} diff --git a/mediagoblin/templates/mediagoblin/utils/license.html b/mediagoblin/templates/mediagoblin/utils/license.html index ab157508..9dad7419 100644 --- a/mediagoblin/templates/mediagoblin/utils/license.html +++ b/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> diff --git a/mediagoblin/templates/mediagoblin/utils/tags.html b/mediagoblin/templates/mediagoblin/utils/tags.html index eb31aba0..0127035c 100644 --- a/mediagoblin/templates/mediagoblin/utils/tags.html +++ b/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 %} |