From 6f8bdaece2cafc3f889d34d7cae64b567b6b804b Mon Sep 17 00:00:00 2001 From: Nicolas Bally Date: Thu, 31 Mar 2016 21:21:04 +0200 Subject: [PATCH] suite --- app/assets/stylesheets/public.scss | 3 ++- app/controllers/public/articles_controller.rb | 2 +- app/views/layouts/public.html.haml | 2 +- app/views/public/contacts/index.haml | 2 +- app/views/public/menu_items/show.html.haml | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/app/assets/stylesheets/public.scss b/app/assets/stylesheets/public.scss index 59c8717..b811b3c 100644 --- a/app/assets/stylesheets/public.scss +++ b/app/assets/stylesheets/public.scss @@ -53,6 +53,7 @@ body{ h1,h2,h3{ text-transform:uppercase; font-weight:normal; + color:#1a93a6; } .top{ @@ -101,7 +102,7 @@ h1,h2,h3{ .bottom{ padding: 20px 10px 10px; - background-color: #5d5d5d; + background-color: #1a93a6; font-size:0.9em; position:relative; #certif{ diff --git a/app/controllers/public/articles_controller.rb b/app/controllers/public/articles_controller.rb index 6578cc0..d81e77b 100644 --- a/app/controllers/public/articles_controller.rb +++ b/app/controllers/public/articles_controller.rb @@ -21,7 +21,7 @@ class Public::ArticlesController < ApplicationController @articles = @articles.page(params[:page]).per(11) - @title = "Articles du blog" + @title = "Actualités" end def feed diff --git a/app/views/layouts/public.html.haml b/app/views/layouts/public.html.haml index c7d3694..1028695 100644 --- a/app/views/layouts/public.html.haml +++ b/app/views/layouts/public.html.haml @@ -1,6 +1,6 @@ -@lang = @lang || LangSite.first -if !@facebook_img or @facebook_img == "" - -@facebook_img= "/public_medias/image_file/file/280/large_medium_shutterstock_64985671_0__-_copie.jpg" + -@facebook_img= "" !!! -if @description and @description == "" - @description = "" diff --git a/app/views/public/contacts/index.haml b/app/views/public/contacts/index.haml index edc43c2..e7b87bc 100644 --- a/app/views/public/contacts/index.haml +++ b/app/views/public/contacts/index.haml @@ -1,7 +1,7 @@ %h2 Merci beaucoup %p{:style => "text-align:center;"} %br - Votre message m'a bien été envoyé, j'y répondrais dès que possible ! + Votre message m'a bien été envoyé, nous vous répondrons dans les plus brefs délais. %br %br %br diff --git a/app/views/public/menu_items/show.html.haml b/app/views/public/menu_items/show.html.haml index 243e1d3..849417f 100644 --- a/app/views/public/menu_items/show.html.haml +++ b/app/views/public/menu_items/show.html.haml @@ -63,7 +63,7 @@ .row .columns.span_4 %p - %strong Bouvier signalétique + %strong Siège social %p Zone Actipôle, 4/6 boulevard Beaubourg