aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/static/css
diff options
context:
space:
mode:
authorRodney Ewing <ewing.rj@gmail.com>2013-05-30 16:31:15 -0700
committerRodney Ewing <ewing.rj@gmail.com>2013-05-30 16:31:15 -0700
commit9a899af02b6dbd2792482f39405d22e0361c8bf6 (patch)
tree6168a5e82e48367b873820add9116af76249d6cf /mediagoblin/static/css
parentd1c9ef47c43d33f265d93ef2ded23fcbb9213999 (diff)
parent0e4d6221fae26709d7ad32f40318df874b570bf8 (diff)
downloadmediagoblin-9a899af02b6dbd2792482f39405d22e0361c8bf6.tar.lz
mediagoblin-9a899af02b6dbd2792482f39405d22e0361c8bf6.tar.xz
mediagoblin-9a899af02b6dbd2792482f39405d22e0361c8bf6.zip
Merge remote-tracking branch 'upstream/master' into basic_auth
Diffstat (limited to 'mediagoblin/static/css')
-rw-r--r--mediagoblin/static/css/base.css9
1 files changed, 6 insertions, 3 deletions
diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css
index 4645b2c5..5b8226e6 100644
--- a/mediagoblin/static/css/base.css
+++ b/mediagoblin/static/css/base.css
@@ -433,9 +433,12 @@ a.thumb_entry_title {
padding: 8px;
}
-.media_thumbnail img {
- max-height: 135px;
-}
+/* For now, this is commented out since our thumbnails are actually 180px high.
+ *
+ * .media_thumbnail img {
+ * max-height: 135px;
+ * }
+ */
.thumb_entry_last {
margin-right: 0px;