Index: themes/bartik/template.php
===================================================================
RCS file: /cvs/drupal/drupal/themes/bartik/template.php,v
retrieving revision 1.5
diff -u -r1.5 template.php
--- themes/bartik/template.php	1 Sep 2010 02:13:58 -0000	1.5
+++ themes/bartik/template.php	2 Oct 2010 02:53:49 -0000
@@ -103,9 +103,8 @@
  * Override or insert variables into the block template.
  */
 function bartik_preprocess_block(&$variables) {
-  // In the header region, visually hide the title of any menu block or of the
-  // user login block, but leave it accessible.
-  if ($variables['block']->region == 'header' && ($variables['block']->module == 'user' && $variables['block']->delta == 'login' || in_array('block-menu', $variables['classes_array']))) {
+  // In the header region visually hide block titles.
+  if ($variables['block']->region == 'header') {
     $variables['title_attributes_array']['class'][] = 'element-invisible';
   }
 }
Index: themes/bartik/templates/page.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/themes/bartik/templates/page.tpl.php,v
retrieving revision 1.5
diff -u -r1.5 page.tpl.php
--- themes/bartik/templates/page.tpl.php	9 Sep 2010 15:27:08 -0000	1.5
+++ themes/bartik/templates/page.tpl.php	2 Oct 2010 02:53:50 -0000
@@ -87,7 +87,7 @@
 ?>
 <div id="page-wrapper"><div id="page">
 
-  <div id="header"><div class="section clearfix">
+  <div id="header" class="<?php print $secondary_menu ? 'with-secondary-menu': 'without-secondary-menu'; ?>"><div class="section clearfix">
 
     <?php if ($logo): ?>
       <a href="<?php print $front_page; ?>" title="<?php print t('Home'); ?>" rel="home" id="logo">
Index: themes/bartik/css/layout.css
===================================================================
RCS file: /cvs/drupal/drupal/themes/bartik/css/layout.css,v
retrieving revision 1.3
diff -u -r1.3 layout.css
--- themes/bartik/css/layout.css	9 Sep 2010 15:27:08 -0000	1.3
+++ themes/bartik/css/layout.css	2 Oct 2010 02:53:49 -0000
@@ -15,10 +15,21 @@
 }
 #header div.section {
   position: relative;
+  width: 940px;
+}
+.region-header {
+  float: right; /* LTR */
+  margin-bottom: 10px;
+}
+.with-secondary-menu .region-header {
+  margin-top: 3em;
+}
+.without-secondary-menu .region-header {
+  margin-top: 15px;
 }
 #secondary-menu {
   position: absolute;
-  right: 0;
+  right: 0; /* LTR */
   top: 0;
   width: 480px;
 }
Index: themes/bartik/css/style.css
===================================================================
RCS file: /cvs/drupal/drupal/themes/bartik/css/style.css,v
retrieving revision 1.18
diff -u -r1.18 style.css
--- themes/bartik/css/style.css	1 Oct 2010 07:05:22 -0000	1.18
+++ themes/bartik/css/style.css	2 Oct 2010 02:53:49 -0000
@@ -268,11 +268,14 @@
   float: left; /* LTR */
   padding: 15px 30px 15px 0; /* LTR */
 }
+#name-and-slogan {
+  float: left; /* LTR */
+}
 #name-and-slogan,
 #preview #preview-header #preview-name-and-slogan {
   padding-top: 34px;
   margin-bottom: 30px;
-  margin-left: 15px;
+  margin-left: 15px;  /* LTR */
 }
 #site-name,
 #preview #preview-header #preview-site-name {
@@ -294,102 +297,113 @@
   word-spacing: 0.1em;
   font-style: italic;
 }
-/* Menus when in the header region. */
-#header .block-menu {
-  height: 1.1em;
-  margin: 10px 0;
+/* Region header blocks. */
+.region-header .block {
   float: left; /* LTR */
-  width: 75%;
+  margin: 0 5px;
+  padding: 0;
 }
-#header .block ul, /* Any menu block in the header region. */
-#header .block li {
-  list-style: none;
+.region-header .block .content {
   margin: 0;
   padding: 0;
 }
-#header .block-menu li a {
-  float: left; /* LTR */
-  padding: 0 12px;
-  display: block;
-  border-right: 1px solid #555; /* LTR */
-}
-#header .block-menu li.first a {
-  padding-left: 0; /* LTR */
+.region-header .block ul {
+  margin: 0;
+  padding: 0;
 }
