From 41baabf4f3306dd1275536f396d05d9325d05e33 Mon Sep 17 00:00:00 2001 From: Nicolas Bally Date: Sun, 12 Apr 2015 11:59:28 +0200 Subject: [PATCH] =?UTF-8?q?Modifs=20design=20+=20cat=C3=A9gories?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/assets/images/front/logo copie.png | Bin 12310 -> 0 bytes app/assets/images/front/logo.png | Bin 12445 -> 26835 bytes app/assets/stylesheets/public.scss | 31 ++++++---- app/assets/stylesheets/public/layout.css.scss | 54 +++++++++++++++--- app/models/category.rb | 2 +- app/views/layouts/public.html.haml | 4 +- .../public/articles/_article_intro.html.haml | 14 +++-- .../articles/_sidebar_categories.html.haml | 2 +- 8 files changed, 83 insertions(+), 24 deletions(-) delete mode 100644 app/assets/images/front/logo copie.png diff --git a/app/assets/images/front/logo copie.png b/app/assets/images/front/logo copie.png deleted file mode 100644 index cf0b4285072e01c60d769cae0a5917ff6c70acde..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12310 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 WMx8~HNO1FShrnVoqJ_`3z5WjgD4n?g delta 55 zcmcb7k#TO~1Pd(&g=CK)Uj~Lebq0pw^$ZN(a~K%ffc)Ig3=FRhF)$d|F)&EznLM7y Kwt0qywE+Or5)f7Z diff --git a/app/assets/stylesheets/public.scss b/app/assets/stylesheets/public.scss index b62b138..7d136ed 100644 --- a/app/assets/stylesheets/public.scss +++ b/app/assets/stylesheets/public.scss @@ -74,20 +74,31 @@ a{ float:right; } -.coms{ - font-family:"jaf-bernino-sans", sans-serif; - font-size:14px; - a{ - color:inherit; + +article{ + .category{ + font-family:"jaf-bernino-sans", sans-serif; + font-size:14px; + a{ + color:inherit; + + } } -} -time{ - font-family:"jaf-bernino-sans", sans-serif; - font-size:14px; + .coms{ + font-family:"jaf-bernino-sans", sans-serif; + font-size:14px; + a{ + color:inherit; + + } + } + time{ + font-family:"jaf-bernino-sans", sans-serif; + font-size:14px; + } } - .sidebar_title{ font-weight:normal; border-bottom:1px solid #858585; diff --git a/app/assets/stylesheets/public/layout.css.scss b/app/assets/stylesheets/public/layout.css.scss index abbce5a..2973f28 100644 --- a/app/assets/stylesheets/public/layout.css.scss +++ b/app/assets/stylesheets/public/layout.css.scss @@ -13,16 +13,43 @@ color: #333; } header#top{ display:block; - + h1{ + font-weight:normal; + font-size:1.7em; + position:absolute; + top:50px; + left:160px; + margin:0; + a{ + color:black; + } + + } + + h2{ + font-weight:normal; + font-size:1.1em; + + position:absolute; + top:85px; + left:160px; + margin:0; + a{ + color:#99BB52; + + } + + } .center{ max-width:1200px; margin:auto; + position:relative; } background: url('/assets/front/top.png') repeat-x; img{ - width:120px; + height:120px; float:left; margin:20px 0px; margin-left:20px; @@ -262,6 +289,7 @@ footer{ article, .corps_content{ padding:40px; + padding-top:30px; background:white; margin-bottom:40px; @@ -354,6 +382,7 @@ article, .corps_content{ h1.principal{ text-align:center; + } @@ -372,10 +401,21 @@ h1.principal{ } @media only screen and (min-width: 0px) and (max-width: 960px) { - header#top img{ - float:none; - display:block; - margin:auto; + header#top{ + text-align:center; + h1,h2{ + position:static; + display:inline; + + + } + img{ + float:none; + display:block; + margin:auto; + margin-bottom:1em; + } + } navigation#first_nav{ @@ -383,7 +423,7 @@ h1.principal{ display:block; margin:auto; text-align:center; - + margin-top:1em; } #corps, #sidebar{ diff --git a/app/models/category.rb b/app/models/category.rb index e87fd27..66aefbb 100644 --- a/app/models/category.rb +++ b/app/models/category.rb @@ -76,7 +76,7 @@ class Category < ActiveRecord::Base before_create do if !position - top = Category.where( :parent_id => self.parent_id).order("position DESC") + top = Category.where( :parent_id => self.parent_id).order("position DESC").last if top self.position = top.position.to_i + 1 else diff --git a/app/views/layouts/public.html.haml b/app/views/layouts/public.html.haml index d9270cb..9420681 100644 --- a/app/views/layouts/public.html.haml +++ b/app/views/layouts/public.html.haml @@ -30,7 +30,9 @@ .center =link_to image_tag("front/logo.png"), "/" - + %h1=link_to "Nicolas Bally", "/" + %h2=link_to "/ Blog", "/" + %navigation#first_nav =link_to "A propos", "/a-propos-de-nicolas-bally.html" =link_to "Blog", "/" diff --git a/app/views/public/articles/_article_intro.html.haml b/app/views/public/articles/_article_intro.html.haml index bb718aa..a130e25 100644 --- a/app/views/public/articles/_article_intro.html.haml +++ b/app/views/public/articles/_article_intro.html.haml @@ -3,11 +3,17 @@ %header - .right.coms - =link_to i(:"comment-o")+" "+article.comments.count.to_s, article_path(:slug => article.slug, :anchor => "comments") - %time.updated{:datetime => Time.now, :pubdate => true} + .right + -if article.category + %span.category + =link_to article.category.name, category_public_article_path(:slug => article.category.slug), :title => "Articles de la catégorie \""+article.category.name.to_s+'"' + + .article_infos + %time.updated{:datetime => Time.now, :pubdate => true} - ="le "+l(article.published_at, :format => :human_date) + ="le "+l(article.published_at, :format => :human_date) + ="-" + %span.coms=link_to i(:"comment-o")+" "+article.comments.count.to_s, article_path(:slug => article.slug, :anchor => "comments") diff --git a/app/views/public/articles/_sidebar_categories.html.haml b/app/views/public/articles/_sidebar_categories.html.haml index f77226e..9990084 100644 --- a/app/views/public/articles/_sidebar_categories.html.haml +++ b/app/views/public/articles/_sidebar_categories.html.haml @@ -4,4 +4,4 @@ %ul -Category.order(:name).each do |category| %li - =link_to category.name+" (#{category.articles.recents.count})", category_public_article_path(:slug => category.slug), :title => "Conseil en image : articles de la catégorie \""+category.name.to_s+'"' + =link_to category.name+" (#{category.articles.recents.count})", category_public_article_path(:slug => category.slug), :title => "Articles de la catégorie \""+category.name.to_s+'"'