diff --git a/app/assets/stylesheets/events.css b/app/assets/stylesheets/events.css index 9a04d5ee2..0b19fe853 100644 --- a/app/assets/stylesheets/events.css +++ b/app/assets/stylesheets/events.css @@ -118,6 +118,8 @@ } .event__title { + --lines: 4; + font-size: 1.1em; line-height: 1.2; } diff --git a/app/assets/stylesheets/trays.css b/app/assets/stylesheets/trays.css index e60631c08..c37c6ae9c 100644 --- a/app/assets/stylesheets/trays.css +++ b/app/assets/stylesheets/trays.css @@ -41,6 +41,10 @@ &:nth-child(5) { --position: 5; } &:nth-child(6) { --position: 6; } + &:nth-child(n+7) .notification__content { + box-shadow: none !important; + } + .tray[open] & { --offset: calc((100% + var(--block-space-half)) * (var(--position) * -1)); --scale: 1; diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb index e8afb6f4e..4af17cbb0 100644 --- a/app/helpers/events_helper.rb +++ b/app/helpers/events_helper.rb @@ -71,7 +71,7 @@ module EventsHelper "#{ event.creator == Current.user ? "You" : event.creator.name } assigned #{ event.assignees.pluck(:name).to_sentence } to #{ card_title(event.card) }".html_safe end when "unassigned" - "#{ event.creator == Current.user ? "You" : event.creator.name } unassigned #{ event.assignees.pluck(:name).to_sentence } from #{ card_title(event.card) }".html_safe + "#{ event.creator == Current.user ? "You" : event.creator.name } unassigned #{ event.assignees.include?(Current.user) ? "yourself" : event.assignees.pluck(:name).to_sentence } from #{ card_title(event.card) }".html_safe when "boosted" "#{ event.creator == Current.user ? "You" : event.creator.name } boosted #{ card_title(event.card) }".html_safe when "commented" @@ -81,9 +81,9 @@ module EventsHelper when "closed" "#{ event.creator == Current.user ? "You" : event.creator.name } closed #{ card_title(event.card) }".html_safe when "staged" - "#{event.creator == Current.user ? "You" : event.creator.name} changed the stage to #{event.stage_name} on #{ card_title(event.card) }".html_safe + "#{event.creator == Current.user ? "You" : event.creator.name} moved #{ card_title(event.card) } to the #{event.stage_name} stage".html_safe when "unstaged" - "#{event.creator == Current.user ? "You" : event.creator.name} removed #{ card_title(event.card) } from the #{event.stage_name} stage".html_safe + "#{event.creator == Current.user ? "You" : event.creator.name} moved #{ card_title(event.card) } out ofthe #{event.stage_name} stage".html_safe when "due_date_added" "#{event.creator == Current.user ? "You" : event.creator.name} set the date to #{event.particulars.dig('particulars', 'due_date').to_date.strftime('%B %-d')} on #{ card_title(event.card) }".html_safe when "due_date_changed" @@ -91,7 +91,7 @@ module EventsHelper when "due_date_removed" "#{event.creator == Current.user ? "You" : event.creator.name} removed the date on #{ card_title(event.card) }" when "title_changed" - "#{event.creator == Current.user ? "You" : event.creator.name} renamed on #{ card_title(event.card) } (was: '#{event.particulars.dig('particulars', 'old_title')})'".html_safe + "#{event.creator == Current.user ? "You" : event.creator.name} renamed #{ card_title(event.card) } (was: '#{event.particulars.dig('particulars', 'old_title')})'".html_safe end end diff --git a/app/views/cards/_closure_toggle.html.erb b/app/views/cards/_closure_toggle.html.erb index 9f0238501..fe0c6c043 100644 --- a/app/views/cards/_closure_toggle.html.erb +++ b/app/views/cards/_closure_toggle.html.erb @@ -1,8 +1,8 @@ -