diff --git a/media/css/global b/media/css/global index 52030a014e0..b630db2de4d 160000 --- a/media/css/global +++ b/media/css/global @@ -1 +1 @@ -Subproject commit 52030a014e08a23e1e44df5ab66e44acd5b5731c +Subproject commit b630db2de4dc06a9ef4d037fb51059198a7ee3e5 diff --git a/media/css/zamboni/headerfooter.css b/media/css/zamboni/amo_headerfooter.css similarity index 98% rename from media/css/zamboni/headerfooter.css rename to media/css/zamboni/amo_headerfooter.css index a7933b1473a..f6f707598c6 100644 --- a/media/css/zamboni/headerfooter.css +++ b/media/css/zamboni/amo_headerfooter.css @@ -54,10 +54,8 @@ body { } .html-rtl #nav-main li ul { - position: absolute; left: auto; right: -999em; - opacity: 0; } #nav-main li:hover ul, @@ -65,10 +63,11 @@ body { margin-top: 40px; } -.html-rtl #nav-main li:hover ul, +.html-rtl.no-js #nav-main li:hover ul, .html-rtl #nav-main li.sfhover ul { left: auto; right: 0; + opacity: 1; } #header a.mozilla { diff --git a/media/js/global b/media/js/global index 6affd2086b4..b630db2de4d 160000 --- a/media/js/global +++ b/media/js/global @@ -1 +1 @@ -Subproject commit 6affd2086b4e5580901fbc5831f19f5f1959d90c +Subproject commit b630db2de4dc06a9ef4d037fb51059198a7ee3e5 diff --git a/settings.py b/settings.py index e44a52066eb..49a59cbbd88 100644 --- a/settings.py +++ b/settings.py @@ -367,7 +367,7 @@ def JINJA_CONFIG(): 'css/legacy/autocomplete.css', 'css/zamboni/zamboni.css', 'css/global/headerfooter.css', - 'css/zamboni/headerfooter.css', + 'css/zamboni/amo_headerfooter.css', 'css/zamboni/tags.css', 'css/zamboni/tabs.css', ), @@ -425,6 +425,9 @@ def JINJA_CONFIG(): # Fix-up outgoing links 'js/zamboni/outgoing_links.js', + + # Hover delay for global header + 'js/global/menu.js', ), 'zamboni/discovery-pane': ( 'js/zamboni/jquery-1.4.2.min.js', diff --git a/templates/base.html b/templates/base.html index afd3c898e7f..96e70c8d88a 100644 --- a/templates/base.html +++ b/templates/base.html @@ -23,7 +23,7 @@ {% block extrahead %}{% endblock %} - {{ _('Add-ons') }} +
  • {{ _('Add-ons') }}