Make styling changes on meeting page

pull/6827/head
Henriette Dinger 9 years ago
parent 1288a6d351
commit fec0184a31
  1. 16
      app/assets/stylesheets/meeting/meeting.css.erb
  2. 5
      app/views/meetings/index.html.erb
  3. 2
      app/views/meetings/show.html.erb

@ -24,6 +24,22 @@ div.meeting_content {padding-bottom: 2em;}
div.meetings_by_date {padding: 1em 0 1em 2em;}
dl.meetings p, div#activity dl.meetings dd, div#activity dl.meetings dt {padding: 0;}
dl.meetings {margin-bottom: 2em;}
dt.meeting {margin-bottom: 1.5em;}
dl.meetings p {margin-bottom: 0.75em;}
.meeting.details p {
margin: 0;
}
.meeting.details .block--author {
display: flex;
align-items: flex-start;
margin-bottom: 1rem;
}
.meeting.details .block--author .author {
margin-left: 10px;
}
div.tabular > div { margin: 0;
padding: 5px 0 8px 0;

@ -42,12 +42,11 @@ See doc/COPYRIGHT.md for more details.
<h3 id="<%= date.strftime("%m-%d-%Y") %>" class="date"><%= format_activity_day(date) %></h3>
<dl class="meetings">
<% meetings.each do |meeting| -%>
<dt class="meeting icon-context" id="meeting-<%= meeting.id %>">
<%= avatar meeting.author, :size => "24" %>
<span class="time"><%= format_time meeting.start_time, false %>-<%= format_time meeting.end_time, false %></span>
<dt class="meeting" id="meeting-<%= meeting.id %>">
<%= link_to h(meeting.title), :controller => '/meetings', :action => 'show', :id => meeting %>
</dt>
<dd class="meeting" id="meeting-<%= meeting.id %>">
<p><strong><%= Meeting.human_attribute_name(:time) %></strong>: <%= format_time meeting.start_time, false %>-<%= format_time meeting.end_time, false %></p>
<p><strong><%= Meeting.human_attribute_name(:location) %></strong>: <%=h meeting.location %></p>
<p><strong><%= Meeting.human_attribute_name(:participants_invited) %></strong> (<%= meeting.participants.select(&:invited).count %>): <%= format_participant_list meeting.participants.select(&:invited) %></p>
<p><strong><%= Meeting.human_attribute_name(:participants_attended) %></strong> (<%= meeting.participants.select(&:attended).count %>): <%= format_participant_list meeting.participants.select(&:attended) %></p>

@ -58,7 +58,7 @@ See doc/COPYRIGHT.md for more details.
<div class="meeting details box">
<div class="grid-block wrap">
<div class="grid-content small-12">
<div class="grid-content small-12 block--author">
<%= avatar(@meeting.author) %>
<p class="author"><%= authoring @meeting.created_at, @meeting.author %></p>
</div>

Loading…
Cancel
Save