diff --git a/app/assets/javascripts/application.coffee b/app/assets/javascripts/application.coffee index fc8c136..de6e57e 100644 --- a/app/assets/javascripts/application.coffee +++ b/app/assets/javascripts/application.coffee @@ -243,9 +243,11 @@ $("document").ready -> $("#baseline").fadeIn() $("#logo-min").fadeOut() - - + if top > ($("#realisations").offset().top - $(window).height() / 2) + #alert "te" + $("#realisations #rea-gal").animate({left:0,opacity : 1}, 800, "swing") + resize() diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index a5cd7dc..23910eb 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -210,6 +210,7 @@ width:560px; } #main{ position:absolute; + z-index:2; width:100%; .center{ margin:auto; @@ -354,7 +355,7 @@ background:rgba(132,187,64,1); background:rgba(0,0,0,0.9); text-align:right; font-family:Lato; - font-weight:200; + font-weight:300; text-decoration:none; position:relative; z-index:4; diff --git a/app/views/welcome/index.html.haml b/app/views/welcome/index.html.haml index 58a5001..4852def 100644 --- a/app/views/welcome/index.html.haml +++ b/app/views/welcome/index.html.haml @@ -262,11 +262,11 @@ - #realisations + #realisations{:style => "overflow:auto;"} %h2 Exemples de réalisations - #rea-gal + #rea-gal{:style => "position:relative;opacity:0"} -(1..10).each do |i| =link_to image_tag("/realisation/#{i}-p.jpg"), "/realisation/#{i}.jpg", :data => {:title => "test",:lightbox => "image-1"} .clear