Merge branch 'release/v11.10'

nastachku · Mar 15, 2013 · a1a394b · a1a394b
2 parents 140162f + 8e4a587
commit a1a394b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/app/assets/stylesheets/custom/_events.scss b/app/assets/stylesheets/custom/_events.scss
@@ -79,6 +79,11 @@
 .workshop h6.grey {
   white-space: pre-wrap;
 }
+.event-item {
+  padding-bottom: 30px;
+  margin-bottom: 40px;
+  border-bottom: 1px solid #f4f4f4;
+}
 
 // nav-list
 .nav-list {

diff --git a/app/views/web/events/index.html.haml b/app/views/web/events/index.html.haml
@@ -9,7 +9,7 @@
 
   .span9
     - @events.each do |event|
-      .row-fluid
+      .row-fluid.event-item
         .span4.sinfo
           .col-l
             %h5= link_to event.speaker.reverse_full_name, lectors_path(anchor: event.speaker)