Merge branch 'master' of https://github.com/CactusPuppy/snapcon into 176917559-add-brand-elements-to-email

app/views/admin/schedules/_day_tab.html.haml

@@ -3,11 +3,13 @@
 / use smaller cell heights for more compact grids
 - cell_height = compact_grid ? 32 : 58
 - date_event_schedules = @event_schedules.select{ |e| e.start_time.to_date.eql? date }
+/ Dynamically set the column width, but no narrower than 2 (on a BS grid of 12)
+- col_size = [2, (12 / @rooms.count).to_i ].max
 .row
   - @rooms.each do |room|
     - non_schedulable = room.tracks.self_organized.confirmed.any? do |track|
       - !track.schedules.include?(@schedule) && (track.start_date..track.end_date).include?(date)
-    .col-md-2.col-xs-6{ class: ('non_schedulable' if non_schedulable) }
+    .col-xs-6{ class: "#{('non_schedulable' if non_schedulable)} col-md-#{col_size}" }
       .room-name
         - room_date_event_schedules = date_event_schedules.select{ |e| e.room == room }
         = room.name

app/views/conferences/_highlights.haml

@@ -6,14 +6,14 @@
   .col-md-12
     .row.row-centered.shuffle-deck
       - highlights.each do |event|
-        - speaker = event.speakers_ordered.first
-        .col-md-3.col-sm-3.col-centered.col-top.highlights
-          = link_to(conference_program_proposal_path(conference_id,
-            event),
-            class: 'thumbnail') do
-            = image_tag speaker.profile_picture(size: 300),
-              class: ['img-responsive', 'img-circle'],
-              title: speaker.name
-            .caption
-              %h3.text-center= speaker.name
-              %h4.text-center= event.title
+        - event.speakers_ordered.each do |speaker|
+          .col-md-3.col-sm-3.col-centered.col-top.highlights
+            = link_to(conference_program_proposal_path(conference_id,
+              event),
+              class: 'thumbnail') do
+              = image_tag speaker.profile_picture(size: 300),
+                class: ['img-responsive', 'img-circle'],
+                title: speaker.name
+              .caption
+                %h3.text-center= speaker.name
+                %h4.text-center= event.title