
---
 themes/bartik/bartik.info            |    4 +-
 themes/bartik/css/style.css          |   51 ++++++++++++++++++++++------------
 themes/bartik/template.php           |    6 +++-
 themes/bartik/templates/page.tpl.php |    3 +-
 4 files changed, 42 insertions(+), 22 deletions(-)

diff --git a/themes/bartik/bartik.info b/themes/bartik/bartik.info
index b21b82b..0318cdd 100644
--- a/themes/bartik/bartik.info
+++ b/themes/bartik/bartik.info
@@ -14,7 +14,8 @@ stylesheets[print][] = css/print.css
 
 scripts[] = scripts/search.js
 
-regions[header] = Header
+regions[header_left] = Header left
+regions[header_right] = Header right
 regions[help] = Help
 regions[page_top] = Page top
 regions[page_bottom] = Page bottom
@@ -43,4 +44,3 @@ version = "7.x-dev"
 core = "7.x"
 project = "drupal"
 datestamp = "1282824420"
-
diff --git a/themes/bartik/css/style.css b/themes/bartik/css/style.css
index 4a06dce..a823c47 100644
--- a/themes/bartik/css/style.css
+++ b/themes/bartik/css/style.css
@@ -217,10 +217,11 @@ ul.tips {
 #header #logo,
 #preview #preview-header #preview-logo {
   float: left; /* LTR */
-  padding: 15px 30px 15px 0; /* LTR */
+  margin: 15px 15px 15px 0; /* LTR */
 }
 #header #name-and-slogan,
 #preview #preview-header #preview-name-and-slogan {
+  float: left;
   padding-top: 38px;
   margin-bottom: 30px;
   margin-left: 15px;
@@ -244,13 +245,28 @@ ul.tips {
   word-spacing: 0.1em;
   font-style: italic;
 }
+.region-header-left {
+  width: 480px;
+  float: left;
+  clear: left;
+}
+.region-header-right {
+  width: 480px;
+  float: right;
+}
 /* Menus when in the header region. */
 #header .block-menu {
+  width: 100%;
   height: 1.1em;
-  margin: 10px 0;
   font-size: 120%;
-  float: left; /* LTR */
-  width: 75%;
+  clear: left;
+  margin-bottom: 1em;
+}
+#header .block-menu:last-child {
+  margin-bottom: 1.6em;
+}
+#header .block-menu .content {
+  margin: 0;
 }
 #header .block ul, /* Any menu block in the header region. */
 #header .block li {
@@ -272,20 +288,16 @@ ul.tips {
   border-right: none; /* LTR */
 }
 #header #block-search-form { /* Search block in the Header region. */
+  width: 35%;
   float: right; /* LTR */
-  width: 24%;
   margin: 8px 0;
 }
 #header #block-user-login { /* Login block in the Header region. */
   display: block;
-  position: absolute;
-  top: 0;
-  right: 2%; /* LTR */
-  background: #464748;
+  background: transparent;
   color: #fff;
   float: right; /* LTR */
-  font-size: 13px;
-  padding: 4px 10px 5px;
+  padding: 5px 0;
   text-transform: uppercase;
   font-size: 80%;
 }
@@ -324,15 +336,18 @@ ul.tips {
 #header #block-user-login .userbox {
   margin-left: 10px; /* LTR */
 }
+#header #block-user-login .form-actions {
+  display: inline;
+  padding-top: 4px;
+}
 #header #block-user-login input.form-submit {
-  color: #fff;
-  background: #929599;
-  border: 1px solid #73767c;
-  padding: 1px;
+  color: #333;
   text-transform: uppercase;
-  margin-top: 1px;
-  position: relative;
-  display: inline;
+  text-shadow: 0 1px #eee;
+  margin: 0;
+  padding: 4px 5px;
+  border: none;
+  background: rgba(255, 255, 255, 0.7);
 }
 #header #block-user-login #user-login-form div.item-list { /* Hide create new account + email replacement password links. */
   display: none;
diff --git a/themes/bartik/template.php b/themes/bartik/template.php
index b75c749..a5b32f1 100644
--- a/themes/bartik/template.php
+++ b/themes/bartik/template.php
@@ -105,7 +105,11 @@ function bartik_process_maintenance_page(&$variables) {
 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']))) {
+  $header_regions = array(
+    'header_left',
+    'header_right',
+  );
+  if (in_array($variables['block']->region, $header_regions) && ($variables['block']->module == 'user' && $variables['block']->delta == 'login' || in_array('block-menu', $variables['classes_array']))) {
     $variables['title_attributes_array']['class'][] = 'element-invisible';
   }
   // Set "first" and "last" classes.
diff --git a/themes/bartik/templates/page.tpl.php b/themes/bartik/templates/page.tpl.php
index 8b70a21..33b4707 100644
--- a/themes/bartik/templates/page.tpl.php
+++ b/themes/bartik/templates/page.tpl.php
@@ -121,7 +121,8 @@
       </div> <!-- /#name-and-slogan -->
     <?php endif; ?>
 
-    <?php print render($page['header']); ?>
+    <?php print render($page['header_right']); ?>
+    <?php print render($page['header_left']); ?>
 
     <?php if ($main_menu): ?>
       <div id="navigation"><div class="section clearfix">
-- 
1.7.1.1

