From 499bde8349c0b11a886ef5d22ff04b146e860c0c Mon Sep 17 00:00:00 2001 From: Nicolas Bally Date: Thu, 28 Jul 2016 23:08:58 +0200 Subject: [PATCH] suite --- app/assets/stylesheets/popover.scss | 34 ++++-- app/assets/stylesheets/public.scss | 104 ++++++++++++++++-- app/views/layouts/public.html.haml | 35 +++++- .../render_public/_gallerycontent.html.haml | 2 + public/Icones+.png | Bin 0 -> 722 bytes public/icone-mail-w.png | Bin 0 -> 1568 bytes public/icone-telephone-w.png | Bin 0 -> 1177 bytes 7 files changed, 154 insertions(+), 21 deletions(-) create mode 100644 public/Icones+.png create mode 100755 public/icone-mail-w.png create mode 100755 public/icone-telephone-w.png diff --git a/app/assets/stylesheets/popover.scss b/app/assets/stylesheets/popover.scss index fd014e7..62ed60d 100644 --- a/app/assets/stylesheets/popover.scss +++ b/app/assets/stylesheets/popover.scss @@ -89,22 +89,42 @@ box-sizing:border-box; text-align: center; - + .overlay{ + display:none; + } img{ width:100%; } } a{ - - - - - img:hover{ - opacity:0.6; + position:relative; + &:hover{ + .overlay{ + display:block; + background:url('/icones+.png') no-repeat center center ; + position:absolute; + top:0; + left:0; + right:0; + bottom:0; + + + } + + + img{ + opacity:0.6; + } + + + } + + + } } img{ diff --git a/app/assets/stylesheets/public.scss b/app/assets/stylesheets/public.scss index f094183..682cbdc 100644 --- a/app/assets/stylesheets/public.scss +++ b/app/assets/stylesheets/public.scss @@ -56,7 +56,7 @@ $blue :#2dadb1; background:white; margin:auto; - max-width:900px; + max-width:800px; position:relative; @@ -81,6 +81,16 @@ $blue :#2dadb1; margin-left: 0px; margin-right: 0px; } + +.no-padding{ + +.center{ + padding:0; +} + + +} + #nous-bloc{ .center{ max-width:1250px; @@ -115,7 +125,7 @@ $blue :#2dadb1; max-width:950px; } .service-inner{ - max-width:350px; + max-width:320px; margin:auto; img{ margin-bottom:10px; @@ -145,11 +155,11 @@ $blue :#2dadb1; } body{ - font-family:Helvetica, Arial, sans-serif; + font-family:'Open Sans', Helvetica, Arial, sans-serif; line-height:1.4em; text-align:left; - font-weight:300; + font-weight:400; padding:0; margin:0; @@ -157,7 +167,7 @@ body{ font-size: 16px; line-height: 22px; color: black; - font-weight: 300; + padding-top:120px; @@ -208,7 +218,7 @@ h3{ text-transform:uppercase; font-size:20px; padding-right:15px; - + font-weight:300; a{ color:black; text-decoration:none; @@ -277,13 +287,15 @@ h3{ max-width: 650px; h1{ text-transform:none; - font-weight:500; - font-size:26px; + font-weight:600; + font-size:30px; color:black; span{ display:block; - font-weight:500; - font-size:1.6em; + margin-top:5px; + margin-bottom:20px; + font-weight:700; + font-size:40px; color:black; } @@ -419,6 +431,78 @@ h3{ } } +.contact_links{ + text-align:right; + + position:fixed; + + right:0px; + top:300px; + + + .right_td + { + padding-left:5px; + text-align:left; + display:none; + } + + + a, .top_link{ + background:$blue; + display:block; + padding:5px 0px; + text-align:center; + width:60px; + + color:white; + + + + + margin:0; + cursor:pointer; + + + table{ + width:100%; + td{ + padding:0; + } + + } + .left_td{ + width:60px; + } + + + + + + + + } + + &:hover{ + a{ + width:210px; + color:white; + + .right_td + { + + display:table-cell; + } + } + } + + + .top_link{ + + //display:inline; + } +} + .tag-gal{ .element{ float:left; diff --git a/app/views/layouts/public.html.haml b/app/views/layouts/public.html.haml index 84f5a6b..0e4ad84 100644 --- a/app/views/layouts/public.html.haml +++ b/app/views/layouts/public.html.haml @@ -24,8 +24,7 @@ = stylesheet_link_tag 'public' = stylesheet_link_tag '/fonts/Stylograph/stylesheet.css' - - + =javascript_include_tag "http://maps.google.com/maps/api/js?sensor=false®ion=FR" @@ -80,10 +79,14 @@ l’agence de communication globale, %span créateur d’ondes positives ! %p - Nous travaillons de la conception à la réalisation de votre identité visuelle + Nous travaillons de la conception à la réalisation de votre identité %br - adaptée à votre positionnement, afin de communiquer de manière + visuelle + + adaptée à votre positionnement, afin de communiquer %br + de manière + cohérente sur vos différents supports Print & Digitaux @@ -150,6 +153,30 @@ .top_link =i(:"arrow-up") + + .contact_links + + =link_to "#", :target => "_blank",:onclick => "$('html,body').animate({scrollTop: ($('#contact-bloc').offset().top - 50)},'slow');return false;", :class => "link facebook" do + + %table + %tr + %td.left_td + =image_tag "/icone-telephone-w.png" + %td.right_td + 09 50 11 76 71 + %br + 06 62 95 47 70 + + + + =link_to "#", :target => "_blank",:onclick => "$('html,body').animate({scrollTop: ($('#contact-bloc').offset().top - 50)},'slow');return false;", :class => "link twitter" do + %table + %tr + %td.left_td + =image_tag "/icone-mail-w.png" + %td.right_td + Contact / Devis + .popup_overlay .popup_container diff --git a/app/views/portlets/render_public/_gallerycontent.html.haml b/app/views/portlets/render_public/_gallerycontent.html.haml index 05839b9..142cab1 100644 --- a/app/views/portlets/render_public/_gallerycontent.html.haml +++ b/app/views/portlets/render_public/_gallerycontent.html.haml @@ -76,6 +76,8 @@ -if !gallery_images.more =link_to (gallery_images.big_image_file ? gallery_images.big_image_file.file.large.url : gallery_images.image_file.file.large.url), :title => gallery_images.title, :class => "real_gal_link" do =image_tag(gallery_images.image_file.file.large.medium.url, :alt => "#{gallery_images.title}") + .overlay + -if input.show_title .title=gallery_images.title -if input.show_description diff --git a/public/Icones+.png b/public/Icones+.png new file mode 100644 index 0000000000000000000000000000000000000000..f33a510ab15d42cf8c54112df4d442e786b8b227 GIT binary patch literal 722 zcmV;@0xkWCP)eHCJ*tdF(EV(m<_1lJ08`UIP6AXdtjSo=EGEH!8;!HpOa z?zG;V$Ftb8j5NU}LGDl;rAj#@NH&$8NE5t@gY`B_;Q+3c9xN5?#kq#)q;tl?w1i^8 z77R92C!O2E9|*;QmlvPNkru%P3xaJpm5WX~C&ib+{Hv}X>#D7`v$@%WeLY3Tre=TI z|MGRUC7Ytt#YFfOPgGl}jvPml2&<88Im@KchVDdIGObp65_IQnkwJHYj=U{0=t$6- zw?zi6g|4CDpV+Y6$kXlHo!Y&tW}W+9z42*gX1QU%5)^9IwGJfsk+(z!KN3vlZIQub zp=)UPi3;`xS=8ZGH_y{V*srcuMiXIEy;^yj;629kHc4R|?-L=8c$l+H8V~Vje!)73 zxg2FmnZr#MR@CFTpPNoO_r(0BuqfSX5#orJoTTQN78Wqm6mOcQH6}?|jsa1Q@_q4R z+-ayzF?XZGKhlzg3m9pLPB9}wPE$mh;2e(OMZJv{@jUh{n@N^Rw`OrzV;=V%9Em;4 z$jS$Q3wzV!n5w;(saU%|_DZFag!K_RaZ7C`^En}Z>5R2AsWhXW5>l^rT(N=>d=V4z z+IAs`ujr{1{^K*mUSUt&EljLwpCQIDDy*2^sp2!lU%MZFQWP&NumAu607*qoM6N<$ Eg0&r4VE_OC literal 0 HcmV?d00001 diff --git a/public/icone-mail-w.png b/public/icone-mail-w.png new file mode 100755 index 0000000000000000000000000000000000000000..e09711715052f82cf864d5a22f9f5f9d958d98af GIT binary patch literal 1568 zcmV+*2H*LKP)zLX&N<}>1Z*{$QP%}IGTOPoGG2m zDfNRnHKkjvrrBsI1PbCEC4J2cVg@Mef^u18cl)pl3GTjo6Ec5acJ}P^f1m%%p7)&R zJV${KXmoldFagN5e~tiRflxpIEI>1G4Y&v#0}cVlBvISxZC-_!X2$~yffs>rFCNhV zd-%DfeupL+~iQ0Ns zfi6vJbov>aWa{w-i1{bLw=o_+SbPH}2lqtmYf*2~58 z5dyH@p5Gx3r-w$TUk-fSSFSvuP!hH4dJo=bTBFlH2khz>OYSjC61BVU9q3_NqtnL$ zr+~2jbmamgFjf+^)m;O<=j&%YT!z8s=d*hUx=m|z`dPrt{&wUhGwuEW`}EN0^a|hv zFjh_(s8ljEC=kKB-QOt~U@|!i8H>&5-Y(M%le9p#G)7d?^Z3P6e{iW{wM%qc42x4&!2j2z64yeY&52f3wH2?8HYNMre^C#Y>} z{0@yYs3vKMZL0BvS7`H2Z^%1S3#rR255;e4Js38g~7Vzn}DNHno-&VM-s zpv7CU0$81vN={THC3QEMwr@Yb*VU5~70ItpPiMuLQ8b!5m{(lFs?(J`=I_sz>`cM~ z0(|k@B49htdqqKV5@K8|=ZsAhlvmJb>R|EVa<*N%OqjnvRmLX7gT+)DjC^zXDjUyB z3=In8%j^sSl}gtM9Mhl#E?{f0c*I=$)?U-n%A(RTS~_jL7qivMn$u_bp}K}kw{K%I zTe>yttIiXp9)K7Z%ZBucEICrnU5mw83TIppfJ#qQPYsFT{nQi;9UUwzJ>sy)sWLY8 zFbrS?-aB!c;<|b!M@8^KTBbRP&FG;7YBrOo+ndCKnd-xuQSAc%tiY7}TyX!h^%I*N31r7r)8&gaJ z9|G@dvh=OhWJ}VbqI!ViK(p0_Qt&BoT$80ivk9i8MMW(KI)EcK#mvwP9Mfd!M!JD% zrA0+;26}*v84ydy1kkF<(uGumgj5$rMSTf4Pj-Yc*7?L(Hz`S_MMZrLIF)M5Dj@); zjP(KcrC$~UvG?m~)|N0td`>S9EJ=%sdI&g>Z6lK$F#G^RT2xdAaKh?LbsI|QY4Xre zX6H$6nG=TR(l`A$P;X_1hB6o3o?Sd#=A!+fI-Cw$WsDW-iFhtaAGMO*=q{tn(@1e{ z4gl5bi;=6gWYjPTM*$q7qLu)YK%SYbnv(ULd9;ZFr!y)(84R-b{6zxcaK=rSaR+b< zz-~+m13Xq)5ho1bE-2ucng=qcmzX?Yw?L$TH_iOQLegu^o3c`(>=A%kD;Za3eF@_W zx=xq(r%XttqgDX6S;-ihp5gCM{7$L!$1y&>{(GjxQn5|I;&v$z4x^4=kDuwDl1xdZ z!zBPkR%^;DP(h4|{m6bJ9$OrG=KJFO@u2YKrj@|{ku`EIhWvVzXW26mOZ zX{oLzM{w}NtdEec+gbK&hp4C>z^it$7pdD&N|&dRlHA<5YhhhaSWHa>0-U@$!nt36 zv%1_H0+BY=iuitJmZt~4;LkuX?pm_yZ)0I09Su8ZsorXJxqbl{AX12|2(SMy4)=e~ z(DaPyoM1T2sNZj8nLEIMpvjUS=u0=+3=@F>M?M?mt&ve~hm+SR5D|X<%gcOc;X?v_ znk@Mje?8rHMPmu;I&Y6^?7wi4Ge3_LN>E_knh){Z;3Y0iPFbD48;sq!v5gtR;_k%^ zuKaxVRc>OZ%f;rRb=;Z{(Q$2r5#LR#Qw;;#HCfV^ekI1nQO%@qhLJQ`It%fAk8`Ze z9r;I^EFD~Y6I*+{NTfNkmhchrS|Uo?=;E|y)5rv^%ezaEpd)JZ&Dyf2l$y5KJ{}}# z;~JgH_ElF(O?#q_DWo|GFq+$MlHDHl0`Q6^OP$FEm^r@K3w*%ca(n?`Oi)MUAZIn{ r1?tiX!~gk6E|$CM@H3YG>X`W-2A*C4CqzjD00000NkvXXu0mjfV#q7Y literal 0 HcmV?d00001