V2 en ligne

app/assets/javascripts/public.js.coffee

@@ -231,7 +231,7 @@ $("document").ready ->
     $("#large").css "min-height", ($(window).height()-30)+"px"
   
     $(".slider").each ->
-      $(this).css({"width": $(this).parent().width()+"px"})
+      $(this).css({"width": $(window).width()+"px"})
     
       height = ($(window).height())
       optimal_height = Math.round($(this).width()/ 1.66)

app/assets/stylesheets/public.scss

@@ -7,7 +7,7 @@
 overflow:hidden;
 position:relative;
 width:100%;
-margin:3em 0;
+
 -webkit-transform-style: preserve-3d;
   -moz-transform-style: preserve-3d;
   transform-style: preserve-3d;
@@ -47,7 +47,10 @@ margin:3em 0;
   
 }
 
-
+#corps.index{
+  color:#F2F2F2;
+  background:rgba(40,40,40,1);
+}
 body{
   font-family:Lato;
   font-weight:300;
@@ -57,13 +60,14 @@ body{
   padding:0;
   margin:0;
   font-size:14px;
-  color:#1A1A1A;
+  color:#333333;
+  
   
 }
 
 img{
   max-width:100%;
-
+  margin-bottom:6px;
 }
  
 a{
@@ -257,9 +261,10 @@ margin:auto;
 #logo{
 height:120px;
 position:absolute;
-left:-755px;
-top:10px;
+right:-10px;
+top:13px;
 padding-top:5px;
+max-width:inherit;
 
 }
 .contact{
@@ -288,18 +293,24 @@ padding-top:5px;
   
 }
 .top{
-  
+  position:relative;
+  z-index:3;
   box-shadow:0 0 15px rgba(0,0,0,0.8);
   .contact{
     position:absolute;
     top:60px;
-    right:10px;
+    left:10px;
+    p{
+      display:inline-block;
+      margin-right:20px;
+      
+    }
     
   }
   
 }
 .menu_background{
-  background:#F2F2F2;
+  background:#202020;
   min-height:84px;
   padding-top:1px;
 }
@@ -310,7 +321,7 @@ font-size:14px;
 a{
   margin:0;
 display: inline-block;
-color: #1A1A1A;
+color:#F2F2F2;
 text-decoration: none;
 h4{
   text-align:left;
@@ -343,11 +354,15 @@ border-bottom:5px solid transparent;
 }
 .top_background{
   background:#333333;
-  border-bottom:8px solid #f39200; 
+  
   min-height:150px;
+  ;
+  
 }
 .dark_background{
 background:rgba(40,40,40,1);
+padding-top:3em;
+color:#F2F2F2;
 }
 
 .gray_light_background{
@@ -382,21 +397,17 @@ background:rgba(230,0,125,1);
 h1,h2,h3,h4{
   text-align:left;
 font-weight: 400;
+text-transform:uppercase;
 }
 
 
 .bottom_image{
   position:absolute;
-  bottom:0px;
+  bottom:-8px;
   left:0px;
   
 }
-.slider{
-  box-shadow:0 0 15px rgba(0,0,0,0.8);
-  
-  
-  
-}
+
 .bottom{
   position:relative;
   box-shadow:0 0 15px rgba(0,0,0,0.8);
@@ -437,7 +448,12 @@ font-weight: 400;
   
 }
 .legals{
+  
   background:#1A1A1A;
+  a{
+    color:#EEEEEE;
+    
+  }
   img{
     position:absolute;
     top:2px;
@@ -447,7 +463,7 @@ font-weight: 400;
   }
   
 
-  font-size:14px;
+  font-size:12px;
   padding:8px;
   
 }

app/views/layouts/public.html.haml

@@ -52,29 +52,37 @@
             -description = menu_item.menu_content.description if menu_item.menu_content and menu_item.menu_content_type == "Page"
             =link_to raw("<h4>#{menu_item.name}</h4>#{description}"),menu_item_path(:url => menu_item.url), :class => ("active" if @menu_item and (@menu_item == menu_item or @menu_item.ancestors.include?(menu_item)))
           
-    .main=yield
+    #corps{:class => (@menu_item.slug if @menu_item)}
+      .main=yield
     
-    .bottom
-      .infos
-        .main
-          .address
-            %h4 Cris Graphic
-            296 rue de la Béalière
-            %br
-            38113 Veurey-Voroize
-          .contact
-            %p
-              =image_tag "/mail.png"
-              =link_to "info@cris-graphic.com", "mailto:info@cris-graphic.com"
-            %p
-              =image_tag "/tel.png"
-              04 76 03 19 70
-          .clear
-          =image_tag "/bottom.png", :class => "bottom_image"
-      .legals
-        .main
-          Cris Graphic - SARL au capital de 7.622,00 € - RCS : Grenoble B 451 888 101 - APE : 1812Z
-          =link_to image_tag("/nb.png"), "http://nicolasbally.com", :target => "_blank"
+      .bottom
+        .infos
+          .main
+            .address
+              %h4 Cris Graphic
+              Atelier de production
+              %br
+            
+              296 rue de la Béalière
+              %br
+              38113 Veurey-Voroize
+            .contact
+              %p
+                =image_tag "/mail.png"
+                =link_to "info@cris-graphic.com", "mailto:info@cris-graphic.com"
+              %p
+                =image_tag "/tel.png"
+                04 76 03 19 70
+              %p
+                =image_tag "/fax.png"
+                04 76 01 95 31
+            .clear
+            =image_tag "/bottom.png", :class => "bottom_image"
+        .legals
+          .main
+            Cris Graphic - SARL au capital de 7.622,00 € - RCS : Grenoble B 451 888 101 - APE : 1812Z - 
+            =link_to "Partenaire Art des Sens", "http://artdessens.fr", :target => "_blank", :title => "Art des Sens - Agencement & décoration, impression Cristal Protect"
+            =link_to image_tag("/nb.png"), "http://nicolasbally.com", :target => "_blank"
       
 
 

app/views/portlets/render_public/_gallerycontent.html.haml

@@ -101,7 +101,8 @@
   -elsif input.style==2
  
     
-  
+    =raw "</div>"
+    =raw "</div>"
   
     .slider
 
@@ -121,6 +122,9 @@
                     ="/" if gallery_images.description?
                 -if gallery_images.description?
                   =gallery_images.description
+                  
+    =raw "<div class='main'>"
+    =raw "<div class='row-fluid'>"
 
              
     

app/views/public/menu_items/show.html.haml

@@ -1,40 +1 @@
-#corps.blanco
-  -if @menu_item.parent_id
-    -if @menu_item.ancestors.reverse[0]
-      -first_level_menu = @menu_item.ancestors.reverse[0]
-
-  -else
-
-    -first_level_menu = @menu_item
-
-  -if first_level_menu.children.size > 0
-
-
-    .row
-      .col-xs-8
-
-    
-    
-        =render :partial => "public/blocks/block", :locals => {:block => @menu_item.menu_content.blocks[0]}
-
-      .col-xs-4
-  
-        .menu
-          %h3=menu_item_link(first_level_menu)
-          %ul
-            -first_level_menu.children.where(:enabled => true, :visible => true).order(:position).each do |menu_item|
-  
-              %li
-                =menu_item_link(menu_item)
-                -if menu_item.children.where(:enabled => true, :visible => true).size > 0
-                  %ul
-                    -menu_item.children.where(:enabled => true, :visible => true).order(:position).each do |menu_item|
-                      %li=menu_item_link(menu_item)
-
-  -else
-    .row
-      .col-xs-12
-
-    
-    
-        =render :partial => "public/blocks/block", :locals => {:block => @menu_item.menu_content.blocks[0]}
+=render :partial => "public/blocks/block", :locals => {:block => @menu_item.menu_content.blocks[0]}