From abad718cec8e5a27db4a1b10f84e22a452cdf90c Mon Sep 17 00:00:00 2001 From: Nicolas Bally Date: Mon, 23 Oct 2017 01:45:26 +0200 Subject: [PATCH] suite --- app/assets/javascripts/public.js.coffee | 2 +- app/assets/stylesheets/public/general.scss | 2 +- app/views/layouts/public.html.haml | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/public.js.coffee b/app/assets/javascripts/public.js.coffee index 8802118..431c1f8 100755 --- a/app/assets/javascripts/public.js.coffee +++ b/app/assets/javascripts/public.js.coffee @@ -38,7 +38,7 @@ "height" : $(".customer_message_show").height()+"px" min_height = 0 - min_height = $(window).height() - $(".top").height() - $(".top_home").height() - $(".bottom").height() - 30 + min_height = $(window).height() - $(".top").height() - $(".top_home").height() - $(".bottom").height() - 0 $("#main").css("min-height", min_height+"px") diff --git a/app/assets/stylesheets/public/general.scss b/app/assets/stylesheets/public/general.scss index 8c39212..4fe8eea 100755 --- a/app/assets/stylesheets/public/general.scss +++ b/app/assets/stylesheets/public/general.scss @@ -12,7 +12,7 @@ body{ font-size:15px; color:#55595B; padding:0; - + margin:0; } diff --git a/app/views/layouts/public.html.haml b/app/views/layouts/public.html.haml index a9d2e9a..cff8197 100755 --- a/app/views/layouts/public.html.haml +++ b/app/views/layouts/public.html.haml @@ -68,10 +68,11 @@ Développement Quartz Agence .clear + -if @my_reseauxes + .reseauxes_home_video{:style => "position:absolute;bottom:10px;right:10px;"}=link_to ic(:"youtube-play")+" Présentation Négos","", :class => "btn negos-video" + .clear =#render :partial => "public/shared/bottom" - -if @my_reseauxes - .reseauxes_home_video{:style => "position:absolute;bottom:10px;right:10px;"}=link_to ic(:"youtube-play")+" Présentation Négos","", :class => "btn negos-video"