diff --git a/app/assets/stylesheets/public.scss b/app/assets/stylesheets/public.scss index c3b59c7..f1ba022 100644 --- a/app/assets/stylesheets/public.scss +++ b/app/assets/stylesheets/public.scss @@ -325,7 +325,7 @@ margin:auto; } } -$header_font : "Source sans pro"; +$header_font : "source-sans-pro"; .top_background{ @@ -370,7 +370,7 @@ text-align:center; h1,h2,h3,h4{ text-align:left; font-weight: 400; -font-family:$header_font; +font-family:$header_font, Arial, sans-serif; a{ color:black; @@ -381,7 +381,7 @@ a{ margin-top:10px; margin-bottom:-20px; font-size:18px; - font-family:$header_font; + font-family:$header_font, Arial, sans-serif; } h1{ font-size:30px; @@ -536,7 +536,7 @@ article{ font-weight:bold; font-size:22px; line-height:24px; - font-family:$header_font; + font-family:$header_font, arial, sans-serif; } } @@ -547,7 +547,7 @@ article{ .image{ width:15%; float:left; - background:#69952f; + background:#757575; height:80px; overflow:hidden; margin-bottom:5px; @@ -564,7 +564,7 @@ article{ font-weight:bold; font-size:16px; padding-left:10px; - font-family:$header_font; + font-family:$header_font, Arial, sans-serif; } } @@ -576,10 +576,24 @@ h1{ font-weight:bold; font-size:22px; line-height:24px; - font-family:$header_font; + font-family:$header_font, Arial, sans-serif; } .article_date{ text-align:left; margin-bottom:10px; +} + + +.event{ + .image{ + max-width:150px; + max-height:100px; + height:500px; + width:100%; + + background:#757575; + } + + } \ No newline at end of file diff --git a/app/views/public/events/_event.html.haml b/app/views/public/events/_event.html.haml index 0e02b87..df65165 100644 --- a/app/views/public/events/_event.html.haml +++ b/app/views/public/events/_event.html.haml @@ -1,15 +1,15 @@ = event_human_date(event) -%ul - %li - %strong=event.title +.event + .image=image_tag event.image_file.file.large.medium.url if event.image_file + + %strong=event.title - -if event.description and event.description != "" - =":" - = truncate(event.description, :length => 150) - - -if event.block.portlets.size > 0 - %br=link_to "En savoir plus", public_event_path(event) - - + -if event.description and event.description != "" + =simple_format event.description + + -if event.block.portlets.size > 0 + %br=link_to "En savoir plus", public_event_path(event) + + diff --git a/test/fixtures/faqs.yml b/test/fixtures/faqs.yml new file mode 100644 index 0000000..c9a20f1 --- /dev/null +++ b/test/fixtures/faqs.yml @@ -0,0 +1,11 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + title: MyString + description: MyText + enabled: false + +two: + title: MyString + description: MyText + enabled: false diff --git a/test/models/faq_test.rb b/test/models/faq_test.rb new file mode 100644 index 0000000..0249270 --- /dev/null +++ b/test/models/faq_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class FaqTest < ActiveSupport::TestCase + # test "the truth" do + # assert true + # end +end