design adapté à technique eft

This commit is contained in:
Nicolas Bally 2014-04-25 12:42:48 +02:00
parent 8728177096
commit d7effbc306
6 changed files with 111 additions and 50 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 70 KiB

After

Width:  |  Height:  |  Size: 59 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 70 KiB

View File

@ -8,8 +8,16 @@
resize = () ->
$("#large").css "min-height", ($(window).height()-30)+"px"
$(window).load ->
resize()
$ -> $ ->
$(window).bind "resize", ->
resize()
#

View File

@ -3,18 +3,50 @@
@import "public/framework/bootstrap.less"; @import "public/framework/bootstrap.less";
// Font Awesome
@import "fontawesome/font-awesome";
body{ body{
font-family : 'Times', 'Times new roman', 'serif'; width:100%;
font-size:16px; height:100%;
line-height:1.4em; margin : 0px;
-webkit-font-smoothing: antialiased; padding : 0px;
font-family:"Avenir";
color:#333333; font-size:14px;
background:#dadbd5;
color:rgb(23, 54, 93);
h1, h2, h3, h4, h5{
font-weight:600;
text-align:left;
line-height:normal;
}
h1{
color:#295288;
font-size:2em;
text-align:center;
margin:0.2em 0;
}
h2{
color:#295288;
font-size:1.5em;
text-align:center;
margin:0.2em 0;
}
h3{
color:#ff7800;
font-size:1.2em;
}
#testimony_header{ #testimony_header{
background:rgba(32,141,187,1); background:rgba(32,141,187,1);
@ -49,21 +81,16 @@ body{
#large{ #large{
width:1020px;
max-width:1200px; max-width:1200px;
margin:auto; margin:auto;
padding:20px;
} padding-top:10px;
h1,h2,h3,h4,h5,h6{ background:white;
font-weight:normal; min-height:100%;
text-align:left;
line-height:1em;
color:#295288 !important;
}
h3{
color:rgba(255,132,0,1) !important;
} }
ul{ ul{
margin: 0; margin: 0;
@ -78,36 +105,66 @@ body{
} }
#top{ #top{
border-bottom:8px solid rgba(62,63,64,1);
padding:1em 0;
margin-bottom:1em; margin-bottom:10px;
#menu{
.active{
font-weight:bold;
}
margin-top:90px;
text-align:right;
font-size:1.05em;
a{
display:inline-block;
padding:2px 0.5em;
color:black;
}
}
} }
#logo{ #logo{
width:310px; width:310px;
max-width:310px; max-width:310px;
float:left;
} }
#menu{
background:#698fb6;
margin:0 -10px;
padding:0 10px;
li{
display:inline;
a{
display:inline-block;
padding:6px 12px;
margin:4px 0px;
font-weight:400;
text-decoration:none;
color:white;
.footer{
display:none;;
}
.top{
display:inline;
}
&:hover{
background:#295288;
border-radius:15px;
}
&.active{
background:#869dbc;
border-radius:15px;
}
}
}
}
#main{ #main{
text-align:justify; text-align:justify;
clear:both; clear:both;
margin:10px 0;
p{ p{
margin-bottom: 18px; margin-bottom: 18px;
@ -122,9 +179,7 @@ body{
} }
} }
h1, h2,h3,h4{
color :#00ade2;
}
.sidebar{ .sidebar{
@ -154,7 +209,7 @@ body{
line-height:1.2em; line-height:1.2em;
text-align:left; text-align:left;
a{ a{
color:#333333; color:rgb(23, 54, 93);
&:hover{ &:hover{
text-decoration:none; text-decoration:none;
@ -188,7 +243,7 @@ body{
a{ a{
color:white; color:white;
&.active, &:hover{ &:hover{
font-weight:bold; font-weight:bold;
color:white; color:white;
text-decoration:none; text-decoration:none;
@ -225,9 +280,10 @@ body{
h3{ h3{
a{ a{
color:white; color:white;
&.active, &:hover{ &:hover{
font-weight:bold; font-weight:bold;
color:white; color:white;
text-decoration:none,
} }
} }

View File

@ -25,9 +25,9 @@
#top #top
=link_to image_tag( "front/logo.png", :id => "logo", :alt => ""), "/" =link_to image_tag( "front/logo.png", :id => "logo", :alt => ""), "/"
#menu=render(:partial => "public/shared/first_menu") %ul#menu
%li=link_to i(:home, :icon => false), "/"
%p{:style => "clear:both;"} =render(:partial => "public/shared/first_menu")
#main.row-fluid #main.row-fluid
@ -107,10 +107,7 @@
%a#go_top{:href => "#top_anchor"} %a#go_top{:href => "#top_anchor"}
%p{:style => "clear:both;"}
 

View File

@ -1,3 +1,3 @@
-MenuItem.where(:parent_id => nil, :enabled => true, :visible => true).order(:position).each do |menu_item| -MenuItem.where(:parent_id => nil, :enabled => true, :visible => true).order(:position).each do |menu_item|
=menu_item_link(menu_item) %li=menu_item_link(menu_item)