base

2014-12-09 00:45:11 +01:00 · 2014-12-09 00:45:11 +01:00 · c94713a9c1
commit c94713a9c1
parent 76dca29297
4 changed files with 25 additions and 12 deletions
--- 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;
@ -557,3 +557,13 @@ article{
  }
  
 }
+
+h1{
+
+  color:#69952f;
+  text-transform:uppercase;
+  font-weight:bold;
+  font-size:22px;
+  line-height:24px;
+  font-family:$header_font;
+}
--- a/app/views/layouts/public.html.haml
+++ b/app/views/layouts/public.html.haml
@ -71,6 +71,7 @@
          -article = Article.before(Date.today).recents.first
            
          -if article
+            %a{:href => public_article_path(:id => article.slug)}
              .first_article
                .image=image_tag article.image_file.file.large.medium.url if article.image_file
              
@ -95,9 +96,6 @@
          
          
      
-          =render Article.before(Date.today).recents.first
-          =link_to "tout les articles >", "/blog.html", :class => "articles_button"
-          
        =yield
      
      #sidebar
--- 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
--- a/db/migrate/20121202213450_devise_create_admins.rb
+++ b/db/migrate/20121202213450_devise_create_admins.rb