diff --git a/media/css/zamboni/mobile.css b/media/css/zamboni/mobile.css index a068edae3e..58c5dc5b7f 100644 --- a/media/css/zamboni/mobile.css +++ b/media/css/zamboni/mobile.css @@ -231,12 +231,12 @@ table th { -webkit-transition: .5s height ease; border: 0px solid transparent; border-width: 1px 0; + margin: 0 -14px; } #sort-menu.expand ul { border-color: #a9badb; - height: 254px; - margin: 0 -14px; + height: 407px; } .purchases #sort-menu.expand ul { height: 100px; diff --git a/media/js/zamboni/mobile/general.js b/media/js/zamboni/mobile/general.js index 334026211c..6c4b7453a1 100644 --- a/media/js/zamboni/mobile/general.js +++ b/media/js/zamboni/mobile/general.js @@ -247,9 +247,11 @@ $(".moz-menu .tab a").click(_pd(function() { this.blur(); })); -$("#sort-menu .label").click(_pd(function() { +$("#sort-menu").delegate('.label', 'click', _pd(function() { $("#sort-menu").toggleClass("expand"); this.blur(); + // Hack the window resize to fix #sort-menu height calculation. + $(window).trigger('resize'); })); z.eula = (function(){ diff --git a/requirements/prod.txt b/requirements/prod.txt index dd8ab60630..171f27c8a8 100644 --- a/requirements/prod.txt +++ b/requirements/prod.txt @@ -104,7 +104,7 @@ tastypie-services==0.2.2 -e git+https://github.com/mozilla/happyforms.git@729612c2a824a7e8283d416d2084bf506c671e24#egg=happyforms # Temporary fork. --e git+https://github.com/jsocol/jingo-minify.git@cb911038e20a399aeff871e199c8bc2be12b5cee#egg=jingo-minify +-e git+https://github.com/jsocol/jingo-minify.git@b7405d3f93628190bf83cc43b0ff44e2fbb8b3c0#egg=jingo_minify -e git+https://github.com/mozilla/nuggets.git@96e80a64aa4bfcfef4f43fc3ab6966450ccd7325#egg=nuggets -e git+https://github.com/jbalogh/test-utils.git@ce5136a257cd44a1c663319124a255c1d10a9834#egg=test-utils -e git+https://github.com/fwenzel/django-mozilla-product-details.git@36ef06539d6b34c4f345fd0d3e16937d0db9a752#egg=django-mozilla-product-details diff --git a/templates/mobile/base_addons.html b/templates/mobile/base_addons.html index 6a7356ad0f..7da8b56b9a 100644 --- a/templates/mobile/base_addons.html +++ b/templates/mobile/base_addons.html @@ -1,11 +1,8 @@ - {% block site_css %} - - {% endblock %} + {{ inline_css('zamboni/mobile') }} + {% block site_css %}{% endblock %}