diff --git a/app/views/events/_event.html.haml b/app/views/events/_event.html.haml
index f74dbfdf..1f815a47 100644
--- a/app/views/events/_event.html.haml
+++ b/app/views/events/_event.html.haml
@@ -2,20 +2,17 @@
= event.name
= "(#{event.metro_area.to_s})" unless event.metro_area.blank?
%p
- %strong
- %b= :when.l+":"
- =h event.time_and_date
+ %b= :when.l+":"
+ =h event.time_and_date
- unless event.location.blank?
%br
- %strong
- %b= :where.l+":"
- =h event.location
- = link_to :map_it.l, "http://www.google.com/maps?q=#{URI::encode(event.location)}", :title=>:map_it.l, :target=>'_blank'
+ %b= :where.l+":"
+ =h event.location
+ = link_to :map_it.l, "http://www.google.com/maps?q=#{URI::encode(event.location)}", :title=>:map_it.l, :target=>'_blank'
%br
- %strong
- %b=:rsvps.l+':'
- - attending = event.attendees_count == 1 ? :is_attending_this_event.l : :are_attending_this_event.l
- = pluralize(event.attendees_count, 'person') + ' ' + attending
+ %b=:rsvps.l+':'
+ - attending = event.attendees_count == 1 ? :is_attending_this_event.l : :are_attending_this_event.l
+ = pluralize(event.attendees_count, 'person') + ' ' + attending
- if event.end_time > Time.now
- if rsvp = event.rsvped?(current_user)
= link_to :retract_rsvp.l, [event, rsvp], :confirm => :are_you_sure.l, :method=>:delete
diff --git a/app/views/events/show.html.haml b/app/views/events/show.html.haml
index aa51477a..35d10253 100644
--- a/app/views/events/show.html.haml
+++ b/app/views/events/show.html.haml
@@ -7,16 +7,17 @@
= link_to :see_all_events.l, events_path
#yui-main
- -box :class => "yui-b" do
- = render :partial=>'event', :locals=>{:event=>@event, :show_details_link=>false}
- = @event.description
- - unless @event.attendees.blank?
- %p
- %b=:attendees.l+':'
- - @event.attendees.each do |user|
- = link_to h(user.display_name), user_path(user)
- - if (count = @event.attendees_for_user(user)) > 1
- = "(+#{count-1})"
+ .yui-b
+ -box :class=>'entry-content event-content' do
+ = render :partial=>'event', :locals=>{:event=>@event, :show_details_link=>false}
+ = @event.description
+ - unless @event.attendees.blank?
+ %p
+ %b=:attendees.l+':'
+ - @event.attendees.each do |user|
+ = link_to h(user.display_name), user_path(user)
+ - if (count = @event.attendees_for_user(user)) > 1
+ = "(+#{count-1})"
-box :class => 'hfeed comments', :id => 'comments' do
%h3= :event_comments.l
%h2= :add_your_comment.l
diff --git a/public/stylesheets/screen.css b/public/stylesheets/screen.css
index 8208a870..046d6cf6 100644
--- a/public/stylesheets/screen.css
+++ b/public/stylesheets/screen.css
@@ -302,7 +302,7 @@ margin-left: 10.4769em; /* about 140px */
*margin-left: 10.5em; /* for IE */
}
-.page-content{
+.page-content, .event-content{
margin-left: 0px; /* Use formatting for blog post except for left margin */
}