diff options
| -rw-r--r-- | modules/system/page.tpl.php | 4 | ||||
| -rw-r--r-- | modules/system/system.menus.css | 8 | ||||
| -rw-r--r-- | themes/bartik/templates/page.tpl.php | 4 | ||||
| -rw-r--r-- | themes/garland/template.php | 4 |
4 files changed, 9 insertions, 11 deletions
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; diff --git a/themes/bartik/templates/page.tpl.php b/themes/bartik/templates/page.tpl.php index 879923452..e03c76452 100644 --- a/themes/bartik/templates/page.tpl.php +++ b/themes/bartik/templates/page.tpl.php @@ -129,7 +129,7 @@ 'links' => $main_menu, 'attributes' => array( 'id' => 'main-menu-links', - 'class' => array('links', 'clearfix'), + 'class' => array('links', 'inline', 'clearfix'), ), 'heading' => array( 'text' => t('Main menu'), @@ -146,7 +146,7 @@ 'links' => $secondary_menu, 'attributes' => array( 'id' => 'secondary-menu-links', - 'class' => array('links', 'clearfix'), + 'class' => array('links', 'inline', 'clearfix'), ), 'heading' => array( 'text' => t('Secondary menu'), diff --git a/themes/garland/template.php b/themes/garland/template.php index 020eb5f8d..6c3fc446f 100644 --- a/themes/garland/template.php +++ b/themes/garland/template.php @@ -64,7 +64,7 @@ function garland_preprocess_page(&$vars) { $vars['primary_nav'] = theme('links__system_main_menu', array( 'links' => $vars['main_menu'], 'attributes' => array( - 'class' => array('links', 'main-menu'), + 'class' => array('links', 'inline', 'main-menu'), ), 'heading' => array( 'text' => t('Main menu'), @@ -80,7 +80,7 @@ function garland_preprocess_page(&$vars) { $vars['secondary_nav'] = theme('links__system_secondary_menu', array( 'links' => $vars['secondary_menu'], 'attributes' => array( - 'class' => array('links', 'secondary-menu'), + 'class' => array('links', 'inline', 'secondary-menu'), ), 'heading' => array( 'text' => t('Secondary menu'), |