Bug 628724, tweaks to django-moz-header

2011-01-28 13:58:38 -08:00 · 2011-01-28 13:58:38 -08:00 · 1bc57367b8
--- a/media/css/global
+++ b/media/css/global
@ -1 +1 @@
-Subproject commit 52030a014e08a23e1e44df5ab66e44acd5b5731c
+Subproject commit b630db2de4dc06a9ef4d037fb51059198a7ee3e5
--- a/media/css/zamboni/amo_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 {
--- a/media/js/global
+++ b/media/js/global
@ -1 +1 @@
-Subproject commit 6affd2086b4e5580901fbc5831f19f5f1959d90c
+Subproject commit b630db2de4dc06a9ef4d037fb51059198a7ee3e5
--- a/settings.py
+++ b/settings.py
@ -367,7 +367,7 @@ MINIFY_BUNDLES = {
            '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 @@ MINIFY_BUNDLES = {

            # 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',
--- a/templates/base.html
+++ b/templates/base.html
@ -23,7 +23,7 @@
    {% block extrahead %}{% endblock %}
    <noscript><link rel="stylesheet" href="{{ MEDIA_URL }}css/legacy/nojs.css"></noscript>
  </head>
-  <body class="html-{{ DIR }} {{ request.APP.short }} {% block bodyclass %}{% endblock %}"
+  <body class="html-{{ DIR }} {{ request.APP.short }} moz-header-slim {% block bodyclass %}{% endblock %}"
        data-app="{{ request.APP.short }}"
        data-appname="{{ request.APP.pretty }}"
        data-appid="{{ request.APP.id }}"
--- a/templates/global
+++ b/templates/global
@ -1 +1 @@
-Subproject commit 52030a014e08a23e1e44df5ab66e44acd5b5731c
+Subproject commit b630db2de4dc06a9ef4d037fb51059198a7ee3e5
--- a/templates/menu_links.html
+++ b/templates/menu_links.html
@ -1,7 +1,7 @@
 {% extends "global/menu_links.html" %}

 {% block amo_links %}
-  <li class=""><a href="https://addons.mozilla.org/">{{ _('Add-ons') }}</a>
+  <li class="current"><a href="https://addons.mozilla.org/">{{ _('Add-ons') }}</a>
    <ul>
      <li class="first"><a href="https://addons.mozilla.org/firefox/">{{ _('Firefox Add-ons') }}</a></li>
      <li><a href="https://addons.mozilla.org/firefox/featured/">{{ _('Featured Add-ons') }}</a></li>