From 687ade1998e7b6ab6d15d670eb0a52b98b9a1ae5 Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Fri, 5 Nov 2010 01:25:33 +0000
Subject: - Patch  #960490 by Jacine: regression: ul.links generated by
 theme_links() always appears as .inline.

---
 modules/system/page.tpl.php     | 4 ++--
 modules/system/system.menus.css | 8 +++-----
 2 files changed, 5 insertions(+), 7 deletions(-)

(limited to 'modules')

diff --git a/modules/system/page.tpl.php b/modules/system/page.tpl.php
index 94cd24f3d..704ec5c30 100644
--- a/modules/system/page.tpl.php
+++ b/modules/system/page.tpl.php
@@ -104,8 +104,8 @@
 
     <?php if ($main_menu || $secondary_menu): ?>
       <div id="navigation"><div class="section">
-        <?php print theme('links__system_main_menu', array('links' => $main_menu, 'attributes' => array('id' => 'main-menu', 'class' => array('links', 'clearfix')), 'heading' => t('Main menu'))); ?>
-        <?php print theme('links__system_secondary_menu', array('links' => $secondary_menu, 'attributes' => array('id' => 'secondary-menu', 'class' => array('links', 'clearfix')), 'heading' => t('Secondary menu'))); ?>
+        <?php print theme('links__system_main_menu', array('links' => $main_menu, 'attributes' => array('id' => 'main-menu', 'class' => array('links', 'inline', 'clearfix')), 'heading' => t('Main menu'))); ?>
+        <?php print theme('links__system_secondary_menu', array('links' => $secondary_menu, 'attributes' => array('id' => 'secondary-menu', 'class' => array('links', 'inline', 'clearfix')), 'heading' => t('Secondary menu'))); ?>
       </div></div> <!-- /.section, /#navigation -->
     <?php endif; ?>
 
diff --git a/modules/system/system.menus.css b/modules/system/system.menus.css
index e5030befe..ec9003b87 100644
--- a/modules/system/system.menus.css
+++ b/modules/system/system.menus.css
@@ -44,14 +44,12 @@ td.menu-disabled {
 /**
  * Markup generated by theme_links().
  */
-ul.links {
-  margin: 0;
-  padding: 0;
-}
+ul.inline,
 ul.links.inline {
   display: inline;
+  padding-left: 0;
 }
-ul.links li {
+ul.inline li {
   display: inline;
   list-style-type: none;
   padding: 0 0.5em;
-- 
cgit v1.2.3