diff --git a/app/assets/stylesheets/public.scss b/app/assets/stylesheets/public.scss index 94e3420..5372a0e 100644 --- a/app/assets/stylesheets/public.scss +++ b/app/assets/stylesheets/public.scss @@ -29,14 +29,14 @@ a{ } body{ - font-family:Lato; + font-family:"Museo sans"; font-weight:300; line-height:1.4em; text-align:justify; padding:0; margin:0; - font-size:14px; + font-size:15px; color:#333333; @@ -572,6 +572,8 @@ article{ } + + h1{ color:#69952f; @@ -614,4 +616,41 @@ h1{ } +} +.articles_index{ + + a{ + color:inherit; + &:hover{ + + color:inherit; + text-decoration:none; + } + + + } +} + + +.article_list{ + + .image{ + width:200px; + float:left; + background: #757575 center center no-repeat; + background-size:100%; + background-size:cover; + + overflow:hidden; + margin-bottom:5px; + } + .description{ + + + margin-left:210px; + margin-bottom:5px; + + } + + } \ No newline at end of file diff --git a/app/views/public/articles/_index.html.haml b/app/views/public/articles/_index.html.haml index 99e96e9..5ebc14a 100644 --- a/app/views/public/articles/_index.html.haml +++ b/app/views/public/articles/_index.html.haml @@ -3,17 +3,18 @@ -articles = @articles -if articles - .articles + .articles_index -articles.each do |article| %a{:href => public_article_path(:id => article.slug)} - .article + .article_list .image=image_tag article.image_file.file.large.medium.url if article.image_file .description - %h2=article.title + %h1=article.title + =simple_format article.description - .clear + .clear #articles_pagination= paginate @articles -else %p