diff --git a/app/assets/javascripts/admin.coffee b/app/assets/javascripts/admin.coffee index 091c178..87d89fa 100644 --- a/app/assets/javascripts/admin.coffee +++ b/app/assets/javascripts/admin.coffee @@ -642,6 +642,3 @@ $(document).on "click", "#menu_item_informations .save", -> $(document).on "click", "#menu_item_informations h4", -> $(this).next(".panel").toggle() return false - - - diff --git a/app/assets/javascripts/public.js.coffee b/app/assets/javascripts/public.js.coffee index dee0339..65c4b0e 100644 --- a/app/assets/javascripts/public.js.coffee +++ b/app/assets/javascripts/public.js.coffee @@ -52,6 +52,7 @@ top = 20 #alert rp_top_start + top = 100 #menu if var_scroll > top $(".sub_menu_bar").addClass("move_top") @@ -63,12 +64,15 @@ top = 20 #top_link - if var_scroll > 100 - $(".top_link").css + + if var_scroll > $("#menu_top").offset().top+20 + $("#menu_fixed").css "opacity" : 1 + $("#devis-img").addClass("devis_move") else - $(".top_link").css + $("#menu_fixed").css "opacity" : 0 + $("#devis-img").removeClass("devis_move") @@ -232,6 +236,12 @@ top = 20 $ -> + + + $("a[href*='#']").click -> + $('html,body').animate({scrollTop: ($($(this).attr("href")).offset().top - 100)},'slow'); + return false; + $(window).on "resize", -> resize() diff --git a/app/assets/stylesheets/public.scss b/app/assets/stylesheets/public.scss index 2d6ad37..9d49988 100644 --- a/app/assets/stylesheets/public.scss +++ b/app/assets/stylesheets/public.scss @@ -71,10 +71,11 @@ h1,h2{ position:absolute; bottom:0px; right:0px; - width:350px; - padding-right:50px; - height:140px; + width:370px; + padding-right:30px; + height:130px; text-align:right; + font-size:18px; } .description_background{ @@ -91,7 +92,7 @@ h1,h2{ padding:0; margin:0; margin-bottom:5px; - font-size:30px; + font-size:39px; font-family:"Stylograph", sans-serif; } a{ @@ -241,6 +242,46 @@ h1,h2{ } + +#menu_fixed{ + position:fixed; + top:0; + left:0; + right:0; + z-index:12; + opacity:0; + background:$gris_fonce; + padding:15px 0; + color:white; + text-align:right; + padding-right:20px; + + .mini-logo{ + display:inline-block; + position:relative; + width:10px; + img{ + height:30px; + width:auto; + max-width:2000px; + position:absolute; + top:-20px; + right:10px; + + + }} + + a{ + color:white; + text-decoration:none; + display:inline-block; + padding:0 10px; + } + + +} + + #top_gradient{ z-index:11; position:absolute; @@ -268,14 +309,26 @@ h1,h2{ } #services-img{ position:fixed; - z-index:12; + z-index:14; top:0; left:0; width:240px; } +#devis-img{ + position:fixed; + z-index:14; + top:0; + right:0; + width:240px; +} + +.devis_move{ + top:49px !important; +} + .rea-gal img { - width: 14.28%; + width: 16.66%; display: block; float: left; } @@ -314,7 +367,7 @@ img { display:none; } #services-img{ - position:absolute;width:120px; + position:fixed;width:120px; } .rea-gal img { width: 50%; @@ -371,7 +424,7 @@ img { right:0px; width:230px; padding-right:25px; - height:100px; + height:85px; text-align:right; font-size:12px; @@ -400,7 +453,35 @@ img { } } - + + +} + + +#main{ + font-size:17px; + h3{ + margin-top:0; + font-size:1.6em; + margin-bottom:-5px; + } +} + +.white_text{ + color:white; + *{ + color:white; + } + + a{ + color:white; + display:inline-block; + + font-weight:bold; + &:hover{ + color:black; + } + } } diff --git a/app/mailers/question_mailer.rb b/app/mailers/question_mailer.rb index 3e132f7..1792184 100755 --- a/app/mailers/question_mailer.rb +++ b/app/mailers/question_mailer.rb @@ -1,5 +1,5 @@ class QuestionMailer < ActionMailer::Base - default from: "eyssard.joris@gmail.com" + default from: "info@abritium.fr" # Subject can be set in your I18n file at config/locales/en.yml # with the following lookup: @@ -9,7 +9,7 @@ class QuestionMailer < ActionMailer::Base def send_contact(contact) @contact = contact - mail to: "info@nicolasbally.com,eyssard.joris@gmail.com",:reply_to => @contact.email.to_s, :subject => "[Contact site Abritium]" + mail to: "info@nicolasbally.com,info@abritium.fr",:reply_to => @contact.email.to_s, :subject => "[Contact site Abritium]" end diff --git a/app/views/layouts/public.html.haml b/app/views/layouts/public.html.haml index 68ea184..9c6acce 100644 --- a/app/views/layouts/public.html.haml +++ b/app/views/layouts/public.html.haml @@ -87,8 +87,9 @@ -if @menu_item and @menu_item.id == 1 .slide_home_wrapper - =image_tag("/services-a-la-personne.png", :id => "services-img") - + =image_tag("/services-a-la-personne.png?a=n", :id => "services-img") + =image_tag("/devis.png", :id => "devis-img") + @@ -140,11 +141,20 @@ -else .slide_home_wrapper.with_ratio{:style => "background-image:url('#{@img_url}');", :data => {:ratio => 0.35}} - - #menu_top + + -content_for :menu do =link_to "Jardinage", "#jardinage" =link_to "Bricolage", "#bricolage" + =link_to "Crédit d'impôts", "#service" + =link_to "Témoignages clients", "#avis" =link_to "Contactez-nous", "#footer" + #menu_top + =yield :menu + + + #menu_fixed + =link_to image_tag("/logo-abritium-mini.png"), "#top_gradient", :class => "mini-logo" + =yield :menu -if @menu_item and @menu_item.id == 1 @@ -164,11 +174,12 @@ .clear - + #avis + %h2 Témoignages clients #footer .center %h2 - Parlons-en ! + Contactez-nous -@contact = @contact || Contact.new(:provenance_id => 1) diff --git a/public/devis.png b/public/devis.png new file mode 100644 index 0000000..26d6e19 Binary files /dev/null and b/public/devis.png differ diff --git a/public/logo-abritium-mini.png b/public/logo-abritium-mini.png new file mode 100644 index 0000000..44c1a96 Binary files /dev/null and b/public/logo-abritium-mini.png differ diff --git a/public/services-a-la-personne.png b/public/services-a-la-personne.png index b05d714..02b34fd 100644 Binary files a/public/services-a-la-personne.png and b/public/services-a-la-personne.png differ