-#header .block-menu li.last a {
-  padding-right: 0; /* LTR */
-  border-right: none; /* LTR */
+.region-header .block li {
+  list-style: none;
+  list-style-image: none;
+  padding: 0;
 }
-#header #block-search-form { /* Search block in the Header region. */
-  float: right; /* LTR */
-  width: 24%;
-  margin: 8px 0;
+.region-header .form-text {
+  background: #fefefe;
+  background: rgba(255, 255, 255, 0.8);
+  border-color: #ccc;
+  border-color: rgba(255, 255, 255, 0.6);
+  margin-right: 2px; /* LTR */
+  width: 120px;
+}
+/* Region header block menus. */
+.region-header .block-menu {
+  border: 1px solid rgba(255, 255, 255, 0.2);
+  font-size: 0.857em;
+  padding: 0;
+  width: 208px;
 }
-#header #block-user-login { /* Login block in the Header region. */
+.region-header .block-menu li a {
   display: block;
-  position: absolute;
-  top: 0;
-  right: 2%; /* LTR */
-  background: #464748;
-  color: #fff;
-  float: right; /* LTR */
-  padding: 4px 10px 5px;
-  text-transform: uppercase;
-  font-size: 0.857em;
+  border-bottom: 1px solid rgba(255, 255, 255, 0.2);
+  padding: 3px 7px;
 }
-#header #block-user-login a {
-  color: #fff;
-  font-size: 0.929em;
+.region-header .block-menu li a:hover,
+.region-header .block-menu li a:focus,
+.region-header .block-menu li a:active {
+  text-decoration: none;
+  background: rgba(255, 255, 255, 0.15)
 }
-#header #block-user-login .form-item label {
-  display: inline;
-  font-weight: normal;
+.region-header .block-menu li.last a {
+  border-bottom: 0;
 }
-#header #block-user-login .form-item {
-  display: inline;
-  font-weight: normal;
+/* User Login block in the header region */
+.region-header #block-user-login {
+  font-size: 0.857em;
+  width: auto;
 }
-#header #block-user-login .form-text {
-  margin-right: 5px; /* LTR */
+.region-header #block-user-login .form-item {
+ float: left; /* LTR */
+ margin: 0;
+ padding: 0;
 }
-#header #block-user-login .form-item label .form-required {
-  display: none;
+.region-header #block-user-login .form-item label .form-required {
+  color: #fff;
+  color: rgba(255, 255, 255, 0.6);
 }
-#header #block-user-login div.item-list,
-#header #block-user-login .item-list ul {
-  display: inline;
+.region-header #block-user-login div.item-list,
+.region-header #block-user-login div.description {
+  font-size: 0.916em;
+  margin: 0;
+}
+.region-header #block-user-login div.item-list {
+  clear: both;
 }
-#header #block-user-login .item-list ul li {
+.region-header #block-user-login div.description {
   display: inline;
-  margin: 0 5px 0 15px; /* LTR */
 }
-#header #block-user-login div.item-list {
-  margin-top: 5px;
-  font-style: italic;
-  font-size: 1.3em;
-  text-transform: none;
+.region-header #block-user-login .item-list ul {
+  padding: 0;
+  line-height: 1;
 }
-#header #block-user-login .userbox {
-  margin-left: 10px; /* LTR */
+.region-header #block-user-login .item-list li {
+  list-style: none;
+  float: left;
+  padding: 3px 0 1px;
 }
-#header #block-user-login input.form-submit {
-  color: #fff;
-  background: #929599;
-  border: 1px solid #73767c;
-  padding: 1px;
-  text-transform: uppercase;
-  margin-top: 1px;
-  position: relative;
-  display: inline;
+.region-header #block-user-login .item-list li.last {
+  padding-left: 0.5em; /* LTR */
 }
-#header #block-user-login #user-login-form div.item-list { /* Hide create new account + email replacement password links. */
-  display: none;
+.region-header #block-user-login ul.openid-links li.last {
+  padding-left: 0; /* LTR */
+}
+.region-header #block-user-login .form-actions {
+  margin: 4px 0 0;
+  padding: 0;
+  clear: both
+}
+.region-header #block-user-login input.form-submit {
+  border: 1px solid;
+  border-color: #ccc;
+  border-color: rgba(255, 255, 255, 0.6);
+  background: #eee;
+  background: rgba(255, 255, 255, 0.7);
+  margin: 4px 0;
+  padding: 3px 8px;
 }
 
 /* --------------- Main Menu ------------ */
 
 #main-menu {
-  padding: 0 15px;
+  padding: 0;
   clear: both;
 }
 #main-menu-links a {