diff --git a/app/assets/javascripts/public.js.coffee b/app/assets/javascripts/public.js.coffee index 4df1deb..7f6f26b 100644 --- a/app/assets/javascripts/public.js.coffee +++ b/app/assets/javascripts/public.js.coffee @@ -60,6 +60,7 @@ $("document").ready -> $("#large").append "
" + $("#large").append "" $(".img_container.first").append '' @@ -105,6 +106,7 @@ $("document").ready -> $("#large").append "
" + $("#large").append "" $(".img_container.first").append "" if $(this).attr "title" @@ -148,6 +150,7 @@ $("document").ready -> $("#large").append "" $("#large").append "" + $("#large").append "" $("#large").append "
" $(".img_container.first").append "" diff --git a/app/assets/stylesheets/public.scss b/app/assets/stylesheets/public.scss index da89e04..7d15fd3 100644 --- a/app/assets/stylesheets/public.scss +++ b/app/assets/stylesheets/public.scss @@ -513,10 +513,17 @@ h1{ } .cristal-protect .main.principal{ - background:url("/fond-ligne.png") no-repeat; + background:url("/fond-ligne.jpg") no-repeat; background-size:contain; } - \ No newline at end of file +.close_link{ + position:fixed; + top:10px; + right:10px; + width:40px; + cursor:pointer; + +} \ No newline at end of file diff --git a/app/views/layouts/public.html.haml b/app/views/layouts/public.html.haml index bcc742d..362b5cf 100644 --- a/app/views/layouts/public.html.haml +++ b/app/views/layouts/public.html.haml @@ -101,13 +101,14 @@ =yield -if @menu_item and @menu_item.slug == "index" -

- - Notre ambition - ? Concrétiser vos idées... - - -

+ %p{:style => "text-align:center;-webkit-transform: rotate(-6deg);-moz-transform: rotate(-6deg);-o-transform: rotate(-6deg);;margin-top:3em;margin-bottom:3em;" } + + Notre ambition + ? +
+ Concrétiser vos idées... +
+
-if @menu_item and @menu_item.slug == "index" =link_to image_tag("/video.png", :style => "width:150px;position:absolute;bottom:-60px;right:10px;"),"#", :id => "video" diff --git a/app/views/portlets/render_public/_blockcontent.html.haml b/app/views/portlets/render_public/_blockcontent.html.haml index 1c0509d..32e89ed 100644 --- a/app/views/portlets/render_public/_blockcontent.html.haml +++ b/app/views/portlets/render_public/_blockcontent.html.haml @@ -27,6 +27,7 @@ =render :partial => "admin/blocks/block", :locals => {:admin => false,:block => input.blocks[i-1], :sortable => false} -else =render :partial => "public/blocks/block", :locals => {:admin => false, :block => input.blocks[i-1], :sortable => false} + .clear =raw "" if input.style > 1 or input.style < 10 =raw "" if !admin diff --git a/public/close.png b/public/close.png new file mode 100644 index 0000000..7c17fff Binary files /dev/null and b/public/close.png differ diff --git a/public/fond-ligne copie.jpg b/public/fond-ligne copie.jpg new file mode 100644 index 0000000..9a5174e Binary files /dev/null and b/public/fond-ligne copie.jpg differ diff --git a/public/fond-ligne.jpg b/public/fond-ligne.jpg index 05f96e4..9558787 100644 Binary files a/public/fond-ligne.jpg and b/public/fond-ligne.jpg differ diff --git a/public/slide4.jpg b/public/slide4.jpg index ff94ca8..e3f0ae9 100644 Binary files a/public/slide4.jpg and b/public/slide4.jpg differ