- Patch #231115 by Stefan: various Garland clean-ups.

6 files changed, 43 insertions, 19 deletions

diff --git a/themes/garland/fix-ie-rtl.css b/themes/garland/fix-ie-rtl.css
index 370d7a821..d08129858 100644
--- a/themes/garland/fix-ie-rtl.css
+++ b/themes/garland/fix-ie-rtl.css
@@ -1,10 +1,14 @@
 /* $Id$ */
 
+/**
+ * Garland, for Drupal 7.0
+ * Stefan Nagtegaal, robuustdesign [dot] nl
+ * Steven Wittens, acko [dot] net
+ */
+
 body {
   /* Center layout */
   text-align: center;
-  /* Allow text resizing */
-  font-size: 80%;
 }
 
 #squeeze {
diff --git a/themes/garland/fix-ie.css b/themes/garland/fix-ie.css
index fa5ff7c52..9fcbe0a68 100644
--- a/themes/garland/fix-ie.css
+++ b/themes/garland/fix-ie.css
@@ -1,16 +1,14 @@
 /* $Id$ */
 
 /**
- * Garland, for Drupal 5.0
- * Stefan Nagtegaal, iStyledThis [dot] nl
+ * Garland, for Drupal 7.0
+ * Stefan Nagtegaal, robuustdesign [dot] nl
  * Steven Wittens, acko [dot] net
  */
 
 body {
   /* Center layout */
   text-align: center;
-  /* Allow text resizing */
-  font-size: 80%;
 }
 
 #header-region, #wrapper #container {
diff --git a/themes/garland/minnelli/minnelli.css b/themes/garland/minnelli/minnelli.css
index 5a3a7391d..a5abb759c 100644
--- a/themes/garland/minnelli/minnelli.css
+++ b/themes/garland/minnelli/minnelli.css
@@ -1,8 +1,8 @@
 /* $Id$ */
 
 /**
- * Minnelli, for Drupal 5.0
- * Stefan Nagtegaal, iStyledThis [dot] nl
+ * Minnelli, for Drupal 7.0
+ * Stefan Nagtegaal, robuustdesign [dot] nl
  * Steven Wittens, acko [dot] net
  */
 
diff --git a/themes/garland/print.css b/themes/garland/print.css
index 86583c4df..8615a83a7 100644
--- a/themes/garland/print.css
+++ b/themes/garland/print.css
@@ -12,6 +12,8 @@
 body, input, textarea, select {
   color: #000;
   background: none;
+  font-family: Verdana, sans-serif;
+  font-size: 11pt;
 }
 
 ul.primary-links, ul.secondary-links,
@@ -19,7 +21,7 @@ ul.primary-links, ul.secondary-links,
   display: none;
 }
 
-body.sidebars, body.sideber-left, body.sidebar-right, body {
+body.sidebars, body.sidebar-left, body.sidebar-right, body {
   width: 640px;
 }
 
diff --git a/themes/garland/style-rtl.css b/themes/garland/style-rtl.css
index 791abf243..34a1f1820 100644
--- a/themes/garland/style-rtl.css
+++ b/themes/garland/style-rtl.css
@@ -1,5 +1,11 @@
 /* $Id$ */
 
+/**
+ * Garland, for Drupal 7.0
+ * Stefan Nagtegaal, robuustdesign [dot] nl
+ * Steven Wittens, acko [dot] net
+ */
+
 html {
   direction: rtl;
 }
@@ -30,7 +36,7 @@ ol li, ul li, ul.menu li, .item-list ul li, li.leaf {
 
 ul li, ul.menu li, .item-list ul li, li.leaf {
   padding: 0 1.5em .2em 0;
-  background: transparent url("images/menu-leaf.gif") no-repeat 100% .35em;
+  background: transparent url("images/menu-leaf.gif") no-repeat 100% .5em;
 }
 
 ol li {
@@ -43,7 +49,7 @@ ul li.expanded {
 }
 
 ul li.collapsed {
-  background: transparent url("images/menu-collapsed-rtl.gif") no-repeat 100% .35em;
+  background: transparent url("images/menu-collapsed-rtl.gif") no-repeat 100% .4em;
 }
 
 ul.inline li {
@@ -83,6 +89,10 @@ dl dd {
   margin: 0 1.5em .5em 0;
 }
 
+.messages li {
+  padding: 0 1.3 0 0;
+}
+
 .form-button, .form-submit {
   margin: 2em 0 1em 0.5em;
 }
diff --git a/themes/garland/style.css b/themes/garland/style.css
index 8df698ba3..b77232bc6 100644
--- a/themes/garland/style.css
+++ b/themes/garland/style.css
@@ -1,8 +1,8 @@
 /* $Id$ */
 
 /**
- * Garland, for Drupal 5.0
- * Stefan Nagtegaal, iStyledThis [dot] nl
+ * Garland, for Drupal 7.0
+ * Stefan Nagtegaal, robuustdesign [dot] nl
  * Steven Wittens, acko [dot] net`
  *
  * If you use a customized color scheme, you must regenerate it after
@@ -16,17 +16,17 @@ body {
   margin: 0;
   padding: 0;
   background: #edf5fa;
-  font: 12px/170% Verdana, sans-serif;
+  font: 76%/170% Verdana, sans-serif;
   color: #494949;
 }
 
 input {
-  font: 12px/100% Verdana, sans-serif;
+  font: 1em/100% Verdana, sans-serif;
   color: #494949;
 }
 
 textarea, select {
-  font: 12px/160% Verdana, sans-serif;
+  font: 1em/160% Verdana, sans-serif;
   color: #494949;
 }
 
@@ -124,7 +124,7 @@ ul li, ul.menu li, .item-list ul li, li.leaf {
   padding: 0 0 .2em 1.5em;
   list-style-type: none;
   list-style-image: none;
-  background: transparent url(images/menu-leaf.gif) no-repeat 1px .35em; /* LTR */
+  background: transparent url(images/menu-leaf.gif) no-repeat 1px .5em; /* LTR */
 }
 
 ol li {
@@ -137,7 +137,7 @@ ul li.expanded {
 }
 
 ul li.collapsed {
-  background: transparent url(images/menu-collapsed.gif) no-repeat 0px .35em; /* LTR */
+  background: transparent url(images/menu-collapsed.gif) no-repeat 0px .4em; /* LTR */
 }
 
 ul li.leaf a, ul li.expanded a, ul li.collapsed a {
@@ -265,15 +265,25 @@ span.submitted, .description {
   color: #898989;
 }
 
-.messages, .preview {
+.preview {
   margin: .75em 0 .75em;
   padding: .5em 1em;
 }
 
+.messages {
+  margin: .75em 0 .75em;
+  padding: .1em .5em .15em;
+}
+
 .messages ul {
   margin: 0;
 }
 
+.messages li {
+  margin: 0;
+  padding: 0 0 0 1.3em; /* LTR */
+}
+
 .form-checkboxes, .form-radios, .form-checkboxes .form-item, .form-radios .form-item {
   margin: 0.25em 0;
 }