diff --git a/app/assets/stylesheets/meeting/meeting.css.erb b/app/assets/stylesheets/meeting/meeting.css.erb index 531a32af03..9fbe196e49 100644 --- a/app/assets/stylesheets/meeting/meeting.css.erb +++ b/app/assets/stylesheets/meeting/meeting.css.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; diff --git a/app/views/meetings/index.html.erb b/app/views/meetings/index.html.erb index 1c7d285c0c..23c6dafd8c 100644 --- a/app/views/meetings/index.html.erb +++ b/app/views/meetings/index.html.erb @@ -42,12 +42,11 @@ See doc/COPYRIGHT.md for more details.

" class="date"><%= format_activity_day(date) %>

<% meetings.each do |meeting| -%> -
- <%= avatar meeting.author, :size => "24" %> - <%= format_time meeting.start_time, false %>-<%= format_time meeting.end_time, false %> +
<%= link_to h(meeting.title), :controller => '/meetings', :action => 'show', :id => meeting %>
+

<%= Meeting.human_attribute_name(:time) %>: <%= format_time meeting.start_time, false %>-<%= format_time meeting.end_time, false %>

<%= Meeting.human_attribute_name(:location) %>: <%=h meeting.location %>

<%= Meeting.human_attribute_name(:participants_invited) %> (<%= meeting.participants.select(&:invited).count %>): <%= format_participant_list meeting.participants.select(&:invited) %>

<%= Meeting.human_attribute_name(:participants_attended) %> (<%= meeting.participants.select(&:attended).count %>): <%= format_participant_list meeting.participants.select(&:attended) %>

diff --git a/app/views/meetings/show.html.erb b/app/views/meetings/show.html.erb index 5f63990223..8e56b7f426 100644 --- a/app/views/meetings/show.html.erb +++ b/app/views/meetings/show.html.erb @@ -58,7 +58,7 @@ See doc/COPYRIGHT.md for more details.
-
+
<%= avatar(@meeting.author) %>

<%= authoring @meeting.created_at, @meeting.author %>