From e08cab72dd27cd12b41426d9801ddc153970ff70 Mon Sep 17 00:00:00 2001 From: dleffler Date: Mon, 13 Feb 2012 16:25:20 -0500 Subject: [PATCH] Fixes main menu in Retro theme [#528 state:resolved responsible:dleffler] --- .../navigationmodule/views/YUI Top Nav.tpl | 1 - themes/retrotheme/css/base-styles.css | 2 +- themes/retrotheme/css/nav.css | 34 +++++++++++------- .../images/menubaritem_submenuindicator.png | Bin 0 -> 955 bytes .../menubaritem_submenuindicator_selected.png | Bin 0 -> 160 bytes .../images/menuitem_submenuindicator.png | Bin 0 -> 2823 bytes .../menuitem_submenuindicator_selected.png | Bin 0 -> 159 bytes themes/simpletheme/css/1-nav.css | 3 -- themes/simpletheme/css/1-yui-top-nav.css | 4 --- 9 files changed, 23 insertions(+), 21 deletions(-) create mode 100644 themes/retrotheme/images/menubaritem_submenuindicator.png create mode 100644 themes/retrotheme/images/menubaritem_submenuindicator_selected.png create mode 100644 themes/retrotheme/images/menuitem_submenuindicator.png create mode 100644 themes/retrotheme/images/menuitem_submenuindicator_selected.png diff --git a/framework/modules-1/navigationmodule/views/YUI Top Nav.tpl b/framework/modules-1/navigationmodule/views/YUI Top Nav.tpl index 302c97529b..c5178a4600 100644 --- a/framework/modules-1/navigationmodule/views/YUI Top Nav.tpl +++ b/framework/modules-1/navigationmodule/views/YUI Top Nav.tpl @@ -81,7 +81,6 @@ YUI(EXPONENT.YUI3_CONFIG).use('yui2-container','yui2-menu', function(Y) { menubar.render(); }); - {/literal} {/script} diff --git a/themes/retrotheme/css/base-styles.css b/themes/retrotheme/css/base-styles.css index 65d04c9853..11522fd6a7 100644 --- a/themes/retrotheme/css/base-styles.css +++ b/themes/retrotheme/css/base-styles.css @@ -17,7 +17,7 @@ body { background:url(../images/head.jpg) no-repeat right 55px; } -#hd .top-nav { +#hd .yui-top-nav { position:absolute; z-index:5; bottom:0; diff --git a/themes/retrotheme/css/nav.css b/themes/retrotheme/css/nav.css index 49628da29b..a8852f2ada 100644 --- a/themes/retrotheme/css/nav.css +++ b/themes/retrotheme/css/nav.css @@ -1,43 +1,55 @@ -#hd .top-nav { +#hd .yui-top-nav { width:100%; } -#hd .top-nav .yuimenubar { +#hd .yui-top-nav .yuimenubar { border:0; background:none; } -#hd .top-nav .yuimenubar .yuimenubaritem, -#hd .top-nav .yuimenubar .yuimenubaritemlabel { +#hd .yui-top-nav .yuimenubar .yuimenubaritem, +#hd .yui-top-nav .yuimenubar .yuimenubaritemlabel { border:0; } -#hd .top-nav .yuimenubar .yuimenubaritemlabel { +#hd .yui-top-nav .yuimenubar .yuimenubaritemlabel { color:#fff; font-size:16px; } -#hd .top-nav.yui-skin-sam .yuimenubarnav .yuimenubaritem-selected { +#hd .yui-top-nav .yuimenubarnav .yuimenubaritem-selected { background:#480101; } -#hd .top-nav.yui-skin-sam .yuimenubarnav .yuimenubaritemlabel-selected { +#hd .yui-top-nav .yuimenubarnav .yuimenubaritemlabel-selected { margin-left:0; border:0; } -#hd .top-nav.yui-skin-sam .yuimenubarnav .bd { +#hd .yui-top-nav .yuimenubarnav .bd { background:#0A3B4D; } -#hd .top-nav.yui-skin-sam .yuimenubarnav .yuimenuitemlabel { +#hd .yui-top-nav .yuimenubarnav .yuimenuitemlabel { color:#ffffff; } -#hd .top-nav.yui-skin-sam .yuimenubarnav .yuimenuitem-selected { +#hd .yui-top-nav .yuimenubarnav .yuimenuitem-selected { background:#480101; } +#hd .yui-top-nav .yuimenubar .yuimenuitemlabel-hassubmenu { + background-image:url(../images/menuitem_submenuindicator.png); + background-position: 100% 50%; + background-repeat:no-repeat; +} + +#hd .yui-top-nav .yuimenubar .yuimenubaritemlabel-hassubmenu { + background-image:url(../images/menubaritem_submenuindicator.png); + background-position: 100% 50%; + background-repeat:no-repeat; +} + /**************** sidenav ***********************/ #leftcol .children-only { @@ -55,5 +67,3 @@ padding:3px 0 3px 16px; background:url(../images/nbul.gif) 0 50% no-repeat; } - - diff --git a/themes/retrotheme/images/menubaritem_submenuindicator.png b/themes/retrotheme/images/menubaritem_submenuindicator.png new file mode 100644 index 0000000000000000000000000000000000000000..85c19ebd2140baa66cdf75dead278339fe657efa GIT binary patch literal 955 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's */ #hd .yui-top-nav .yuimenubar .yuimenubaritemlabel-selected { color:#302f30; @@ -104,6 +103,3 @@ never have more than one menubar on a single page */ #hd .yui-top-nav .yuimenubar .yuimenuitemlabel-hassubmenu-selected { background-image:url(../images/menuitem_submenuindicator_selected.png); } - - -