diff --git a/app/assets/stylesheets/buttons.css b/app/assets/stylesheets/buttons.css index a6e1e1139..693ba2429 100644 --- a/app/assets/stylesheets/buttons.css +++ b/app/assets/stylesheets/buttons.css @@ -201,15 +201,19 @@ } :first-of-type .btn { - border-top-left-radius: 2em; border-bottom-left-radius: 2em; + border-inline-end: 0; + border-top-left-radius: 2em; flex: 1 0 50%; + padding-inline-end: 0.8em; } :last-of-type .btn { - border-top-right-radius: 2em; border-bottom-right-radius: 2em; + border-inline-start: 0; + border-top-right-radius: 2em; flex: 1 0 50%; + padding-inline-start: 0.8em; } span { diff --git a/app/assets/stylesheets/cards.css b/app/assets/stylesheets/cards.css index 61beab9b2..57024929f 100644 --- a/app/assets/stylesheets/cards.css +++ b/app/assets/stylesheets/cards.css @@ -50,6 +50,13 @@ .card__tags { font-size: var(--text-small); } + + &:is(.card--drafted) { + --card-color: var(--color-subtle-dark) !important; + + border-color: var(--card-color) !important; + border-style: dashed !important; + } } } @@ -153,7 +160,8 @@ &.card__actions-container--top { margin: calc(var(--block-space) * 1) auto calc(var(--block-space) * -0.66); - min-inline-size: 30ch; + min-inline-size: 28ch; + padding: 0; #header:has(&) { position: relative; 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/models/card/engageable.rb b/app/models/card/engageable.rb index aac48232c..f811b639a 100644 --- a/app/models/card/engageable.rb +++ b/app/models/card/engageable.rb @@ -7,7 +7,7 @@ module Card::Engageable has_one :engagement, dependent: :destroy, class_name: "Card::Engagement" scope :doing, -> { published.active.joins(:engagement) } - scope :considering, -> { published.active.where.missing(:engagement) } + scope :considering, -> { published_or_drafted_by(Current.user).active.where.missing(:engagement) } scope :stagnated, -> { doing.where(last_active_at: ..STAGNATED_AFTER.ago) } end diff --git a/app/views/cards/_closure_toggle.html.erb b/app/views/cards/_closure_toggle.html.erb index 6ad45c388..246464dc3 100644 --- a/app/views/cards/_closure_toggle.html.erb +++ b/app/views/cards/_closure_toggle.html.erb @@ -1,8 +1,8 @@ -
+
<% if card.closed? %> - Completed by <%= card.closed_by.name %> on <%= local_datetime_tag(card.closed_at, style: :shortdate) %>. + Completed by <%= card.closed_by.name %> on <%= local_datetime_tag(card.closed_at, style: :shortdate) %>. <%= button_to card_closure_path(card), method: :delete, class: "btn btn--plain borderless fill-transparent" do %> - Un-do + Un-do <% end %> <% else %>
diff --git a/app/views/cards/_image.html.erb b/app/views/cards/_image.html.erb index b7b037be1..c1617792e 100644 --- a/app/views/cards/_image.html.erb +++ b/app/views/cards/_image.html.erb @@ -3,7 +3,7 @@ <%= icon_tag "picture-remove" %> Clear background image <% end %> -<% else %> +<% elsif !card.closed? %> <%= form_with model: card, url: collection_card_path(card.collection, card), data: { controller: "form" } do |form| %>