summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--layout-fixed.css66
-rw-r--r--layout-liquid.css76
2 files changed, 71 insertions, 71 deletions
diff --git a/layout-fixed.css b/layout-fixed.css
index 16feb34..1a1e565 100644
--- a/layout-fixed.css
+++ b/layout-fixed.css
@@ -146,45 +146,13 @@
padding: 0;
}
-/** sidebar-left **/
- #sidebar-left
- {
- float: left;
- width: 200px;
- margin-left: 0;
- margin-right: -200px; /* Negative value of #sidebar-left's width + left margin. */
- padding: 0; /* DO NOT CHANGE. Add padding or margin to #sidebar-left-inner. */
- }
-
- #sidebar-left-inner
- {
- margin: 0 20px 0 0;
- padding: 0;
- }
-
-/** sidebar-right **/
- #sidebar-right
- {
- float: left;
- width: 200px;
- margin-left: 760px; /* Width of content + sidebar-left. */
- margin-right: -960px; /* Negative value of #sidebar-right's width + left margin. */
- padding: 0; /* DO NOT CHANGE. Add padding or margin to #sidebar-right-inner. */
- }
-
- #sidebar-right-inner
- {
- margin: 0 0 0 20px;
- padding: 0;
- }
-
/** navbar **/
#navbar
{
float: left;
width: 100%;
margin-left: 0;
- margin-right: -100%; /* Negative value of #navbar's width. */
+ margin-right: -100%; /* Negative value of #navbar's width + left margin. */
padding: 0; /* DO NOT CHANGE. Add padding or margin to #navbar-inner. */
height: 3.6em; /* The navbar can have any arbritrary height. We picked one
that is twice the line-height pluse 1em: 2 x 1.3 + 1 = 3.6
@@ -238,6 +206,38 @@
}
*/
+/** sidebar-left **/
+ #sidebar-left
+ {
+ float: left;
+ width: 200px;
+ margin-left: 0;
+ margin-right: -200px; /* Negative value of #sidebar-left's width + left margin. */
+ padding: 0; /* DO NOT CHANGE. Add padding or margin to #sidebar-left-inner. */
+ }
+
+ #sidebar-left-inner
+ {
+ margin: 0 20px 0 0;
+ padding: 0;
+ }
+
+/** sidebar-right **/
+ #sidebar-right
+ {
+ float: left;
+ width: 200px;
+ margin-left: 760px; /* Width of content + sidebar-left. */
+ margin-right: -960px; /* Negative value of #sidebar-right's width + left margin. */
+ padding: 0; /* DO NOT CHANGE. Add padding or margin to #sidebar-right-inner. */
+ }
+
+ #sidebar-right-inner
+ {
+ margin: 0 0 0 20px;
+ padding: 0;
+ }
+
/** Prevent overflowing content **/
#header,
#content,
diff --git a/layout-liquid.css b/layout-liquid.css
index 640825f..cea45da 100644
--- a/layout-liquid.css
+++ b/layout-liquid.css
@@ -106,26 +106,26 @@
float: left;
width: 100%;
margin-left: 0;
- margin-right: -100%; /* Negative value of #content's width. */
+ margin-right: -100%; /* Negative value of #content's width + left margin. */
padding: 0; /* DO NOT CHANGE. Add padding or margin to #content-inner. */
}
.two-sidebars #content-inner
{
- padding-left: 200px; /* The width of #sidebar-left. */
- padding-right: 200px; /* The width of #sidebar-right. */
+ padding-left: 200px; /* The width + left margin of #sidebar-left. */
+ padding-right: 200px; /* The width + right margin of #sidebar-right. */
}
.sidebar-left #content-inner
{
- padding-left: 200px; /* The width of #sidebar-left. */
+ padding-left: 200px; /* The width + left margin of #sidebar-left. */
padding-right: 0;
}
.sidebar-right #content-inner
{
padding-left: 0;
- padding-right: 200px; /* The width of #sidebar-right. */
+ padding-right: 200px; /* The width + right margin of #sidebar-right. */
}
#content-inner
@@ -134,45 +134,13 @@
padding: 0;
}
-/** sidebar-left **/
- #sidebar-left
- {
- float: left;
- width: 200px;
- margin-left: 0;
- margin-right: -200px; /* Negative value of #sidebar-left's width + left margin. */
- padding: 0; /* DO NOT CHANGE. Add padding or margin to #sidebar-left-inner. */
- }
-
- #sidebar-left-inner
- {
- margin: 0 20px 0 0;
- padding: 0;
- }
-
-/** sidebar-right **/
- #sidebar-right
- {
- float: right;
- width: 200px;
- margin-left: -200px; /* Negative value of #sidebar-right's width. */
- margin-right: 0;
- padding: 0; /* DO NOT CHANGE. Add padding or margin to #sidebar-right-inner. */
- }
-
- #sidebar-right-inner
- {
- margin: 0 0 0 20px;
- padding: 0;
- }
-
/** navbar **/
#navbar
{
float: left;
width: 100%;
margin-left: 0;
- margin-right: -100%; /* Negative value of #navbar's width. */
+ margin-right: -100%; /* Negative value of #navbar's width + left margin. */
padding: 0; /* DO NOT CHANGE. Add padding or margin to #navbar-inner. */
height: 3.6em; /* The navbar can have any arbritrary height. We picked one
that is twice the line-height pluse 1em: 2 x 1.3 + 1 = 3.6
@@ -226,6 +194,38 @@
}
*/
+/** sidebar-left **/
+ #sidebar-left
+ {
+ float: left;
+ width: 200px;
+ margin-left: 0;
+ margin-right: -200px; /* Negative value of #sidebar-left's width + left margin. */
+ padding: 0; /* DO NOT CHANGE. Add padding or margin to #sidebar-left-inner. */
+ }
+
+ #sidebar-left-inner
+ {
+ margin: 0 20px 0 0;
+ padding: 0;
+ }
+
+/** sidebar-right **/
+ #sidebar-right
+ {
+ float: right;
+ width: 200px;
+ margin-left: -200px; /* Negative value of #sidebar-right's width + right margin. */
+ margin-right: 0;
+ padding: 0; /* DO NOT CHANGE. Add padding or margin to #sidebar-right-inner. */
+ }
+
+ #sidebar-right-inner
+ {
+ margin: 0 0 0 20px;
+ padding: 0;
+ }
+
/** Prevent overflowing content **/
#header,
#content,