From 3e4455302d7ccd74fe5f77922e201bc10cfd7ca1 Mon Sep 17 00:00:00 2001 From: JohnAlbin Date: Wed, 4 Nov 2009 20:23:19 +0000 Subject: [PATCH] Synced zen stylesheets with STARTERKIT stylesheets. --- zen-internals/css/ie6.css | 6 +- zen-internals/css/print.css | 10 ++-- zen-internals/css/zen-fixed.css | 96 ++++++++++++++++----------------- zen-internals/css/zen-liquid.css | 108 ++++++++++++++++++-------------------- 4 files changed, 106 insertions(+), 114 deletions(-) diff --git a/zen-internals/css/ie6.css b/zen-internals/css/ie6.css index 4b85634..4139b3e 100644 --- a/zen-internals/css/ie6.css +++ b/zen-internals/css/ie6.css @@ -25,9 +25,9 @@ body { } #content, -#navbar, -#sidebar-first, -#sidebar-second /* Floating divs */ { +#navigation, +.region-sidebar-first, +.region-sidebar-second /* Floating divs */ { display: inline; /* display inline or double your floated margin! [1] */ overflow: hidden; /* in ie6, overflow auto is broken [2] and so is overflow visible [3] */ overflow-y: visible; diff --git a/zen-internals/css/print.css b/zen-internals/css/print.css index 55fde6d..fa8f626 100644 --- a/zen-internals/css/print.css +++ b/zen-internals/css/print.css @@ -30,7 +30,7 @@ a:visited { /* Un-float the content */ #content, -#content-inner { +#content .section { float: none; width: 100%; margin: 0 !important; @@ -44,7 +44,7 @@ body, #main-wrapper, #main, #content, -#content-inner { +#content .section { color: #000; background-color: transparent !important; background-image: none !important; @@ -52,9 +52,9 @@ body, /* Hide sidebars and nav elements */ #skip-to-nav, -#navbar, -#sidebar-first, -#sidebar-second, +#navigation, +.region-sidebar-first, +.region-sidebar-second, #footer, .breadcrumb, div.tabs, diff --git a/zen-internals/css/zen-fixed.css b/zen-internals/css/zen-fixed.css index da1e135..adce28c 100644 --- a/zen-internals/css/zen-fixed.css +++ b/zen-internals/css/zen-fixed.css @@ -290,7 +290,7 @@ fieldset { margin: 1em 0; padding: 0.5em; } -/* Id: wireframes.css,v 1.4 2009/11/04 17:05:03 johnalbin Exp */ +/* Id: wireframes.css,v 1.7 2009/11/04 20:16:50 johnalbin Exp */ /** * @file @@ -301,12 +301,11 @@ fieldset { .with-wireframes #header .section, -.with-wireframes #content-inner, -.with-wireframes #content-inner>*, -.with-wireframes .region-navbar, -.with-wireframes #sidebar-first-inner, -.with-wireframes #sidebar-second-inner, -.with-wireframes .region-footer { +.with-wireframes #content .section, +.with-wireframes .region-navigation .section, +.with-wireframes .region-sidebar-first .section, +.with-wireframes .region-sidebar-second .section, +.with-wireframes .region-footer .section { margin: 1px; padding: 2px; border: 1px solid #ccc; @@ -317,7 +316,7 @@ fieldset { padding: 2px; border: 1px solid #ccc; } -/* Id: layout-fixed.css,v 1.11 2009/11/04 17:26:00 johnalbin Exp */ +/* Id: layout-fixed.css,v 1.14 2009/11/04 20:16:50 johnalbin Exp */ /** * @file @@ -393,12 +392,12 @@ body { width: 960px; margin-left: 0; /* LTR */ margin-right: -960px; /* LTR */ /* Negative value of #content's width + left margin. */ - padding: 0; /* DO NOT CHANGE. Add padding or margin to #content-inner. */ + padding: 0; /* DO NOT CHANGE. Add padding or margin to #content .section. */ } .sidebar-first #content { width: 760px; - margin-left: 200px; /* LTR */ /* The width of #sidebar-first. */ + margin-left: 200px; /* LTR */ /* The width of .region-sidebar-first. */ margin-right: -960px; /* LTR */ /* Negative value of #content's width + left margin. */ } @@ -410,45 +409,45 @@ body { .two-sidebars #content { width: 560px; - margin-left: 200px; /* LTR */ /* The width of #sidebar-first */ + margin-left: 200px; /* LTR */ /* The width of .region-sidebar-first */ margin-right: -760px; /* LTR */ /* Negative value of #content's width + left margin. */ } -#content-inner { +#content .section { margin: 0; padding: 0; } /* - * Navbar + * Navigation */ -#navbar { +#navigation { float: left; /* LTR */ width: 100%; margin-left: 0; /* LTR */ - margin-right: -100%; /* LTR */ /* Negative value of #navbar's width + left margin. */ - padding: 0; /* DO NOT CHANGE. Add padding or margin to .region-navbar. */ - height: 2.3em; /* The navbar can have any arbritrary height. We picked one + margin-right: -100%; /* LTR */ /* Negative value of #navigation's width + left margin. */ + padding: 0; /* DO NOT CHANGE. Add padding or margin to #navigation .section. */ + height: 2.3em; /* The navigation can have any arbritrary height. We picked one that is the line-height plus 1em: 1.3 + 1 = 2.3 Set this to the same value as the margin-top below. */ } -.with-navbar #content, -.with-navbar #sidebar-first, -.with-navbar #sidebar-second { - margin-top: 2.3em; /* Set this to the same value as the navbar height above. */ +.with-navigation #content, +.with-navigation .region-sidebar-first, +.with-navigation .region-sidebar-second { + margin-top: 2.3em; /* Set this to the same value as the navigation height above. */ } -.region-navbar { +#navigation .section { } -#navbar ul /* Primary and secondary links */ { +#navigation ul /* Primary and secondary links */ { margin: 0; padding: 0; text-align: left; /* LTR */ } -#navbar li /* A simple method to get navbar links to appear in one line. */ { +#navigation li /* A simple method to get navigation links to appear in one line. */ { float: left; /* LTR */ padding: 0 10px 0 0; /* LTR */ } @@ -456,15 +455,15 @@ body { /* * First sidebar */ -#sidebar-first { +.region-sidebar-first { float: left; /* LTR */ width: 200px; margin-left: 0; /* LTR */ - margin-right: -200px; /* LTR */ /* Negative value of #sidebar-first's width + left margin. */ - padding: 0; /* DO NOT CHANGE. Add padding or margin to #sidebar-first-inner. */ + margin-right: -200px; /* LTR */ /* Negative value of .region-sidebar-first's width + left margin. */ + padding: 0; /* DO NOT CHANGE. Add padding or margin to .region-sidebar-first .section. */ } -#sidebar-first-inner { +.region-sidebar-first .section { margin: 0 20px 0 0; /* LTR */ padding: 0; } @@ -472,15 +471,15 @@ body { /* * Second sidebar */ -#sidebar-second { +.region-sidebar-second { float: left; /* LTR */ width: 200px; margin-left: 760px; /* LTR */ /* Width of content + sidebar-first. */ - margin-right: -960px; /* LTR */ /* Negative value of #sidebar-second's width + left margin. */ - padding: 0; /* DO NOT CHANGE. Add padding or margin to #sidebar-second-inner. */ + margin-right: -960px; /* LTR */ /* Negative value of .region-sidebar-second's width + left margin. */ + padding: 0; /* DO NOT CHANGE. Add padding or margin to .region-sidebar-second .section. */ } -#sidebar-second-inner { +.region-sidebar-second .section { margin: 0 0 0 20px; /* LTR */ padding: 0; } @@ -505,16 +504,16 @@ body { */ #header, #content, -#navbar, -#sidebar-first, -#sidebar-second, +#navigation, +.region-sidebar-first, +.region-sidebar-second, #footer, #closure-blocks { overflow: visible; word-wrap: break-word; /* A very nice CSS3 property */ } -#navbar { +#navigation { overflow: hidden; /* May need to be removed if using a dynamic drop-down menu */ } @@ -750,7 +749,7 @@ div.messages ul { margin-top: 0; margin-bottom: 0; } -/* Id: pages.css,v 1.12 2009/11/04 17:26:00 johnalbin Exp */ +/* Id: pages.css,v 1.15 2009/11/04 20:16:50 johnalbin Exp */ /** * @file @@ -858,7 +857,7 @@ div#site-name /* The name of the website */ { #content { } -#content-inner { +#content .section { } #mission /* The mission statement of the site (displayed on homepage) */ { @@ -867,9 +866,6 @@ div#site-name /* The name of the website */ { .region-content-top /* Wrapper for any blocks placed in the "content top" region */ { } -#content-header /* Wrapper for breadcrumb, title, messages, tabs, and help */ { -} - .breadcrumb /* The path to the current page in the form of a list of links */ { padding-bottom: 0; /* Undo system.css */ } @@ -967,25 +963,25 @@ ul.links li { /* * First sidebar (on left in LTR languages, on right in RTL) * - * Remember to NOT add padding or margin to your #sidebar-first + * Remember to NOT add padding or margin to your .region-sidebar-first * (see the layout.css file.) */ -#sidebar-first { +.region-sidebar-first { } -#sidebar-first-inner { +.region-sidebar-first .section { } /* * Second sidebar (on right in LTR languages, on left in RTL) * - * Remember to NOT add padding or margin to your #sidebar-second + * Remember to NOT add padding or margin to your .region-sidebar-second * (see the layout.css file.) */ -#sidebar-second { +.region-sidebar-second { } -#sidebar-second-inner { +.region-sidebar-second .section { } /* @@ -1178,7 +1174,7 @@ div.block.with-block-editing:hover div.edit { #block-user-3 /* "Who's online" block for a list of the online users */ { } -/* Id: navigation.css,v 1.4 2009/10/15 15:48:20 johnalbin Exp */ +/* Id: navigation.css,v 1.5 2009/11/04 19:42:41 johnalbin Exp */ /** * @file @@ -1196,10 +1192,10 @@ li a.active { /* * Navigation bar */ -#navbar { +#navigation { } -.region-navbar { +.region-navigation { } /* diff --git a/zen-internals/css/zen-liquid.css b/zen-internals/css/zen-liquid.css index 507b319..cb3af96 100644 --- a/zen-internals/css/zen-liquid.css +++ b/zen-internals/css/zen-liquid.css @@ -290,7 +290,7 @@ fieldset { margin: 1em 0; padding: 0.5em; } -/* Id: wireframes.css,v 1.4 2009/11/04 17:05:03 johnalbin Exp */ +/* Id: wireframes.css,v 1.7 2009/11/04 20:16:50 johnalbin Exp */ /** * @file @@ -301,12 +301,11 @@ fieldset { .with-wireframes #header .section, -.with-wireframes #content-inner, -.with-wireframes #content-inner>*, -.with-wireframes .region-navbar, -.with-wireframes #sidebar-first-inner, -.with-wireframes #sidebar-second-inner, -.with-wireframes .region-footer { +.with-wireframes #content .section, +.with-wireframes .region-navigation .section, +.with-wireframes .region-sidebar-first .section, +.with-wireframes .region-sidebar-second .section, +.with-wireframes .region-footer .section { margin: 1px; padding: 2px; border: 1px solid #ccc; @@ -317,7 +316,7 @@ fieldset { padding: 2px; border: 1px solid #ccc; } -/* Id: layout-liquid.css,v 1.11 2009/11/04 17:26:00 johnalbin Exp */ +/* Id: layout-liquid.css,v 1.14 2009/11/04 20:16:50 johnalbin Exp */ /** * @file @@ -385,60 +384,60 @@ body { width: 100%; margin-left: 0; /* LTR */ margin-right: -100%; /* LTR */ /* Negative value of #content's width + left margin. */ - padding: 0; /* DO NOT CHANGE. Add padding or margin to #content-inner. */ + padding: 0; /* DO NOT CHANGE. Add padding or margin to #content .section. */ } -#content-inner, -.no-sidebars #content-inner { +#content .section, +.no-sidebars #content .section { margin: 0; padding: 0; } -.sidebar-first #content-inner { - padding-left: 200px; /* LTR */ /* The width + left margin of #sidebar-first. */ +.sidebar-first #content .section { + padding-left: 200px; /* LTR */ /* The width + left margin of .region-sidebar-first. */ padding-right: 0; /* LTR */ } -.sidebar-second #content-inner { +.sidebar-second #content .section { padding-left: 0; /* LTR */ - padding-right: 200px; /* LTR */ /* The width + right margin of #sidebar-second. */ + padding-right: 200px; /* LTR */ /* The width + right margin of .region-sidebar-second. */ } -.two-sidebars #content-inner { - padding-left: 200px; /* The width + left margin of #sidebar-first. */ - padding-right: 200px; /* The width + right margin of #sidebar-second. */ +.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. */ } /* - * Navbar + * Navigation */ -#navbar { +#navigation { float: left; /* LTR */ width: 100%; margin-left: 0; /* LTR */ - margin-right: -100%; /* LTR */ /* Negative value of #navbar's width + left margin. */ - padding: 0; /* DO NOT CHANGE. Add padding or margin to .region-navbar. */ - height: 2.3em; /* The navbar can have any arbritrary height. We picked one + margin-right: -100%; /* LTR */ /* Negative value of #navigation's width + left margin. */ + padding: 0; /* DO NOT CHANGE. Add padding or margin to #navigation .section. */ + height: 2.3em; /* The navigation can have any arbritrary height. We picked one that is the line-height plus 1em: 1.3 + 1 = 2.3 Set this to the same value as the margin-top below. */ } -.with-navbar #content, -.with-navbar #sidebar-first, -.with-navbar #sidebar-second { - margin-top: 2.3em; /* Set this to the same value as the navbar height above. */ +.with-navigation #content, +.with-navigation .region-sidebar-first, +.with-navigation .region-sidebar-second { + margin-top: 2.3em; /* Set this to the same value as the navigation height above. */ } -.region-navbar { +#navigation .section { } -#navbar ul /* Primary and secondary links */ { +#navigation ul /* Primary and secondary links */ { margin: 0; padding: 0; text-align: left; /* LTR */ } -#navbar li /* A simple method to get navbar links to appear in one line. */ { +#navigation li /* A simple method to get navigation links to appear in one line. */ { float: left; /* LTR */ padding: 0 10px 0 0; /* LTR */ } @@ -446,15 +445,15 @@ body { /* * First sidebar */ -#sidebar-first { +.region-sidebar-first { float: left; /* LTR */ width: 200px; margin-left: 0; /* LTR */ - margin-right: -200px; /* LTR */ /* Negative value of #sidebar-first's width + left margin. */ - padding: 0; /* DO NOT CHANGE. Add padding or margin to #sidebar-first-inner. */ + margin-right: -200px; /* LTR */ /* Negative value of .region-sidebar-first's width + left margin. */ + padding: 0; /* DO NOT CHANGE. Add padding or margin to .region-sidebar-first .section. */ } -#sidebar-first-inner { +.region-sidebar-first .section { margin: 0 20px 0 0; /* LTR */ padding: 0; } @@ -462,15 +461,15 @@ body { /* * Second sidebar */ -#sidebar-second { +.region-sidebar-second { float: right; /* LTR */ width: 200px; - margin-left: -200px; /* LTR */ /* Negative value of #sidebar-second's width + right 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 #sidebar-second-inner. */ + padding: 0; /* DO NOT CHANGE. Add padding or margin to .region-sidebar-second .section. */ } -#sidebar-second-inner { +.region-sidebar-second .section { margin: 0 0 0 20px; /* LTR */ padding: 0; } @@ -495,16 +494,16 @@ body { */ #header, #content, -#navbar, -#sidebar-first, -#sidebar-second, +#navigation, +.region-sidebar-first, +.region-sidebar-second, #footer, #closure-blocks { overflow: visible; word-wrap: break-word; /* A very nice CSS3 property */ } -#navbar { +#navigation { overflow: hidden; /* May need to be removed if using a dynamic drop-down menu */ } @@ -740,7 +739,7 @@ div.messages ul { margin-top: 0; margin-bottom: 0; } -/* Id: pages.css,v 1.12 2009/11/04 17:26:00 johnalbin Exp */ +/* Id: pages.css,v 1.15 2009/11/04 20:16:50 johnalbin Exp */ /** * @file @@ -848,7 +847,7 @@ div#site-name /* The name of the website */ { #content { } -#content-inner { +#content .section { } #mission /* The mission statement of the site (displayed on homepage) */ { @@ -857,9 +856,6 @@ div#site-name /* The name of the website */ { .region-content-top /* Wrapper for any blocks placed in the "content top" region */ { } -#content-header /* Wrapper for breadcrumb, title, messages, tabs, and help */ { -} - .breadcrumb /* The path to the current page in the form of a list of links */ { padding-bottom: 0; /* Undo system.css */ } @@ -957,25 +953,25 @@ ul.links li { /* * First sidebar (on left in LTR languages, on right in RTL) * - * Remember to NOT add padding or margin to your #sidebar-first + * Remember to NOT add padding or margin to your .region-sidebar-first * (see the layout.css file.) */ -#sidebar-first { +.region-sidebar-first { } -#sidebar-first-inner { +.region-sidebar-first .section { } /* * Second sidebar (on right in LTR languages, on left in RTL) * - * Remember to NOT add padding or margin to your #sidebar-second + * Remember to NOT add padding or margin to your .region-sidebar-second * (see the layout.css file.) */ -#sidebar-second { +.region-sidebar-second { } -#sidebar-second-inner { +.region-sidebar-second .section { } /* @@ -1168,7 +1164,7 @@ div.block.with-block-editing:hover div.edit { #block-user-3 /* "Who's online" block for a list of the online users */ { } -/* Id: navigation.css,v 1.4 2009/10/15 15:48:20 johnalbin Exp */ +/* Id: navigation.css,v 1.5 2009/11/04 19:42:41 johnalbin Exp */ /** * @file @@ -1186,10 +1182,10 @@ li a.active { /* * Navigation bar */ -#navbar { +#navigation { } -.region-navbar { +.region-navigation { } /* -- 1.7.4.1