diff --git a/app/assets/stylesheets/avatars.css b/app/assets/stylesheets/avatars.css index c5ee440d7..a55112b8c 100644 --- a/app/assets/stylesheets/avatars.css +++ b/app/assets/stylesheets/avatars.css @@ -3,6 +3,7 @@ --avatar-border-radius: 50%; aspect-ratio: 1; + block-size: var(--avatar-size, 5ch); border-radius: var(--avatar-border-radius); display: grid; inline-size: var(--avatar-size, 5ch); diff --git a/app/assets/stylesheets/card-columns.css b/app/assets/stylesheets/card-columns.css index 86f2f8582..9204019f7 100644 --- a/app/assets/stylesheets/card-columns.css +++ b/app/assets/stylesheets/card-columns.css @@ -42,6 +42,14 @@ font-size: 1.8cqi; } + + .card__title { + pointer-events: none; + } + + .card__link { + z-index: 1; + } } /* Considering diff --git a/app/assets/stylesheets/card-perma.css b/app/assets/stylesheets/card-perma.css index 6bdc256c7..85e8ff02f 100644 --- a/app/assets/stylesheets/card-perma.css +++ b/app/assets/stylesheets/card-perma.css @@ -11,7 +11,11 @@ align-items: start; column-gap: var(--inline-space); display: grid; - grid-template-columns: auto minmax(0, 960px) auto; + grid-template-areas: + "qw cutout-top we" + "actions-left card actions-right" + "er cutout-bottom rt"; + grid-template-columns: 48px minmax(0, 960px) 48px; inline-size: fit-content; max-inline-size: 100%; margin-inline: auto; @@ -35,6 +39,7 @@ .card-perma__bg { background-color: var(--color-container); border-radius: 0.2em; + grid-area: card; padding: var(--padding-block) var(--padding-inline); } @@ -48,6 +53,12 @@ } } + .card-perma__actions--left { grid-area: actions-left; } + .card-perma__actions--right { grid-area: actions-right; } + + /* Cutouts + /* -------------------------------------------------------------------------- */ + .card-perma__cutout { --card-cutout-padding-block: 0.5ch; --border-radius: 1em; @@ -57,13 +68,17 @@ border-radius: 99rem; color: color-mix(in srgb, var(--card-color) 40%, var(--color-ink)); display: inline-flex; + inline-size: auto; gap: var(--inline-space); justify-content: center; + margin-inline: auto; padding: var(--card-cutout-padding-block) 1.5ch; position: relative; text-align: center; z-index: 0; + grid-columns-start: 2; + &:has([open]) { z-index: 1; } @@ -81,8 +96,11 @@ } .card-perma__cutout--top { + grid-area: cutout-top; min-inline-size: 36ch; - translate: 0 50%; + position: absolute; + inset-inline-start: 50%; + translate: -50% -50%; #header:has(&) { position: relative; @@ -104,6 +122,7 @@ } .card-perma__cutout--bottom { + grid-area: cutout-bottom; padding-inline-start: 0.5ch; translate: 0 -50%; } diff --git a/app/assets/stylesheets/cards.css b/app/assets/stylesheets/cards.css index 32c170f94..b56b14bac 100644 --- a/app/assets/stylesheets/cards.css +++ b/app/assets/stylesheets/cards.css @@ -19,6 +19,10 @@ text-align: start; z-index: 1; + .avatar { + --avatar-size: 2.75em; + } + .local-time-value { font-weight: bold; } @@ -58,11 +62,6 @@ inset: 0; position: absolute; z-index: -1; - - .cards &, - .cards--grid & { - z-index: 1; - } } .card__header { @@ -102,17 +101,10 @@ min-block-size: 3lh; text-wrap: balance; - .cards & { - pointer-events: none; - } - .card__title-field { - &:is(textarea) { - - &::placeholder { - color: inherit; - opacity: 0.5; - } + &:is(textarea)::placeholder { + color: inherit; + opacity: 0.5; } } diff --git a/app/views/cards/show.html.erb b/app/views/cards/show.html.erb index ec52246ed..fa977390b 100644 --- a/app/views/cards/show.html.erb +++ b/app/views/cards/show.html.erb @@ -25,11 +25,12 @@ <% end %> -<%= render "cards/doing_toggle", card: @card %> -