Fixes main menu in Retro theme [#528 state:resolved responsible:dleff…

…ler]
exponentcms · Feb 13, 2012 · e08cab7 · e08cab7
1 parent aff46ed
commit e08cab7
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 21 deletions.
diff --git 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
@@ -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
@@ -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
diff --git a/themes/retrotheme/images/menubaritem_submenuindicator_selected.png b/themes/retrotheme/images/menubaritem_submenuindicator_selected.png
diff --git a/themes/retrotheme/images/menuitem_submenuindicator.png b/themes/retrotheme/images/menuitem_submenuindicator.png
diff --git a/themes/retrotheme/images/menuitem_submenuindicator_selected.png b/themes/retrotheme/images/menuitem_submenuindicator_selected.png
diff --git a/themes/simpletheme/css/1-nav.css b/themes/simpletheme/css/1-nav.css
@@ -104,6 +104,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);
 }
-
-
-
diff --git a/themes/simpletheme/css/1-yui-top-nav.css b/themes/simpletheme/css/1-yui-top-nav.css
@@ -57,7 +57,6 @@ never have more than one menubar on a single page */
     background-image:url(../images/menubaritem_submenuindicator_selected.png);
 }
 
-
 /* the hover state of the menu bar's <li>'s <a>*/
 #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);
 }
-
-
-