Index: page.tpl.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/themes/rootcandy/page.tpl.php,v
retrieving revision 1.23.2.19
diff -u -p -r1.23.2.19 page.tpl.php
--- page.tpl.php	23 Apr 2010 19:29:53 -0000	1.23.2.19
+++ page.tpl.php	23 Apr 2010 20:51:21 -0000
@@ -1,5 +1,5 @@
 <?php
-// $Id: page.tpl.php,v 1.23.2.19 2010/04/23 19:29:53 sign Exp $
+// $Id: page.tpl.php,v 1.23.2.18 2010/03/27 15:53:20 sign Exp $
 
 ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
@@ -45,7 +45,7 @@
     <?php } ?>
     <div id="page-wrapper"><div id="page-wrapper-content">
       <?php print $header ?>
-      <div id="navigation" <?php if (!$hide_header) print 'class="header-on"' ?>>
+      <div id="navigation" class="clearfix<?php print $rootcandy_navigation_class ?>">
         <?php print $rootcandy_navigation ?>
 
       <?php
Index: style.css
===================================================================
RCS file: /cvs/drupal-contrib/contributions/themes/rootcandy/style.css,v
retrieving revision 1.33.2.38
diff -u -p -r1.33.2.38 style.css
--- style.css	29 Mar 2010 14:46:50 -0000	1.33.2.38
+++ style.css	23 Apr 2010 20:51:23 -0000
@@ -116,18 +116,22 @@ h1 {
 /*
  * Main navigation tabs
  */
-
 .rootcandyspan {
   padding: 0 5px;
 }
 
+/* top navigation */
 #navigation {
-  float: left;
   width: 100%;
+  line-height: normal;
+  position: relative;
+  min-height: 24px;
+  height:auto !important;
+  height: 24px;
+  padding-top: 28px;
   background: url(images/navigation_bg.png) repeat-x bottom;
   background-color: #b2c8d3;
   color: #b2c8d3;
-  padding-top: 0px;
 }
 
 #navigation .item-list {
@@ -139,14 +143,30 @@ h1 {
   padding-top: 26px;
 }
 
-#navigation .item-list ul li {
-  list-style-type: none;
+#navigation.i16 {
+  min-height: 44px;
+  height:auto !important;
+  height: 44px;
+}
+
+#navigation.i24 {
+  min-height: 50px;
+  height:auto !important;
+  height: 50px;
+}
+
+#navigation.i32 {
+  min-height: 58px;
+  height:auto !important;
+  height: 58px;
 }
 
 #navigation ul {
   margin: 0;
   padding: 5px 10px 0;
   list-style: none;
+  position: absolute;
+  bottom: 0;
 }
 
 #navigation li {
@@ -154,6 +174,7 @@ h1 {
   margin: 0;
   padding: 0 0 0 5px;
   text-align: center;
+  list-style-type: none;
 }
 
 #navigation a {
@@ -165,28 +186,10 @@ h1 {
   color: #000;
 }
 
-/* Commented Backslash Hack hides rule from IE5-Mac \*/
-#navigation a {
-  float: none;
-}
-/* End IE5-Mac hack */
-
 #navigation a:hover {
   color: #c0c0c0;
 }
 
-#navigation #current {
-  background: url(images/tabs/tableft_small.png) no-repeat left top;
-  position: relative;
-  top: 0px;
-}
-
-#navigation #current a {
-  background: url(images/tabs/tabright_small.png) no-repeat right top;
-  color: #027ac6;
-  padding-bottom: 3px;
-}
-
 #navigation #current-32 {
   background: url(images/tabs/tableft_big.png) no-repeat left top;
   position: relative;
@@ -211,22 +214,21 @@ h1 {
   padding-bottom: 3px;
 }
 
-#navigation ul.i16 #current-16 a {
-  padding-bottom: 8px;
+#navigation #current {
+  background: url(images/tabs/tableft_small.png) no-repeat left top;
+  position: relative;
+  top: 0px;
 }
 
-#navigation ul.i32 #current-32 a {
-  padding-bottom: 0px;
+#navigation #current a {
+  background: url(images/tabs/tabright_small.png) no-repeat right top;
+  color: #027ac6;
+  padding-bottom: 3px;
 }
 
 #navigation #logo {
   float: right;
-  margin-right: 20px;
-}
-
-#logo {
-  float: right;
-  padding-right: 10px;
+  padding: 5px 20px 5px 5px;
 }
 
 .content-in {
Index: template.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/themes/rootcandy/template.php,v
retrieving revision 1.36.2.45
diff -u -p -r1.36.2.45 template.php
--- template.php	23 Apr 2010 19:29:53 -0000	1.36.2.45
+++ template.php	23 Apr 2010 20:51:23 -0000
@@ -1,5 +1,5 @@
 <?php
-// $Id: template.php,v 1.36.2.45 2010/04/23 19:29:53 sign Exp $
+// $Id: template.php,v 1.36.2.43 2010/03/27 15:53:20 sign Exp $
 
 /**
  * @file
@@ -145,7 +145,7 @@ function _rootcandy_admin_navigation() {
 }
 
 function rootcandy_admin_navigation($items, $class) {
-  return theme('item_list', $items, NULL, 'ul', array('class' => $class));
+  return theme('item_list', $items);
 }
 
 function _rootcandy_besturlmatch($needle, $menuitems) {
@@ -259,6 +259,23 @@ function rootcandy_preprocess_page(&$var
   }
 
   $vars['body_class'] = rootcandy_body_class($vars['admin_left'], $vars['admin_right']);
+
+  $icons_disabled = theme_get_setting('rootcandy_navigation_icons');
+  $rootcandy_navigation_class = array();
+
+  if (!$icons_disabled) {
+    $rootcandy_navigation_class[] = 'i'.theme_get_setting('rootcandy_navigation_icons_size');
+  }
+
+  if (!$vars['hide_header']) {
+    $rootcandy_navigation_class[] = 'header-on';
+  }
+
+  $vars['rootcandy_navigation_class'] = '';
+
+  if ($rootcandy_navigation_class) {
+    $vars['rootcandy_navigation_class'] .= ' '. implode(' ', $rootcandy_navigation_class);
+  }
 }
 
 function rootcandy_admin_block_content($content) {
