[dw-free] Fix sidebar width in some styles

[fu]

[commit: http://hg.dwscoalition.org/dw-free/rev/61ab639f46c0]

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

Same sidebar width in three columns left and right in Funky Circles plus
other spacing issues.

Patch by ninetydegrees.

Files modified:

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

--------------------------------------------------------------------------------
diff -r 79ccf28ca261 -r 61ab639f46c0 bin/upgrading/s2layers/funkycircles/layout.s2
--- a/bin/upgrading/s2layers/funkycircles/layout.s2	Mon Jun 13 14:15:50 2011 +0800
+++ b/bin/upgrading/s2layers/funkycircles/layout.s2	Mon Jun 13 14:45:47 2011 +0800
@@ -327,7 +327,7 @@
     text-transform: lowercase;
     }
 
-/* Posts & Sidebar Containers
+/* Page Containers
 ***************************************************************************/
 #content {
     margin: 0 4em;
@@ -347,14 +347,35 @@
         margin-top: 6.6em;
         }
 
-#secondary > .inner:first-child {
+#secondary,
+.three-columns #tertiary {
+    margin-top: 7em;
+    }
+
+    .one-column #secondary {
+        margin-top: 0;
+        }
+
+#secondary > .inner:first-child,
+#tertiary > .inner:first-child {
     padding: 0;
     }
 
-    .one-column #secondary > .inner:first-child {
+    .one-column #secondary > .inner:first-child,
+    .two-columns #tertiary > .inner:first-child {
         padding-top: 1em;
         }
 
+    .three-columns-left #secondary > .inner:first-child,
+    .three-columns-right #secondary > .inner:first-child {
+        padding-right: .5em;
+        }
+
+    .three-columns-left #tertiary > .inner:first-child,
+    .three-columns-right #tertiary > .inner:first-child {
+        padding-left: .5em;
+        }
+
 /* Navigation
 ***************************************************************************/
 .navigation {
@@ -995,29 +1016,6 @@
             $entry_footer_link_hover_colors
             }
 
-/* Sidebars
-***************************************************************************/
-
-#secondary,
-.three-columns-sides #tertiary,
-.three-columns-left #tertiary,
-.three-columns-right #tertiary {
-    margin-top: 7em;
-    }
-
-    .one-column #secondary {
-        margin-top: 0;
-        }
-
-#secondary .module,
-#tertiary .module {
-    margin-bottom: 4em;
-    }
-
-    .one-column #tertiary .module{
-        margin-bottom: .5em;
-        }
-
 /* Modules
 ***************************************************************************/
 
@@ -1025,6 +1023,11 @@
     padding: 0 .5em;
     }
 
+#secondary .module,
+#tertiary .module {
+    margin-bottom: 4em;
+    }
+
 .module li {
     list-style: url($image_module_list_url) disc;
     margin: .5em;
--------------------------------------------------------------------------------