From 1122976c9b9e58fcb5a2671f4982c506dc1be6ed Mon Sep 17 00:00:00 2001 From: Nicolas Bally Date: Sat, 11 Apr 2015 19:49:08 +0200 Subject: [PATCH] title font --- app/assets/stylesheets/public.scss | 4 +- app/assets/stylesheets/public/layout.css.scss | 52 +++++++++++++------ .../public/articles/_article_img.html.haml | 15 ++---- 3 files changed, 41 insertions(+), 30 deletions(-) diff --git a/app/assets/stylesheets/public.scss b/app/assets/stylesheets/public.scss index 7f2ac4a..351c2db 100644 --- a/app/assets/stylesheets/public.scss +++ b/app/assets/stylesheets/public.scss @@ -28,8 +28,8 @@ body{ h1,h2,h3,h4{ - font-weight:normal; - font-family:"Lato"; + font-weight:600; + font-family:"jaf-bernino-sans", sans-serif; a{ color:#1e1e1e; diff --git a/app/assets/stylesheets/public/layout.css.scss b/app/assets/stylesheets/public/layout.css.scss index 2fa7086..f5d0b74 100644 --- a/app/assets/stylesheets/public/layout.css.scss +++ b/app/assets/stylesheets/public/layout.css.scss @@ -62,7 +62,7 @@ navigation#first_nav{ #corps{ float:left; - width:60%; + width:65%; box-sizing: border-box; } @@ -72,7 +72,7 @@ navigation#first_nav{ } #sidebar{ padding:20px; - width:40%; + width:35%; float:right; box-sizing: border-box; @@ -203,25 +203,45 @@ footer{ } .article_img{ - - margin-bottom:20px; - - *{ - color:white; - - } - h3{ - margin-top:10px; - margin-bottom:10px; + position:relative; + .content{ + position:absolute; + top:0; + bottom:0; + left:0; + right:0; + } background:center center no-repeat; background-size:100%; background-size:cover; text-align:center; - padding:10px; - p.article_infos{ - margin-top:0; + padding:50px 0; + color:white; + display:block; + font-family:"jaf-bernino-sans", sans-serif; + text-transform:uppercase; + + span{ + display:inline-block; + padding:5px 10px; + border:1px solid white; + position:relative; + } + margin-bottom:20px; + + &:hover{ + .content{ + background:rgba(255,255,255,0.2) + + } + span{ + + background:rgba(0,0,0,0.2); + color:white; + } + } } @@ -239,7 +259,7 @@ article, .corps_content{ padding:50px 0; color:white; display:block; - font-family:Lato; + font-family:"jaf-bernino-sans", sans-serif; text-transform:uppercase; span{ diff --git a/app/views/public/articles/_article_img.html.haml b/app/views/public/articles/_article_img.html.haml index d0bd24d..409390f 100644 --- a/app/views/public/articles/_article_img.html.haml +++ b/app/views/public/articles/_article_img.html.haml @@ -1,18 +1,9 @@ -.article_img{:style => "background-image:url('#{(article.image_file.file.large.medium.small.url if article.image_file)}')"} +%a.article_img{:href => article_path(:slug => article.slug), :style => "background-image:url('#{(article.image_file.file.large.medium.small.url if article.image_file)}')"} - - %h3=link_to article.title, article_path(:slug => article.slug), :title => " "+article.title.to_s + .content + %span=article.title - - %p.article_infos - - - - %time.updated{:datetime => Time.now, :pubdate => true} - - ="le "+l(article.published_at, :format => :human_date) - .clear