[dw-free] entries in Brittle layout force square userpics

[fu]

[commit: http://hg.dwscoalition.org/dw-free/rev/9dbb793b9516]

http://bugs.dwscoalition.org/show_bug.cgi?id=2803

Make userpics display correctly in modern browsers in Brittle.

Patch by ninetydegrees.

Files modified:

• bin/upgrading/s2layers/brittle/layout.s2

--------------------------------------------------------------------------------
diff -r 383fb83fd04d -r 9dbb793b9516 bin/upgrading/s2layers/brittle/layout.s2
--- a/bin/upgrading/s2layers/brittle/layout.s2	Fri Aug 13 09:27:39 2010 +0800
+++ b/bin/upgrading/s2layers/brittle/layout.s2	Fri Aug 13 09:36:17 2010 +0800
@@ -310,32 +310,30 @@ function Page::print_default_stylesheet(
     var string entryicon_css = "";
     if ($*entryicons_position == "opposite") {
         $entryicon_css = """
-        div.entry div.userpic {
+        div.entry div.userpic,
+        div.comment div.userpic {
             float: $sidebar_position_opposite;
-            margin: 0;
             margin-$sidebar_position_opposite: -100px;
+            text-align: $sidebar_position;
             }
         div.comment div.userpic {
-            float: $sidebar_position_opposite;
-            margin: 0;
             margin-$sidebar_position_opposite: -110px;
             }
         """;
     }
     elseif ($*entryicons_position == "same") {
         $entryicon_css = """
-        div.entry div.userpic {
+        div.entry div.userpic,
+        div.comment div.userpic {
             float: $sidebar_position;
-            margin: 0;
             margin-$sidebar_position: -100px;
+            text-align: $sidebar_position;
             }
         div.comment div.userpic {
-            float: $sidebar_position;
-            margin: 0;
             margin-$sidebar_position: -110px;
             }
         #secondary {
-            margin-$sidebar_position_opposite: 110px;
+            margin-$sidebar_position_opposite: 100px;
         }
         """;
     }
@@ -474,11 +472,14 @@ h3.entry-title a { color: $*color_entry_
 
 div.entry div.userpic {
     display: block;
+    height: auto;
+    margin: 0;
+    width: 80px;
     }
 
 div.entry div.userpic img {
-    width: 70px;
-    height: 70px; /*FIXME -- this shouldn't be hardcoded */
+    max-width: 70px;
+    height: auto;
     border: 5px solid $*color_navigation_module_background;
     }
 
@@ -690,11 +691,14 @@ textarea.textbox  { width: 90%!important
 
 div.comment div.userpic {
     display: block;
+    height: auto;
+    margin: 0;
+    width: 80px;
     }
 
 div.comment div.userpic img {
-    width: 70px;
-    height: 70px; /*FIXME: don't hardcode userpic sizes!*/
+    max-width: 70px;
+    height: auto;
     border: 5px solid $*color_navigation_module_background;
     }
 
--------------------------------------------------------------------------------