nicolas/pic_vert_app
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

base

Browse Source
This commit is contained in:
Nicolas Bally 2014-12-09 00:45:11 +01:00
parent 76dca29297
commit c94713a9c1
4 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/assets/stylesheets/public.scss
View File

@ -512,7 +512,7 @@ article{
font-family:arial; font-family:arial;
p{ p{
margin-left:10px; margin-left:10px;
color:black;
} }
h1{ h1{
margin:0; 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;
}

16
app/views/layouts/public.html.haml
View File

@ -71,13 +71,14 @@
-article = Article.before(Date.today).recents.first -article = Article.before(Date.today).recents.first
-if article -if article
.first_article %a{:href => public_article_path(:id => article.slug)}
.image=image_tag article.image_file.file.large.medium.url if article.image_file .first_article
.image=image_tag article.image_file.file.large.medium.url if article.image_file
.description .description
%h1=article.title %h1=article.title
=simple_format article.description =simple_format article.description
.clear .clear
-articles = Article.before(Date.today).recents.offset(1).limit(6) -articles = Article.before(Date.today).recents.offset(1).limit(6)
@ -95,9 +96,6 @@
=render Article.before(Date.today).recents.first
=link_to "tout les articles >", "/blog.html", :class => "articles_button"
=yield =yield
#sidebar #sidebar

7
app/views/public/articles/show.html.haml
View File

@ -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

0
db/migrate/20121202213450_devise_create_admins.rb → db/migrate/0001_devise_create_admins.rb
View File