### Eclipse Workspace Patch 1.0
#P Drupal7
Index: themes/garland/style.css
===================================================================
RCS file: /cvs/drupal/drupal/themes/garland/style.css,v
retrieving revision 1.54
diff -u -r1.54 style.css
--- themes/garland/style.css	26 Apr 2009 15:01:06 -0000	1.54
+++ themes/garland/style.css	5 May 2009 16:28:26 -0000
@@ -32,7 +32,8 @@
   font-size: 170%;
 }
 
-h2 {
+h2,
+#center h1 {
   font-size: 160%;
   line-height: 130%;
 }
@@ -355,18 +356,18 @@
   position: absolute;
 }
 
-#wrapper #container #header h1, #wrapper #container #header h1 a:link, #wrapper #container #header h1 a:visited {
+#branding, #branding a:link, #branding a:visited {
   line-height: 120px;
   position: relative;
   z-index: 2;
   white-space: nowrap;
 }
 
-#wrapper #container #header h1 span {
+#branding span {
   font-weight: bold;
 }
 
-#wrapper #container #header h1 img {
+#branding img {
   padding-top: 16px;
   padding-right: 20px; /* LTR */
   float: left; /* LTR */
@@ -501,14 +502,21 @@
 /**
  * Header
  */
-#wrapper #container #header h1, #wrapper #container #header h1 a:link, #wrapper #container #header h1 a:visited {
-  color: #fff;
+div#branding {
+  font-family: Helvetica,Arial,sans-serif;
+}
+
+div#branding strong {
   font-weight: normal;
+}
+
+#branding, #branding a:link, #branding a:visited {
+  color: #fff;
   text-shadow: #1659ac 0px 1px 3px;
   font-size: 1.5em;
 }
 
-#wrapper #container #header h1 a:hover {
+#branding a:hover {
   text-decoration: none;
 }
 
@@ -617,7 +625,7 @@
   margin: -0.2em -26px 1em;
   padding: 0 26px 0.6em;
 }
-h2.with-tabs {
+h1.with-tabs {
   float: left; /* LTR */
   margin: 0 2em 0 0; /* LTR */
   padding: 0;
Index: themes/garland/style-rtl.css
===================================================================
RCS file: /cvs/drupal/drupal/themes/garland/style-rtl.css,v
retrieving revision 1.12
diff -u -r1.12 style-rtl.css
--- themes/garland/style-rtl.css	11 Apr 2009 22:19:46 -0000	1.12
+++ themes/garland/style-rtl.css	5 May 2009 16:28:26 -0000
@@ -80,7 +80,7 @@
   background: #edf5fa url("images/body.png") repeat-x 50% 0;
 }
 
-#wrapper #container #header h1 img {
+#branding img {
   padding-right: 0;
   padding-left: 20px;
   float: right;
@@ -112,7 +112,7 @@
  */
 ul.main-menu {
   float: left;
-width:70%;
+  width: 70%;
 }
 
 ul.main-menu li {
@@ -138,7 +138,7 @@
   clear: both;
   text-align: right;
 }
-h2.with-tabs {
+h1.with-tabs {
   float: right;
   margin: 0 0 0 2em;
 }
Index: themes/garland/page.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/themes/garland/page.tpl.php,v
retrieving revision 1.24
diff -u -r1.24 page.tpl.php
--- themes/garland/page.tpl.php	18 Feb 2009 14:28:25 -0000	1.24
+++ themes/garland/page.tpl.php	5 May 2009 16:28:26 -0000
@@ -23,12 +23,21 @@
       <div id="header">
         <div id="logo-floater">
         <?php if ($logo || $site_title): ?>
-          <h1><a href="<?php print $front_page ?>" title="<?php print $site_title ?>">
-          <?php if ($logo): ?>
-            <img src="<?php print $logo ?>" alt="<?php print $site_title ?>" id="logo" />
+          <?php if ($title): ?>
+            <div id="branding"><strong><a href="<?php print $front_page ?>" title="<?php print $site_title ?>">
+            <?php if ($logo): ?>
+              <img src="<?php print $logo ?>" alt="<?php print $site_title ?>" id="logo" />
+            <?php endif; ?>
+            <?php print $site_html ?>
+            </a></strong></div>           
+          <?php else: /* Use h1 when the content title is empty */ ?>  
+            <h1 id="branding"><a href="<?php print $front_page ?>" title="<?php print $site_title ?>">
+            <?php if ($logo): ?>
+              <img src="<?php print $logo ?>" alt="<?php print $site_title ?>" id="logo" />
+            <?php endif; ?>
+            <?php print $site_html ?>
+            </a></h1>
           <?php endif; ?>
-          <?php print $site_html ?>
-          </a></h1>
         <?php endif; ?>
         </div>
 
@@ -47,7 +56,7 @@
           <?php print $breadcrumb; ?>
           <?php if ($mission): ?><div id="mission"><?php print $mission ?></div><?php endif; ?>
           <?php if ($tabs): ?><div id="tabs-wrapper" class="clearfix"><?php endif; ?>
-          <?php if ($title): ?><h2<?php print $tabs ? ' class="with-tabs"' : '' ?>><?php print $title ?></h2><?php endif; ?>
+          <?php if ($title): ?><h1<?php print $tabs ? ' class="with-tabs"' : '' ?>><?php print $title ?></h1><?php endif; ?>
           <?php if ($tabs): ?><ul class="tabs primary"><?php print $tabs ?></ul></div><?php endif; ?>
           <?php if ($tabs2): ?><ul class="tabs secondary"><?php print $tabs2 ?></ul><?php endif; ?>
           <?php if ($show_messages && $messages): print $messages; endif; ?>
Index: themes/garland/maintenance-page.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/themes/garland/maintenance-page.tpl.php,v
retrieving revision 1.8
diff -u -r1.8 maintenance-page.tpl.php
--- themes/garland/maintenance-page.tpl.php	18 Feb 2009 14:28:25 -0000	1.8
+++ themes/garland/maintenance-page.tpl.php	5 May 2009 16:28:25 -0000
@@ -50,7 +50,7 @@
           $site_html = implode(' ', $site_fields);
 
           if ($logo || $site_title) {
-            print '<h1><a href="' . $base_path . '" title="' . $site_title . '">';
+            print '<h1 id="branding"><a href="' . $base_path . '" title="' . $site_title . '">';
             if ($logo) {
               print '<img src="' . $logo . '" alt="' . $site_title . '" id="logo" />';
             }