diff --git a/app/assets/stylesheets/public.scss b/app/assets/stylesheets/public.scss index 2806351..ee1c12b 100644 --- a/app/assets/stylesheets/public.scss +++ b/app/assets/stylesheets/public.scss @@ -512,7 +512,7 @@ article{ font-family:arial; p{ margin-left:10px; - + color:black; } h1{ margin:0; @@ -556,4 +556,14 @@ article{ font-family:$header_font; } +} + +h1{ + + color:#69952f; + text-transform:uppercase; + font-weight:bold; + font-size:22px; + line-height:24px; + font-family:$header_font; } \ No newline at end of file diff --git a/app/views/layouts/public.html.haml b/app/views/layouts/public.html.haml index d2ee824..57441f3 100644 --- a/app/views/layouts/public.html.haml +++ b/app/views/layouts/public.html.haml @@ -71,13 +71,14 @@ -article = Article.before(Date.today).recents.first -if article - .first_article - .image=image_tag article.image_file.file.large.medium.url if article.image_file + %a{:href => public_article_path(:id => article.slug)} + .first_article + .image=image_tag article.image_file.file.large.medium.url if article.image_file - .description - %h1=article.title - =simple_format article.description - .clear + .description + %h1=article.title + =simple_format article.description + .clear -articles = Article.before(Date.today).recents.offset(1).limit(6) @@ -94,10 +95,7 @@ .clear - - =render Article.before(Date.today).recents.first - =link_to "tout les articles >", "/blog.html", :class => "articles_button" - + =yield #sidebar diff --git a/app/views/public/articles/show.html.haml b/app/views/public/articles/show.html.haml index 0020c7f..e1b1dbe 100644 --- a/app/views/public/articles/show.html.haml +++ b/app/views/public/articles/show.html.haml @@ -1 +1,6 @@ -=render @article + +%h1=@article.title +=image_tag @article.image_file.file.large.medium.url +.description=simple_format @article.description +%hr +=render @article.block diff --git a/db/migrate/20121202213450_devise_create_admins.rb b/db/migrate/0001_devise_create_admins.rb similarity index 100% rename from db/migrate/20121202213450_devise_create_admins.rb rename to db/migrate/0001_devise_create_admins.rb