Index: zen/html-elements.css
===================================================================
RCS file: /cvs/drupal-contrib/contributions/themes/zen/zen/html-elements.css,v
retrieving revision 1.7
diff -u -p -r1.7 html-elements.css
--- zen/html-elements.css 26 May 2009 03:33:22 -0000 1.7
+++ zen/html-elements.css 4 Jun 2009 13:25:28 -0000
@@ -29,8 +29,9 @@ body
#page
{
/*
- * To use a 12px font size on the page, delete the 14px declarations.
- * to use a 14px font size on the page, delete the 12px declarations.
+ * This uses a 12px font size on the page. To use a 14px font size on the page,
+ * replace the 12px declarations with the suggestion below it, and recalculate the
+ * relative margins and line-heights on the heading declarations.
*/
/* Use a 12px base font size with a 16px line height */
@@ -38,8 +39,8 @@ body
line-height: 1.333em; /* 12px x 1.333 = 16px */
/* Use a 14px base font size with a 18px line height */
- font-size: 0.875em; /* 16px x .875 = 14px */
- line-height: 1.286em; /* 14px x 1.286 = 18px */
+ /* font-size: 0.875em; *//* 16px x .875 = 14px */
+ /*line-height: 1.286em; *//* 14px x 1.286 = 18px */
}
body, caption, th, td, input, textarea, select, option, legend, fieldset
@@ -83,39 +84,39 @@ pre, code
h1
{
font-size: 2em;
- line-height: 1.3em;
- margin-top: 0;
- margin-bottom: 0.5em; /* 0.5em is equavalent to 1em in the page's base font.
- Remember, a margin specified in ems is relative to
+ line-height: 0.6665em; /* 0.6665em is equivalent to 1.333em in the page's base font.
+ Remember, a line-height specified in ems is relative to
the element's font-size, not to the pages' base
- font size. So, for example, if we want a 1em margin
- (relative to the base font), we have to divide that
+ font size. So, for example, if we want a 1.333em line-height
+ (relative to the base line-height), we have to divide that
length by the element's font-size:
- 1em / 2em = 0.5em */
+ 1.333em / 2em = 0.6665em, or multiples of 0.6665em.
+ Technically, since it inherits the line-height set for the
+ page, it may be omitted if left at the same size.
+ */
+ margin-top: 0;
+ margin-bottom: 0.6665em; /* 1.333 / 2em = 0.6665 */
}
h2
{
font-size: 1.5em;
- line-height: 1.3em;
- margin-top: 0.667em; /* Equivalent to 1em in the page's base font: 1 / 1.5 = 0.667em */
- margin-bottom: 0.667em;
+ margin-top: 0.889em; /* Equivalent to 1.333em in the page's base font: 1.333 / 1.5 = 0.889 */
+ margin-bottom: 0.889em;
}
h3
{
- font-size: 1.3em;
- line-height: 1.3em;
- margin-top: 0.769em; /* Equivalent to 1em in the page's base font: 1 / 1.3 = 0.769 */
- margin-bottom: 0.769em;
+ font-size: 1.333em;
+ margin-top: 1em; /* Equivalent to 1.333em in the page's base font: 1.333 / 1.333 = 1 */
+ margin-bottom: 1em;
}
h4, h5, h6
{
font-size: 1.1em;
- line-height: 1.3em;
- margin-top: 0.909em; /* Equivalent to 1em in the page's base font: 1 / 1.1 = 0.909 */
- margin-bottom: 0.909em;
+ margin-top: 1.212em; /* Equivalent to 1.333em in the page's base font: 1.333 / 1.1 = 1.212 */
+ margin-bottom: 1.212em;
}
/*
@@ -123,12 +124,12 @@ h4, h5, h6
*/
p, ul, ol, dl, pre, table, fieldset
{
- margin: 1em 0;
+ margin: 1.333em 0;
}
blockquote
{
- margin: 1em 2em;
+ margin: 1.333em 2em;
}
/*
@@ -145,7 +146,7 @@ ul, ol
.block ul, /* Drupal overrides */
.item-list ul
{
- margin: 1em 0;
+ margin: 1.333em 0;
padding: 0 0 0 2em; /* LTR */
}
@@ -295,6 +296,6 @@ form
fieldset
{
- margin: 1em 0;
- padding: 0.5em;
+ margin: 1.333em 0;
+ padding: 0.667em; /*1.333 / 2 = 0.667 */
}