summaryrefslogtreecommitdiffstats
path: root/zen
diff options
context:
space:
mode:
authorJohnAlbin2008-09-12 04:44:25 +0000
committerJohnAlbin2008-09-12 04:44:25 +0000
commit7f0ce2f276b0f0051d1a55c0e89cbab66b0f2dbf (patch)
tree962a10bfa591b9305ae8209918eb407c5e4f8afe /zen
parentcf649b14937f586d43059ef40612c4c687f1ce63 (diff)
Re-arranged sidebar classes so they are in no-sidebars -> two-sidebars order in the layout CSS files.
Diffstat (limited to 'zen')
-rw-r--r--zen/layout-fixed.css18
-rw-r--r--zen/layout-liquid.css13
2 files changed, 16 insertions, 15 deletions
diff --git a/zen/layout-fixed.css b/zen/layout-fixed.css
index c3302a8..264c2c8 100644
--- a/zen/layout-fixed.css
+++ b/zen/layout-fixed.css
@@ -134,13 +134,13 @@
}
/** content **/
- #content,
- .two-sidebars #content
+ #content
+ .no-sidebars #content
{
float: left;
- width: 560px;
- margin-left: 200px; /* The width of #sidebar-left */
- margin-right: -760px; /* Negative value of #content's width + left margin. */
+ width: 960px;
+ margin-left: 0;
+ margin-right: -960px; /* Negative value of #content's width + left margin. */
padding: 0; /* DO NOT CHANGE. Add padding or margin to #content-inner. */
}
@@ -158,11 +158,11 @@
margin-right: -760px; /* Negative value of #content's width + left margin. */
}
- .no-sidebars #content
+ .two-sidebars #content
{
- width: 960px;
- margin-left: 0;
- margin-right: -960px; /* Negative value of #content's width + left margin. */
+ width: 560px;
+ margin-left: 200px; /* The width of #sidebar-left */
+ margin-right: -760px; /* Negative value of #content's width + left margin. */
}
#content-inner
diff --git a/zen/layout-liquid.css b/zen/layout-liquid.css
index 1d0c5d3..57f85ed 100644
--- a/zen/layout-liquid.css
+++ b/zen/layout-liquid.css
@@ -134,10 +134,11 @@
padding: 0; /* DO NOT CHANGE. Add padding or margin to #content-inner. */
}
- .two-sidebars #content-inner
+ #content-inner,
+ .no-sidebars #content-inner
{
- padding-left: 200px; /* The width + left margin of #sidebar-left. */
- padding-right: 200px; /* The width + right margin of #sidebar-right. */
+ margin: 0;
+ padding: 0;
}
.sidebar-left #content-inner
@@ -152,10 +153,10 @@
padding-right: 200px; /* The width + right margin of #sidebar-right. */
}
- #content-inner
+ .two-sidebars #content-inner
{
- margin: 0;
- padding: 0;
+ padding-left: 200px; /* The width + left margin of #sidebar-left. */
+ padding-right: 200px; /* The width + right margin of #sidebar-right. */
}
/** navbar **/