# HG changeset patch
# User Bob Farrell <robertanthonyfarrell@gmail.com>
# Date 1311976178 -3600
# Branch new-release-july-2011
# Node ID bb6aed909a43fd85040d050cb5c4a689acb6262a
# Parent  43aaddc4245f5990e94ea2b65387593b07f5a87d
# Parent  44cc76150f541d9ba9228472316bcde64ae062ed
merge

diff -r 43aaddc4245f5990e94ea2b65387593b07f5a87d -r bb6aed909a43fd85040d050cb5c4a689acb6262a soundbush/public/css/base.css
--- a/soundbush/public/css/base.css	Fri Jul 29 22:44:07 2011 +0100
+++ b/soundbush/public/css/base.css	Fri Jul 29 22:49:38 2011 +0100
@@ -477,7 +477,7 @@
 }
 
 #artist-description {
-  height: 100px;
+  max-height: 100px;
   overflow: hidden;
 }
 
diff -r 43aaddc4245f5990e94ea2b65387593b07f5a87d -r bb6aed909a43fd85040d050cb5c4a689acb6262a soundbush/public/js/main.js
--- a/soundbush/public/js/main.js	Fri Jul 29 22:44:07 2011 +0100
+++ b/soundbush/public/js/main.js	Fri Jul 29 22:49:38 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;
         });