From 80c9d5091f67636a074c37c96ca4a0d567509ab0 Mon Sep 17 00:00:00 2001 From: did Date: Fri, 25 Nov 2011 10:56:56 +0100 Subject: [PATCH] style submenu popup on firefox --- .../javascripts/locomotive/views/application_view.js.coffee | 6 +++--- app/assets/stylesheets/locomotive/codemirror_changes.scss | 2 ++ app/assets/stylesheets/locomotive/menu/sub.scss | 6 +++++- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/locomotive/views/application_view.js.coffee b/app/assets/javascripts/locomotive/views/application_view.js.coffee index 7dd53400..d0f3a4b8 100644 --- a/app/assets/javascripts/locomotive/views/application_view.js.coffee +++ b/app/assets/javascripts/locomotive/views/application_view.js.coffee @@ -30,9 +30,9 @@ class Locomotive.Views.ApplicationView extends Backbone.View $('#submenu ul li.hoverable').each -> timer = null link = $(@) - popup = link.find('.popup').removeClass('popup').addClass('submenu-popup').css( - top: link.offset().top + link.height() - 1 - left: link.offset().left + (popup = link.find('.popup')).removeClass('popup').addClass('submenu-popup').css( + top: link.offset().top + link.height() - 2 + left: link.offset().left - parseInt(popup.css('padding-left')) ).bind('show', -> link.find('a').addClass('hover') & popup.show() ).bind('hide', -> diff --git a/app/assets/stylesheets/locomotive/codemirror_changes.scss b/app/assets/stylesheets/locomotive/codemirror_changes.scss index 39e86b4c..a52f5db6 100644 --- a/app/assets/stylesheets/locomotive/codemirror_changes.scss +++ b/app/assets/stylesheets/locomotive/codemirror_changes.scss @@ -3,6 +3,8 @@ .CodeMirror { @include default-input-style; + margin-top: 13px; + font-size: 12px; font-weight: normal; diff --git a/app/assets/stylesheets/locomotive/menu/sub.scss b/app/assets/stylesheets/locomotive/menu/sub.scss index 0ee3f14c..3336f57c 100644 --- a/app/assets/stylesheets/locomotive/menu/sub.scss +++ b/app/assets/stylesheets/locomotive/menu/sub.scss @@ -169,13 +169,17 @@ min-width: 250px; z-index: 999; + overflow: hidden; + + padding: 0px 12px 12px 12px; + background: transparent; .wrapper { background: #fff; - @include box-shadow(rgba(0, 0, 0, 0.5) 0px 8px 10px 0px); + @include box-shadow(rgba(0, 0, 0, 0.5) 0px 0px 8px 0px); @include border-radius(16px); @include border-top-left-radius(0px);