diff --git a/app/assets/stylesheets/public.scss b/app/assets/stylesheets/public.scss index 714430c..8eaf9e3 100644 --- a/app/assets/stylesheets/public.scss +++ b/app/assets/stylesheets/public.scss @@ -39,7 +39,7 @@ body{ font-size:15px; color:#333333; background-color:rgba(241,240,238,0.2); - //background: url('/fond2.jpeg') center center fixed; + background: url('/fond2.jpeg') center center fixed; background-size: cover; } @@ -243,6 +243,8 @@ margin:auto; min-height:50px; } + + .top{ #logo{ width:185px; @@ -252,6 +254,75 @@ margin:auto; + } + + min-height:90px; + width:100%; + + margin:auto; + + + position:fixed; + top:0px; + right:0; + left:0; + background:rgba(0,0,0,0.7); + z-index:3; + + #menu{ + margin-right:40px; + margin-bottom:14px; + font-size:14px; + text-align:right; + text-transform:uppercase; + position:absolute; + right:0; + bottom:0; + + a{ + + margin:0; + + display: inline-block; + color:white; + text-decoration: none; + + + padding: 2px 10px; + + margin-right:5px; + + + + &:hover, &.active{ + + color:rgba(116,180,55,1); + } + + &:last-child{ + margin-right:0; + + } + + + } + } + + +} + + + + +.top_home{ + #logo{ + width:185px; + position:absolute; + bottom:0; + left:40px; + + + } height:50px; @@ -292,7 +363,7 @@ margin:auto; &:hover, &.active{ - color:black; + color:rgba(116,180,55,1); } &:last-child{ @@ -318,6 +389,7 @@ margin:auto; float:left; background:rgba(255,255,255,0.95); padding:10px 20px; + min-height:600px; } #sidebar{ @@ -558,6 +630,7 @@ article{ width:34%; float:left; font-family:arial; + h1{margin-left:10px;margin-top:0;} p{ margin-left:10px; color:black; diff --git a/app/views/layouts/public.html.haml b/app/views/layouts/public.html.haml index 738ec12..8035c4b 100644 --- a/app/views/layouts/public.html.haml +++ b/app/views/layouts/public.html.haml @@ -38,27 +38,30 @@ -if !(@menu_item and @menu_item.slug and @menu_item.slug == "index" ) %p{:style => "height:80px;"} - - #slider_content - .top - - =link_to image_tag("/logo_pic_vert.png", :id => "logo"), "/" - - #menu - - -MenuItem.where(:parent_id => nil, :enabled => true, :visible => true).order(:position).each do |menu_item| - -description = "" - -description = menu_item.menu_content.description if menu_item.menu_content and menu_item.menu_content_type == "Page" - =link_to sanitize("#{menu_item.name}"),menu_item_path(:url => menu_item.url), :class => menu_item.slug.to_s+"_menu"+(" active" if @menu_item and (@menu_item == menu_item or @menu_item.ancestors.include?(menu_item))).to_s - - -if @menu_item and @menu_item.slug and @menu_item.slug == "index" - =#{:style => "display:none"} + -if @menu_item and @menu_item.slug and @menu_item.slug == "index" + #slider_content + + + + .top + + =link_to image_tag("/logo_pic_vert_w.png", :id => "logo"), "/" + + #menu + + -MenuItem.where(:parent_id => nil, :enabled => true, :visible => true).order(:position).each do |menu_item| + -description = "" + -description = menu_item.menu_content.description if menu_item.menu_content and menu_item.menu_content_type == "Page" + =link_to sanitize("#{menu_item.name}"),menu_item_path(:url => menu_item.url), :class => menu_item.slug.to_s+"_menu"+(" active" if @menu_item and (@menu_item == menu_item or @menu_item.ancestors.include?(menu_item))).to_s + + + #main #corps{:class => (@menu_item.slug if @menu_item)} diff --git a/app/views/public/events/index.html.haml b/app/views/public/events/index.html.haml index 016e584..9059e7d 100644 --- a/app/views/public/events/index.html.haml +++ b/app/views/public/events/index.html.haml @@ -1,18 +1,18 @@ -%p - - -first_month = @start_list_date.beginning_of_month - -last_month = @end_list_date.beginning_of_month - -the_month = first_month +%h1 L'agenda du Pic Vert - - -while the_month <= last_month - %h2{:class => "month_title"}=l(the_month.to_date, :format => :month_and_year) - .month_content - =render :partial => "public/events/event", :collection =>Event.where('(start_at < ? AND start_at > ?) OR (stop_at < ? AND stop_at > ?)',the_month.end_of_month, the_month.beginning_of_month,the_month.end_of_month, the_month.beginning_of_month).order(:start_at) - +-first_month = @start_list_date.beginning_of_month +-last_month = @end_list_date.beginning_of_month +-the_month = first_month + + +-while the_month <= last_month + %h2{:class => "month_title"}=l(the_month.to_date, :format => :month_and_year) + .month_content + =render :partial => "public/events/event", :collection =>Event.where('(start_at < ? AND start_at > ?) OR (stop_at < ? AND stop_at > ?)',the_month.end_of_month, the_month.beginning_of_month,the_month.end_of_month, the_month.beginning_of_month).order(:start_at) + + + -the_month = the_month.next_month - -the_month = the_month.next_month - diff --git a/public/logo_pic_vert_w.png b/public/logo_pic_vert_w.png new file mode 100644 index 0000000..bd0ad5e Binary files /dev/null and b/public/logo_pic_vert_w.png differ diff --git a/public/nb.png b/public/nb.png new file mode 100644 index 0000000..a6fd30a Binary files /dev/null and b/public/nb.png differ