summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xzen-internals/css/generate.sh2
-rw-r--r--zen-internals/css/zen-liquid-rtl.css32
-rw-r--r--zen-internals/css/zen-liquid.css52
3 files changed, 35 insertions, 51 deletions
diff --git a/zen-internals/css/generate.sh b/zen-internals/css/generate.sh
index 601a745..ccde535 100755
--- a/zen-internals/css/generate.sh
+++ b/zen-internals/css/generate.sh
@@ -60,7 +60,7 @@ STYLESHEET='zen-liquid.css';
RTL_STYLESHEET='zen-liquid-rtl.css';
echo > $STYLESHEET;
echo > $RTL_STYLESHEET;
-for FILENAME in ${FIXED[*]}; do
+for FILENAME in ${LIQUID[*]}; do
echo >> $STYLESHEET;
echo "/* $FILENAME.css */" >> $STYLESHEET;
echo >> $STYLESHEET;
diff --git a/zen-internals/css/zen-liquid-rtl.css b/zen-internals/css/zen-liquid-rtl.css
index 8097bf7..cffaf96 100644
--- a/zen-internals/css/zen-liquid-rtl.css
+++ b/zen-internals/css/zen-liquid-rtl.css
@@ -40,37 +40,31 @@ tbody th {
text-align: right;
}
-/* layout-fixed-rtl.css */
+/* layout-liquid-rtl.css */
/**
* @file
- * RTL companion for the layout-fixed.css file.
+ * RTL companion for the layout-liquid.css file.
*/
/*
* Content
*/
-#content,
-.no-sidebars #content {
+#content {
float: right;
- margin-left: -960px;
+ margin-left: -100%;
margin-right: 0; /* Negative value of #content's width + left margin. */
}
-.sidebar-first #content {
- margin-left: -960px; /* The width of .region-sidebar-first. */
- margin-right: 200px; /* Negative value of #content's width + left margin. */
+.sidebar-first #content .section {
+ padding-left: 0; /* The width + left margin of .region-sidebar-first. */
+ padding-right: 200px;
}
-.sidebar-second #content {
- margin-left: -760px;
- margin-right: 0; /* Negative value of #content's width + left margin. */
-}
-
-.two-sidebars #content {
- margin-left: -760px; /* The width of .region-sidebar-first */
- margin-right: 200px; /* Negative value of #content's width + left margin. */
+.sidebar-second #content .section {
+ padding-left: 200px;
+ padding-right: 0; /* The width + right margin of .region-sidebar-second. */
}
/*
@@ -108,9 +102,9 @@ tbody th {
* Second sidebar
*/
.region-sidebar-second {
- float: right;
- margin-left: -960px; /* Width of content + sidebar-first. */
- margin-right: 760px; /* Negative value of .region-sidebar-second's width + left margin. */
+ float: left;
+ margin-left: 0; /* Negative value of .region-sidebar-second's width + right margin. */
+ margin-right: -200px;
}
.region-sidebar-second .section {
diff --git a/zen-internals/css/zen-liquid.css b/zen-internals/css/zen-liquid.css
index 93c3e1c..7f91e5f 100644
--- a/zen-internals/css/zen-liquid.css
+++ b/zen-internals/css/zen-liquid.css
@@ -321,7 +321,7 @@ fieldset {
border: 1px solid #ccc;
}
-/* layout-fixed.css */
+/* layout-liquid.css */
/**
* @file
@@ -349,14 +349,7 @@ body {
#page-wrapper,
.region-page-closure {
- /*
- * If you want to make the page a fixed width and centered in the viewport,
- * this is the standards-compliant way to do that. See also the ie6.css file
- * for the necessary IE5/IE6quirks hack to center a div.
- */
- margin-left: auto;
- margin-right: auto;
- width: 960px;
+ min-width: 960px; /* Don't allow the browser to make the site unreadable. */
}
#page {
@@ -391,36 +384,33 @@ body {
/*
* Content
*/
-#content,
-.no-sidebars #content {
+#content {
float: left; /* LTR */
- width: 960px;
+ width: 100%;
margin-left: 0; /* LTR */
- margin-right: -960px; /* LTR */ /* Negative value of #content's width + left margin. */
+ margin-right: -100%; /* LTR */ /* Negative value of #content's width + left margin. */
padding: 0; /* DO NOT CHANGE. Add padding or margin to #content .section. */
}
-.sidebar-first #content {
- width: 760px;
- margin-left: 200px; /* LTR */ /* The width of .region-sidebar-first. */
- margin-right: -960px; /* LTR */ /* Negative value of #content's width + left margin. */
+#content .section,
+.no-sidebars #content .section {
+ margin: 0;
+ padding: 0;
}
-.sidebar-second #content {
- width: 760px;
- margin-left: 0; /* LTR */
- margin-right: -760px; /* LTR */ /* Negative value of #content's width + left margin. */
+.sidebar-first #content .section {
+ padding-left: 200px; /* LTR */ /* The width + left margin of .region-sidebar-first. */
+ padding-right: 0; /* LTR */
}
-.two-sidebars #content {
- width: 560px;
- margin-left: 200px; /* LTR */ /* The width of .region-sidebar-first */
- margin-right: -760px; /* LTR */ /* Negative value of #content's width + left margin. */
+.sidebar-second #content .section {
+ padding-left: 0; /* LTR */
+ padding-right: 200px; /* LTR */ /* The width + right margin of .region-sidebar-second. */
}
-#content .section {
- margin: 0;
- padding: 0;
+.two-sidebars #content .section {
+ padding-left: 200px; /* The width + left margin of .region-sidebar-first. */
+ padding-right: 200px; /* The width + right margin of .region-sidebar-second. */
}
/*
@@ -477,10 +467,10 @@ body {
* Second sidebar
*/
.region-sidebar-second {
- float: left; /* LTR */
+ float: right; /* LTR */
width: 200px;
- margin-left: 760px; /* LTR */ /* Width of content + sidebar-first. */
- margin-right: -960px; /* LTR */ /* Negative value of .region-sidebar-second's width + left margin. */
+ margin-left: -200px; /* LTR */ /* Negative value of .region-sidebar-second's width + right margin. */
+ margin-right: 0; /* LTR */
padding: 0; /* DO NOT CHANGE. Add padding or margin to .region-sidebar-second .section. */
}