# HG changeset patch # User Bob Farrell # Date 1311976135 -3600 # Branch single-column-redesign-1 # Node ID 44cc76150f541d9ba9228472316bcde64ae062ed # Parent 6a328136a9ca56492be365ce21da748ccbd2fae0 use max-height instead of height for artist description - some descriptions will take up less space than 100px so expanding/collapsing is actually inversed for these cases when using 'height' diff -r 6a328136a9ca56492be365ce21da748ccbd2fae0 -r 44cc76150f541d9ba9228472316bcde64ae062ed soundbush/public/css/base.css --- a/soundbush/public/css/base.css Fri Jul 29 22:43:48 2011 +0100 +++ b/soundbush/public/css/base.css Fri Jul 29 22:48:55 2011 +0100 @@ -477,7 +477,7 @@ } #artist-description { - height: 100px; + max-height: 100px; overflow: hidden; } diff -r 6a328136a9ca56492be365ce21da748ccbd2fae0 -r 44cc76150f541d9ba9228472316bcde64ae062ed soundbush/public/js/main.js --- a/soundbush/public/js/main.js Fri Jul 29 22:43:48 2011 +0100 +++ b/soundbush/public/js/main.js Fri Jul 29 22:48:55 2011 +0100 @@ -306,12 +306,12 @@ $("#read-more").toggle( function () { - $("#artist-description").css("height", "auto"); + $("#artist-description").css("max-height", "none"); $(this).text("Show less"); return false; }, function () { - $("#artist-description").css("height", "100px"); + $("#artist-description").css("max-height", "100px"); $(this).text("Show more"); return false; });