From 9db10007ce82c3a970adef1ca52f53d7b4a7c668 Mon Sep 17 00:00:00 2001 From: Nicolas Bally Date: Sat, 14 May 2011 22:09:14 +0200 Subject: [PATCH] =?UTF-8?q?compatibilit=C3=A9=20IE6=20:)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/assets/stylesheets/public/public.scss | 47 ++++++++++++++------- app/views/public/home/_slide.html.haml | 21 +++++---- public/assets/javascripts/public/public.js | 10 ++--- public/images/front/en-tete-gris.png | Bin 1706 -> 1766 bytes 4 files changed, 46 insertions(+), 32 deletions(-) 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 a18b188c0be273cdcc0fa8f593deee7b378247a6..1378a1d3000367dfc4391eea5652a25800553b4b 100644 GIT binary patch delta 1729 zcmXX`d0dlM7JZ6iKt-S^n*s_dBNRkNKw}z^HDZCXFD;@)_9df+#jt#~k^mMGP$G+l zum=bb2t-QROa+<2fGiCJB4|YhqAV2(6bNKqocZT_zu$MxJ@?%E-n})7|541ofE)|L zxjO?uJPE+vdjM=m;W-C@yFA!+*cSkF9suh2F@N1`0QN>*w!7q+Ffl**%0o5uXzwTX ziEQ1r6T4C+-yBmIu>M>0K{UPb9~6%l1v?7c>co}7ww?V&q97)Uy+G4+Ay%O(OKFCw zKkmWpQ5R-AbMkeXDJZ0LF(lsh!FnWF_0HP(Hs?-}YuvcOtX38o0Pu6av{juSDoE73 zHP+{V+Wo@^9EKZI(Vr1s_~NEtOY_RM+~(k%@Cpmnu{qCxjl6f-S;}F2| z9a}JqW(Im^Sy`1PfzIDXm+6LOIQhByMl=GkD?D&$|Ko=-48@*0=hJEyUEGPq&3@77mSI$1%=M95ZH3q8@UCBv zM6}hddc|T{n;l8<)j4y#Yf-*UBTv1}Gl|>?;X>lM*qha~qu(pEAAI!4 zxK{jA0Jd6)Xubbxbh%sITc7vd4n5RoF_n8ik56>wim)2qo{Ts6$jl4FYeAd8U;6Fi zugp^%BF^ngDpQV^Ju$oDhaF9b`0j=KbkWhrW*Rg;zt$i*xN_D`Gc)PaM?|_Bx-s1n z7=mdXb~9}6gTR;31U}2^H!elP(MzoSlB(-q-;J#NP@a_V_YK+%Ta+w`yEhZgCr+A1 zuGtF14QDtAmKDd}xZxOe!;|dbU~gCcYIfwwME&Gt=A`OSXz%#`g>j`|Q^NxBcpPC; zFe~+=6%-u4=yN@abnxUCS*LU4y_R;}9*b$NTf%p4b&C2llce|5%;ZmkU#`5Fz1q-` z!$6ve6>8nmj@OjmGpVG#;%9D2NZ}X12H=@s@VH)Mcfy2g z0RVFW0;isbBBRz5C34_yk$LR=$qO}OpIRFNqmy~^as#0c$K;6~B#=wb;mfJKZ2j4O>3*1PS}t>3p}qK^Xh{RI7^F3 zuWuO>8njLWpseDym)^R_N){Lr0e)bkLhy3fho&U?`9ktqcQzJmkGS zK&C7Y9T)5Z0QR$oOAD@nFdPqv>qg;gmt@SlA1SN0_XZ&cy;~ODY)Q}v4k*LGG}Q+F zt-}z&inmqkeo8$EyQ)%1rZ~0EGi9(~u(6@?jGD!$CoB{JQ$q(GwS1QQ7?*exZ z(Eh9|vr@eMbkxU7#m|5MfBR_Cf~3C|ex}e%!sj$}oaarfQgHw4oWAltO<5a$){)hL zQPAer@Muu>ZOUAg4@>5P_|Wo$NEDBgdIkxxT&4$I^*VI z=TD@P1vt|SIWEndEX#^_C!4M!9?_`whSE(*%D0#1aU!ZX4dup;WEB4E!*TmYNrot9 z?oaf!fq<^xFIxqvQH`XM>eNGmjI-VY=2}@H_#N41{;>C&EUXaLaljtmLJW{qd`C)E3*n;z~UZ{>gIq|2&b&Tex;Khs(+yMZvt)MEI^+h=oD^yI9ZdFFt zzf9{`3u5c6Pf2gggY)KXsH92-B6|m?a1mT%EFNHrXCoP6bs=MVS|3n#9Tyu7#uFsl zw~nW%UozTKV2xPorbA7E0&1AEOHY0(=Bh==gxWqPO94)TnK5~Jq4#Ku@lzKO;PM;G zw}+Vn3QC|R!R2ww`wt)5Q&8!&^Pgkmjnler)Nx30u96V@@l*ER=^WU(noP{j;|tMI zcRFRYq+Y^AaqNg@B5RHRaBRRikKDRnEI#67)3TxA+})ktm$*Ck>YMC%L{(jZ=T2Sy z!_C+8rVWUGfyQlCSyYBe)DyT;E5d$Z{#<9r)wpjPf4S1=@`a!AQVw|{AFRnb$Z@f?%3q_JlEaK?RG=m z;nG1ro}snbX%j^btVdP+DB4BO9KoZF$v-T?oI&YRqDNY-!vB14RC}~QtfLm?-zvEx zJfZu3ax6aPMj zg=P*J!S}K7(FRbT;CG{AWw2&`zc2#Q;0%WG8e6xcf7=WIjsj1HTaEw*0M`&m@pjbm z;M*VWLdse~M#?9Vy>~ABgw-r!pUeTLh-VpJlX;W%%D=oJEGc`s4M)0{lW-Cog}eOd8)%O3H^6paD&?Q0 z+z&MVfR~>kk9}m2>MA{i4+a;|_ZEp;SmAfLW9qt5#V5M@(ir6UT>0TlS$<+)C2~Y| zSugB~1M=09XahoIR@ZLo8<)><8Nc5WPu07(+y1-VOSPQZyUXyRFUIJ_HT2%PRaV7= z?0N?QIGdW&+s4T%e^Gh~&#qYbn+6EoMSp3~#_#uZu2k)x(Ujoj;qj|xRpvJ;+xA&<5rthh%^ z2Qsi1_KoVCR*j#rUoq5YGnfASIbAxxlHWiZOUs4*M_QVRy92MKhp(C$JH5TGEO`XV zZYsH*T}K^Hoof1IiN%_PwJN4E%k=z#kG}-Tp}*_0K{<=b*4LZikSgvr≻`SU%`d xs+xcL3Ad3XWbTzb%v&2CIiy{uYjdEEE-*LRQ0V<*0Q4;ZKxF8?5Oz>v;s32?16}|C