diff --git a/app/assets/javascripts/public.js.coffee b/app/assets/javascripts/public.js.coffee index e179df0..5e9f427 100755 --- a/app/assets/javascripts/public.js.coffee +++ b/app/assets/javascripts/public.js.coffee @@ -46,7 +46,9 @@ $ -> "height" : ($(window).height()- 60 )+"px" $("body").on "click", ".close_popup", -> $(".popup_overlay").fadeOut(); - $(".popup_container").fadeOut(); + $(".popup_container").fadeOut 400, -> + $(".popup_overlay").remove() + $(".popup_container").remove() $(window).on "resize", -> resize() diff --git a/app/views/layouts/public.html.haml b/app/views/layouts/public.html.haml index ddec260..affd0bd 100755 --- a/app/views/layouts/public.html.haml +++ b/app/views/layouts/public.html.haml @@ -238,10 +238,4 @@ Contact / Devis - .popup_overlay - .popup_container - - #popup_content - .close_popup - =image_tag "/bouton-croix.png" - .inner + diff --git a/app/views/public/menu_items/show.js.erb b/app/views/public/menu_items/show.js.erb index fafad08..f33e8dd 100755 --- a/app/views/public/menu_items/show.js.erb +++ b/app/views/public/menu_items/show.js.erb @@ -1,4 +1,7 @@ - +$("body").append('