diff --git a/app/assets/stylesheets/public/public.scss b/app/assets/stylesheets/public/public.scss index d286e75..262f7f5 100644 --- a/app/assets/stylesheets/public/public.scss +++ b/app/assets/stylesheets/public/public.scss @@ -13,7 +13,7 @@ body { margin: 0px; font-size: 14px; font-family: "trebuchet MS"; - color: RGB(96, 68, 53); } + color:#604435; } body a img { border: 0px; } body a { @@ -64,18 +64,28 @@ body { padding: 0px; margin: auto; margin-bottom: 10px; - background-image: url("/images/front/fond-marron.png"); - background-repeat: no-repeat; - background-position: center center; } + } body #public #slider .slide { - width: 969px; + background-image: url("/images/front/fond-marron.png"); + background-repeat: no-repeat; + background-position: center center; + + + width: 969px; height: 309px; position: relative; margin: 0px 5px 0px 5px; } body #public #slider .slide a { color: inherit; text-decoration: inherit; } - body #public #slider .slide .title { + + body #public #slider .slide a{ + color: #eeeeee; + } + body #public #slider .slide a:hover{ + text-decoration:none; + } + body #public #slider .slide .title { width: 486px; height: 46px; background-image: url("/images/front/en-tete-gris.png"); @@ -84,7 +94,7 @@ body { top: 35px; left: -5px; z-index: 100; - color: RGB(50, 24, 10); + color: #32180A; font-family: Georgia; padding: 10px 10px 10px 45px; font-size: 19px; } @@ -98,7 +108,7 @@ body { left: 40px; width: 470px; height: 125px; - color: RGB(238, 238, 238); } + color: #eeeeee; } body #public #slider .slide .image_file { position: absolute; top: 20px; @@ -108,6 +118,11 @@ body { overflow: hidden; } body #public #slider .slide .image_file img { width: 415px; } + + body #public #slider .slide .title a{ + color: #32180A; + } + body #public #slider .left-arrow { position: absolute; z-index: 150; @@ -125,8 +140,8 @@ body { margin: auto; margin-bottom: 10px; } body #public #main a { - color: inherit; - text-decoration: inherit; } + color: #604435; + text-decoration: none; } body #public #main .title { font-family: georgia; font-size: 18px; @@ -273,8 +288,8 @@ body { body .article .title, body .article .description { margin-left: 130px; } body .article .title a, body .article .description a { - color: inherit; - text-decoration: inherit; } + color: #604435; + text-decoration: none; } body .folder { border: 1px solid RGB(91, 67, 46); padding: 10px; @@ -287,8 +302,8 @@ body { body .folder .title, body .folder .description { margin-left: 130px; } body .folder .title a, body .folder .description a { - color: inherit; - text-decoration: inherit; } + color: #604435; + text-decoration: none; } #flash_notice{ border:3px solid #6bb800; padding:10px; @@ -297,8 +312,8 @@ body { #home_promotions a { - color: inherit; - text-decoration: inherit; } + color: #604435; + text-decoration: #604435; } .portlet.table_content table { width: 100%; border-collapse: collapse; } diff --git a/app/views/public/home/_slide.html.haml b/app/views/public/home/_slide.html.haml index f20168d..9ecb0bf 100644 --- a/app/views/public/home/_slide.html.haml +++ b/app/views/public/home/_slide.html.haml @@ -1,12 +1,11 @@ -%li - #slide.slide{:id => slide.id, :style => "width:969px;height:309px;"} - .title - =link_to slide.title, (slide.cible ? slide.cible.url : "") if slide.image_file - - .description - =link_to simple_format(slide.description), (slide.cible ? slide.cible.url : "") if slide.image_file - +%li#slide.slide{:id => slide.id, :style => "width:969px;height:309px;"} + + .title + =link_to slide.title, (slide.cible ? slide.cible.url : "") if slide.image_file - .image_file=link_to image_tag( slide.image_file.file.large.medium.url), (slide.cible ? slide.cible.url : "") if slide.image_file - .cible= link_to image_tag('front/en-savoir-plus-gris.png'), (slide.cible ? slide.cible.url : "") - \ No newline at end of file + .description + =link_to simple_format(slide.description), (slide.cible ? slide.cible.url : "") if slide.image_file + + + .image_file=link_to image_tag( slide.image_file.file.large.medium.url), (slide.cible ? slide.cible.url : "") if slide.image_file + .cible= link_to image_tag('front/en-savoir-plus-gris.png'), (slide.cible ? slide.cible.url : "") diff --git a/public/assets/javascripts/public/public.js b/public/assets/javascripts/public/public.js index 33be635..4455ea0 100644 --- a/public/assets/javascripts/public/public.js +++ b/public/assets/javascripts/public/public.js @@ -22,11 +22,11 @@ $(document).ready(function() { $("#slider").jCarouselLite({ - btnNext: ".right-arrow", - btnPrev: ".left-arrow", - easing: "easeInOutQuad", - visible: 1, + btnNext: ".right-arrow", + btnPrev: ".left-arrow", + easing: "easeInOutQuad", + visible: 1, auto: 5000, - speed: 1000, + speed: 1000 }); }); \ No newline at end of file diff --git a/public/images/front/en-tete-gris.png b/public/images/front/en-tete-gris.png index a18b188..1378a1d 100644 Binary files a/public/images/front/en-tete-gris.png and b/public/images/front/en-tete-gris.png differ