diff --git a/app/assets/stylesheets/mobile.css.scss b/app/assets/stylesheets/mobile.css.scss index 42dc06eb2..c6cf0f463 100644 --- a/app/assets/stylesheets/mobile.css.scss +++ b/app/assets/stylesheets/mobile.css.scss @@ -270,6 +270,7 @@ body { .navbar { @include box-shadow(0,1px,2px,#333); + padding: 0 20px; } .navbar-inner { @@ -289,12 +290,11 @@ body { #nav_badges { display: inline-block; - margin-top: 2px; } +} #nav_badges a:hover { text-decoration: none; } #nav_badges .badge { position: relative; - top: -12px; display: inline; margin: 0 2px; padding: 8px 3px; @@ -644,9 +644,7 @@ display: inline-block; display: inline; font-weight: bold; margin: 0 2px; - padding: 8px 3px 9px; position: relative; - top: -15px; width: 28px; } diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 37792ffd5..acebf3057 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -36,6 +36,10 @@ module ApplicationHelper User.diaspora_id_host end + def modernizer_responsive_tag + javascript_tag("Modernizr.mq('(min-width:0)') || document.write(unescape('#{j javascript_include_tag("mbp-respond.min")}'));") + end + # Require jQuery from CDN if possible, falling back to vendored copy, and require # vendored jquery_ujs def jquery_include_tag diff --git a/app/views/layouts/application.mobile.haml b/app/views/layouts/application.mobile.haml index de01d3fd0..9fd5a20d4 100644 --- a/app/views/layouts/application.mobile.haml +++ b/app/views/layouts/application.mobile.haml @@ -34,10 +34,7 @@ = stylesheet_link_tag :mobile, :format => 'all' = yield(:custom_css) - %script{:src => "/assets/mbp-modernizr-custom.js"} - / Media Queries Polyfill https://github.com/shichuan/mobile-html5-boilerplate/wiki/Media-Queries-Polyfill - :javascript - Modernizr.mq('(min-width:0)') || document.write('