Remove collection_thumbnail styling, so collection thumbnails are styled the same...

diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css
index a8184f579d02d6ebd6ac80a1ab33e019a69dd45c..f06b0af7d2181a15dd3cd6cfff20fb6acb03f8fa 100644 (file)
--- a/mediagoblin/static/css/base.css
+++ b/mediagoblin/static/css/base.css
@@ -392,6 +392,11 @@ textarea#comment_content {
   display: block;
 }
 
+.media_thumbnail a.remove {
+  color: #86D4B1;
+  text-decoration: underline;
+}
+
 a.thumb_entry_title {
   padding: 8px;
 }
@@ -404,34 +409,6 @@ a.thumb_entry_title {
   margin-right: 0px;
 }
 
-/* collection media */
-
-.collection_thumbnail {
-  float: left;
-  padding: 0px;
-  width: 180px;
-  margin: 0px 4px 10px;
-  text-align: left;
-  font-size: 0.875em;
-  background-color: #222;
-  border-radius: 0 0 5px 5px;
-  padding: 0 0 6px;
-  text-overflow: ellipsis;
-}
-
-.collection_thumbnail a {
-  color: #eee;
-  text-decoration: none;
-}
-
-.collection_thumbnail a.remove {
-  color: #86D4B1;
-}
-
-.collection_thumbnail img {
-  max-height: 135px;
-}
-
 /* media detail */
 
 h2.media_title {

diff --git a/mediagoblin/templates/mediagoblin/utils/collection_gallery.html b/mediagoblin/templates/mediagoblin/utils/collection_gallery.html
index af332537eb9bb7c59bdd078784abefc3dbd3ffa8..ab5e46ea413548ce7e4fb403d4e34784e83711e1 100644 (file)
--- a/mediagoblin/templates/mediagoblin/utils/collection_gallery.html
+++ b/mediagoblin/templates/mediagoblin/utils/collection_gallery.html
@@ -27,7 +27,7 @@
         {% for item in row %}
           {% set media_entry = item.get_media_entry %}
           {% set entry_url = media_entry.url_for_self(request.urlgen) %}
-          <td class="collection_thumbnail thumb_entry
+          <td class="media_thumbnail thumb_entry
                      {%- if loop.first %} thumb_entry_first
                      {%- elif loop.last %} thumb_entry_last{% endif %}">
             <a href="{{ entry_url }}">
@@ -35,7 +35,6 @@
             </a>
 
             {% if item.note %}
-             <br />
               <a href="{{ entry_url }}">{{ item.note }}</a>
             {% endif %}
            {% if request.user and
@@ -46,7 +45,6 @@
                                  user=item.in_collection.get_creator.username,
                                  collection=item.in_collection.slug,
                                  collection_item=item.id) -%}
-             <br />
              <a href="{{ remove_url }}" class="remove">
                {%- trans %}(remove){% endtrans -%}
              </a>