summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohnAlbin2009-08-12 08:37:42 (GMT)
committer JohnAlbin2009-08-12 08:37:42 (GMT)
commit7c457fa4c738b347771eb8f7b6de0574466bafc9 (patch)
tree001fa352b9934c3adc41b14a9512bf76fc4a7a1e
parentd8d090d9cbb657261cd71b4c5c1b81676434442a (diff)
Second pass of #527494: Follow Drupal's proposed CSS coding standards
-rw-r--r--STARTERKIT/css/forms-rtl.css4
-rw-r--r--STARTERKIT/css/forms.css19
-rw-r--r--STARTERKIT/css/html-elements-rtl.css7
-rw-r--r--STARTERKIT/css/html-elements.css37
-rw-r--r--STARTERKIT/css/ie6.css4
-rw-r--r--STARTERKIT/css/layout-fixed.css10
-rw-r--r--STARTERKIT/css/layout-liquid.css10
-rw-r--r--STARTERKIT/css/messages-rtl.css4
-rw-r--r--STARTERKIT/css/messages.css4
-rw-r--r--STARTERKIT/css/nodes.css4
-rw-r--r--STARTERKIT/css/page-backgrounds.css2
-rw-r--r--STARTERKIT/css/pages.css12
-rw-r--r--STARTERKIT/css/print.css28
13 files changed, 96 insertions, 49 deletions
diff --git a/STARTERKIT/css/forms-rtl.css b/STARTERKIT/css/forms-rtl.css
index c52ad04..6478532 100644
--- a/STARTERKIT/css/forms-rtl.css
+++ b/STARTERKIT/css/forms-rtl.css
@@ -26,8 +26,8 @@
margin-right: -20px; /* Un-do some of the padding on the ul list. */
}
-#user-login li.openid-link, /* The OpenID links on the /user form. */
-#user-login li.user-link {
+#user-login li.openid-link,
+#user-login li.user-link /* The OpenID links on the /user form. */ {
margin-left: 0;
margin-right: -2em; /* Un-do all of the padding on the ul list. */
}
diff --git a/STARTERKIT/css/forms.css b/STARTERKIT/css/forms.css
index 993ff08..b4e51b2 100644
--- a/STARTERKIT/css/forms.css
+++ b/STARTERKIT/css/forms.css
@@ -6,15 +6,15 @@
*/
-.form-item, /* Wrapper for a form element (or group of form elements) and its label */
+.form-item,
.form-checkboxes,
-.form-radios {
+.form-radios /* Wrapper for a form element (or group of form elements) and its label */ {
margin: 1em 0;
}
-.form-item input.error, /* Highlight the form elements that caused a form submission error */
+.form-item input.error,
.form-item textarea.error,
-.form-item select.error {
+.form-item select.error /* Highlight the form elements that caused a form submission error */ {
border: 2px solid #c00;
}
@@ -36,15 +36,16 @@
font-size: 0.85em;
}
-.form-checkboxes .form-item, /* Pack groups of checkboxes and radio buttons closer together */
-.form-radios .form-item {
+.form-checkboxes .form-item,
+.form-radios .form-item /* Pack groups of checkboxes and radio buttons closer together */ {
margin: 0.4em 0;
}
.form-submit /* The submit button */ {
}
-.container-inline div, .container-inline label /* Inline labels and form divs */ {
+.container-inline div,
+.container-inline label /* Inline labels and form divs */ {
display: inline;
}
@@ -106,8 +107,8 @@
margin: 1em 0;
}
-#user-login li.openid-link, /* The OpenID links on the /user form. */
-#user-login li.user-link {
+#user-login li.openid-link,
+#user-login li.user-link /* The OpenID links on the /user form. */ {
margin-left: -2em; /* LTR */ /* Un-do all of the padding on the ul list. */
}
diff --git a/STARTERKIT/css/html-elements-rtl.css b/STARTERKIT/css/html-elements-rtl.css
index e88c1ae..3cdf9e3 100644
--- a/STARTERKIT/css/html-elements-rtl.css
+++ b/STARTERKIT/css/html-elements-rtl.css
@@ -11,13 +11,14 @@
*
* We need to standardize the list item indentation.
*/
-ul, ol {
+ul,
+ol {
padding-left: 0;
padding-right: 2em;
}
-.block ul, /* Drupal overrides */
-.item-list ul {
+.block ul,
+.item-list ul /* Drupal overrides */ {
padding: 0 2em 0 0;
}
diff --git a/STARTERKIT/css/html-elements.css b/STARTERKIT/css/html-elements.css
index 4c253aa..79bbc1f 100644
--- a/STARTERKIT/css/html-elements.css
+++ b/STARTERKIT/css/html-elements.css
@@ -40,7 +40,16 @@ body {
line-height: 1.286em; /* 14px x 1.286 = 18px */
}
-body, caption, th, td, input, textarea, select, option, legend, fieldset {
+body,
+caption,
+th,
+td,
+input,
+textarea,
+select,
+option,
+legend,
+fieldset {
/* The following font family declarations are based on the Microsoft core
* web fonts which are common fonts available on most computer systems. The
* Bitstream Vera fonts are commonly available on Linux systems where the MS
@@ -68,7 +77,8 @@ body, caption, th, td, input, textarea, select, option, legend, fieldset {
font-family: Tahoma, Verdana, Arial, Helvetica, "Bitstream Vera Sans", sans-serif;
}
-pre, code {
+pre,
+code {
font-size: 1.1em; /* Monospace fonts can be hard to read */
font-family: "Bitstream Vera Sans Mono", "Courier New", monospace;
}
@@ -103,7 +113,9 @@ h3 {
margin-bottom: 0.769em;
}
-h4, h5, h6 {
+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 */
@@ -113,7 +125,13 @@ h4, h5, h6 {
/*
* Block-level elements
*/
-p, ul, ol, dl, pre, table, fieldset {
+p,
+ul,
+ol,
+dl,
+pre,
+table,
+fieldset {
margin: 1em 0;
}
@@ -126,13 +144,14 @@ blockquote {
*
* We need to standardize the list item indentation.
*/
-ul, ol {
+ul,
+ol {
margin-left: 0;
padding-left: 2em; /* LTR */
}
-.block ul, /* Drupal overrides */
-.item-list ul {
+.block ul,
+.item-list ul /* Drupal overrides */ {
margin: 1em 0;
padding: 0 0 0 2em; /* LTR */
}
@@ -157,10 +176,10 @@ li {
list-style: inherit;
}
-ul.menu li, /* Drupal override */
+ul.menu li,
li.expanded,
li.collapsed,
-li.leaf {
+li.leaf /* Drupal override */ {
margin: 0;
padding: 0;
}
diff --git a/STARTERKIT/css/ie6.css b/STARTERKIT/css/ie6.css
index 56ff9e5..7896fcf 100644
--- a/STARTERKIT/css/ie6.css
+++ b/STARTERKIT/css/ie6.css
@@ -74,10 +74,10 @@ ul.primary li.active a:hover .tab {
* Messages - IE 5 and 6 don't support PNGs with alpha transparency.
*/
-div.messages, /* Important messages (status, warning, and error) for the user */
+div.messages,
div.status,
div.warning,
-div.error {
+div.error /* Important messages (status, warning, and error) for the user */ {
background-image: url(../images/messages-status-ie6.png);
}
diff --git a/STARTERKIT/css/layout-fixed.css b/STARTERKIT/css/layout-fixed.css
index 123f814..467a469 100644
--- a/STARTERKIT/css/layout-fixed.css
+++ b/STARTERKIT/css/layout-fixed.css
@@ -51,7 +51,8 @@ body {
font-size: 0.8em;
}
-#skip-to-nav a:link, #skip-to-nav a:visited {
+#skip-to-nav a:link,
+#skip-to-nav a:visited {
color: #fff; /* Same as background color of page */
}
@@ -63,7 +64,9 @@ body {
/* Alternatively, the skip-to-nav link can be completely hidden until a user tabs
to the link. Un-comment the following CSS to use this technique. */
/*
-#skip-to-nav a, #skip-to-nav a:hover, #skip-to-nav a:visited {
+#skip-to-nav a,
+#skip-to-nav a:hover,
+#skip-to-nav a:visited {
position: absolute;
left: 0;
top: -500px;
@@ -72,7 +75,8 @@ body {
overflow: hidden;
}
-#skip-to-nav a:active, #skip-to-nav a:focus {
+#skip-to-nav a:active,
+#skip-to-nav a:focus {
position: static;
width: auto;
height: auto;
diff --git a/STARTERKIT/css/layout-liquid.css b/STARTERKIT/css/layout-liquid.css
index 9024b72..39bb768 100644
--- a/STARTERKIT/css/layout-liquid.css
+++ b/STARTERKIT/css/layout-liquid.css
@@ -44,7 +44,8 @@ body {
font-size: 0.8em;
}
-#skip-to-nav a:link, #skip-to-nav a:visited {
+#skip-to-nav a:link,
+#skip-to-nav a:visited {
color: #fff; /* Same as background color of page */
}
@@ -56,7 +57,9 @@ body {
/* Alternatively, the skip-to-nav link can be completely hidden until a user tabs
to the link. Un-comment the following CSS to use this technique. */
/*
-#skip-to-nav a, #skip-to-nav a:hover, #skip-to-nav a:visited {
+#skip-to-nav a,
+#skip-to-nav a:hover,
+#skip-to-nav a:visited {
position: absolute;
left: 0;
top: -500px;
@@ -65,7 +68,8 @@ body {
overflow: hidden;
}
-#skip-to-nav a:active, #skip-to-nav a:focus {
+#skip-to-nav a:active,
+#skip-to-nav a:focus {
position: static;
width: auto;
height: auto;
diff --git a/STARTERKIT/css/messages-rtl.css b/STARTERKIT/css/messages-rtl.css
index 31979c0..7274ee7 100644
--- a/STARTERKIT/css/messages-rtl.css
+++ b/STARTERKIT/css/messages-rtl.css
@@ -6,10 +6,10 @@
*/
-div.messages, /* Important messages (status, warning, and error) for the user */
+div.messages,
div.status,
div.warning,
-div.error {
+div.error /* Important messages (status, warning, and error) for the user */ {
padding: 5px 35px 5px 5px;
background-position: 99.5% 5px;
}
diff --git a/STARTERKIT/css/messages.css b/STARTERKIT/css/messages.css
index cb8c737..76fbb5f 100644
--- a/STARTERKIT/css/messages.css
+++ b/STARTERKIT/css/messages.css
@@ -8,10 +8,10 @@
*/
-div.messages, /* Important messages (status, warning, and error) for the user */
+div.messages,
div.status,
div.warning,
-div.error {
+div.error /* Important messages (status, warning, and error) for the user */ {
min-height: 21px;
margin: 0 1em 5px 1em;
border: 2px solid #ff7;
diff --git a/STARTERKIT/css/nodes.css b/STARTERKIT/css/nodes.css
index cf20968..0919df1 100644
--- a/STARTERKIT/css/nodes.css
+++ b/STARTERKIT/css/nodes.css
@@ -21,8 +21,8 @@
/* background-color: #fff4f4; */ /* Drupal core uses a #fff4f4 background */
}
-.node-unpublished div.unpublished, /* The word "Unpublished" displayed underneath the content. */
-.comment-unpublished div.unpublished {
+.node-unpublished div.unpublished,
+.comment-unpublished div.unpublished /* The word "Unpublished" displayed underneath the content. */ {
height: 0;
overflow: visible;
color: #d8d8d8;
diff --git a/STARTERKIT/css/page-backgrounds.css b/STARTERKIT/css/page-backgrounds.css
index 1b58095..f821870 100644
--- a/STARTERKIT/css/page-backgrounds.css
+++ b/STARTERKIT/css/page-backgrounds.css
@@ -2,7 +2,7 @@
/**
* @file
- * Background Styling
+ * Page Background Styling
*
* The default layout method of Zen doesn't give themers equal-height columns.
* However, equal-height columns are difficult to achieve and totally
diff --git a/STARTERKIT/css/pages.css b/STARTERKIT/css/pages.css
index 7c8f9c3..4b9ec63 100644
--- a/STARTERKIT/css/pages.css
+++ b/STARTERKIT/css/pages.css
@@ -44,7 +44,8 @@ body {
#logo-image /* The actual logo image */ {
}
-h1#site-name, div#site-name /* The name of the website */ {
+h1#site-name,
+div#site-name /* The name of the website */ {
margin: 0;
font-size: 2em;
line-height: 1.3em;
@@ -117,11 +118,13 @@ div.messages /* Important messages (status, warning, and error) for the user. Se
div.status /* Normal priority messages */ {
}
-div.warning, tr.warning /* Medium priority messages */ {
+div.warning,
+tr.warning /* Medium priority messages */ {
/* border: 1px solid #f0c020; */ /* Drupal core uses: 1px solid #f0c020 */
}
-div.error, tr.error /* High priority messages. See also the .error declaration below. */ {
+div.error,
+tr.error /* High priority messages. See also the .error declaration below. */ {
}
.error /* Errors that are separate from div.messages status messages. */ {
@@ -169,7 +172,8 @@ ul.links li {
text-align: center;
}
-.pager a, .pager strong.pager-current /* Each page number in the pager list */ {
+.pager a,
+.pager strong.pager-current /* Each page number in the pager list */ {
padding: 0.5em;
}
diff --git a/STARTERKIT/css/print.css b/STARTERKIT/css/print.css
index b6887ed..a8e77d6 100644
--- a/STARTERKIT/css/print.css
+++ b/STARTERKIT/css/print.css
@@ -9,7 +9,8 @@
/* underline all links */
-a:link, a:visited {
+a:link,
+a:visited {
text-decoration: underline !important;
}
@@ -38,18 +39,31 @@ a:link, a:visited {
/* Turn off any background colors or images */
body,
-#page, #page-inner,
-#main, #main-inner,
-#content, #content-inner {
+#page,
+#page-inner,
+#main,
+#main-inner,
+#content,
+#content-inner {
color: #000;
background-color: transparent !important;
background-image: none !important;
}
/* Hide sidebars and nav elements */
-#skip-to-nav, #navbar, #sidebar-first, #sidebar-second, #footer,
-.breadcrumb, div.tabs, .links, .taxonomy,
-.book-navigation, .forum-topic-navigation, .pager, .feed-icons {
+#skip-to-nav,
+#navbar,
+#sidebar-first,
+#sidebar-second,
+#footer,
+.breadcrumb,
+div.tabs,
+.links,
+.taxonomy,
+.book-navigation,
+.forum-topic-navigation,
+.pager,
+.feed-icons {
visibility: hidden;
display: none;
}