? .buildpath
? .project
? .settings
? 563390-seven-style-followup.patch
? 563390-seven-style_2.patch
? 563390-seven-style_3.patch
? 563390-seven-style_4.patch
? 563390-seven-style_6.patch
? 563390-seven-style_7.patch
? 563390-seven-style_8.patch
? 594412-superuser-permission-warnings.patch
? 674394-add-shortcut-garland-style.patch
? 676058_taxonomytermedit.patch
? 676800-seven-fieldset-19.patch
? drupal_add_action_1.patch
? orderofcategories.patch
? orderofcategories_1.patch
? overlaykeyhandlers.patch
? overlaykeyhandlers_0.patch
? overlaykeyhandlers_1.patch
? overlaykeyhandlers_2.patch
? overlayloading_1.patch
? overlayloading_4.patch
? overlayloadinggraphic.patch
? seven-ui-9.patch
? sevenfieldset-1_0.patch
? shortcuteditlink_0.patch
? shortcuteditlink_1.patch
? modules/comment/.comment.admin.inc.swp
Index: themes/garland/page.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/themes/garland/page.tpl.php,v
retrieving revision 1.41
diff -u -p -r1.41 page.tpl.php
--- themes/garland/page.tpl.php	4 Jan 2010 03:57:19 -0000	1.41
+++ themes/garland/page.tpl.php	10 Jan 2010 10:13:15 -0000
@@ -41,14 +41,16 @@
           <?php print $breadcrumb; ?>
           <?php if ($page['highlight']): ?><div id="highlight"><?php render($page['highlight']); ?></div><?php endif; ?>
           <a id="main-content"></a>
-          <?php if ($tabs): ?><div id="tabs-wrapper" class="clearfix"><?php endif; ?>
-          <?php print render($title_prefix); ?>
-          <?php if ($title): ?>
-            <h1<?php print $tabs ? ' class="with-tabs"' : '' ?>><?php print $title ?></h1>
-          <?php endif; ?>
-          <?php print render($title_suffix); ?>
-          <?php if ($tabs): ?><ul class="tabs primary"><?php print render($tabs) ?></ul></div><?php endif; ?>
-          <?php if ($tabs2): ?><ul class="tabs secondary"><?php print render($tabs2) ?></ul><?php endif; ?>
+          <div id="page-title" class="clearfix">
+            <?php if ($tabs): ?><div id="tabs-wrapper" class="clearfix"><?php endif; ?>
+            <?php print render($title_prefix); ?>
+            <?php if ($title): ?>
+              <h1 class="page-title<?php print $tabs ? ' with-tabs' : '' ?>"><?php print $title ?></h1>
+            <?php endif; ?>
+            <?php print render($title_suffix); ?>
+            <?php if ($tabs): ?><ul class="tabs primary"><?php print render($tabs) ?></ul></div><?php endif; ?>
+            <?php if ($tabs2): ?><ul class="tabs secondary"><?php print render($tabs2) ?></ul><?php endif; ?>
+          </div>
           <?php print $messages; ?>
           <?php print render($page['help']); ?>
           <?php if ($action_links): ?><ul class="action-links"><?php print render($action_links); ?></ul><?php endif; ?>
Index: themes/garland/style.css
===================================================================
RCS file: /cvs/drupal/drupal/themes/garland/style.css,v
retrieving revision 1.72
diff -u -p -r1.72 style.css
--- themes/garland/style.css	2 Dec 2009 07:28:22 -0000	1.72
+++ themes/garland/style.css	10 Jan 2010 10:13:16 -0000
@@ -585,6 +585,13 @@ body.overlay {
 }
 
 /**
+ * Page title.
+ */
+h1.page-title {
+  float:left;
+}
+
+/**
  * Primary navigation
  */
 ul.main-menu {
@@ -665,7 +672,7 @@ ul.primary, ul.primary li, ul.secondary,
 }
 ul.primary {
   padding: 0.5em 0 10px;
-  float: left; /* LTR */
+  float: right; /* LTR */
 }
 ul.secondary {
   clear: both;
@@ -675,9 +682,7 @@ ul.secondary {
   padding: 0 26px 0.6em;
 }
 h1.with-tabs {
-  float: left; /* LTR */
-  margin: 0 2em 0 0; /* LTR */
-  padding: 0;
+  float: left;
 }
 
 ul.primary li a, ul.primary li.active a, ul.primary li a:hover, ul.primary li a:visited,
@@ -1189,3 +1194,10 @@ table.system-status-report tr.ok, table.
   background-color: #dfd;
   border-color: #beb;
 }
+
+/* Shortcut theming */
+div.add-or-remove-shortcuts {
+  float: left;
+  padding-top: 6px;
+  padding-left: 6px;
+}