diff --git a/Gemfile.lock b/Gemfile.lock index 999e8dae8..44c91583d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://github.com/basecamp/active_record-tenanted - revision: 13b60769047226d5cb10d92eb1f2e1bc19773438 + revision: f04f4f0a153ae5da65b400021aa97fdb28ac86b5 specs: active_record-tenanted (0.1.0) activerecord (>= 8.1.alpha) diff --git a/app/assets/stylesheets/_global.css b/app/assets/stylesheets/_global.css index 3dbe697a3..f5f164164 100644 --- a/app/assets/stylesheets/_global.css +++ b/app/assets/stylesheets/_global.css @@ -11,8 +11,8 @@ /* Text */ --text-xx-small: 0.55rem; - --text-x-small: 0.7rem; - --text-small: 0.8rem; + --text-x-small: 0.75rem; + --text-small: 0.85rem; --text-normal: 1rem; --text-medium: 1.1rem; --text-large: 1.5rem; diff --git a/app/assets/stylesheets/avatars.css b/app/assets/stylesheets/avatars.css index a55112b8c..d30bb984f 100644 --- a/app/assets/stylesheets/avatars.css +++ b/app/assets/stylesheets/avatars.css @@ -10,7 +10,8 @@ margin: 0; place-items: center; - img { + img, + .icon { aspect-ratio: 1; block-size: auto; border-radius: var(--avatar-border-radius); diff --git a/app/assets/stylesheets/card-perma.css b/app/assets/stylesheets/card-perma.css index 4f25c7810..e9db1f020 100644 --- a/app/assets/stylesheets/card-perma.css +++ b/app/assets/stylesheets/card-perma.css @@ -15,7 +15,7 @@ "qw notch-top we" "actions-left card actions-right" "er notch-bottom rt"; - grid-template-columns: 48px minmax(0, 960px) 48px; + grid-template-columns: 48px minmax(0, 1120px) 48px; inline-size: fit-content; max-inline-size: 100%; margin-inline: auto; @@ -31,6 +31,15 @@ border: none; } + + .card__meta, + .card__stages { + font-size: var(--text-small); + } + + .card__stages { + max-inline-size: 32ch; + } } /* Children diff --git a/app/assets/stylesheets/comments.css b/app/assets/stylesheets/comments.css index 5ac91e94e..32043d88a 100644 --- a/app/assets/stylesheets/comments.css +++ b/app/assets/stylesheets/comments.css @@ -12,7 +12,7 @@ text-align: center; @media (min-width: 160ch) { - padding-inline: calc(var(--tray-size) + var(--inline-space) * 1.5); + padding-inline: var(--tray-size); } } diff --git a/app/assets/stylesheets/events.css b/app/assets/stylesheets/events.css index cc35fb77c..ac3fc2a9b 100644 --- a/app/assets/stylesheets/events.css +++ b/app/assets/stylesheets/events.css @@ -12,6 +12,7 @@ --grid-lines: 0.1rem; margin: auto; + max-inline-size: min(105ch, 100%); } .events__day-header { @@ -82,6 +83,12 @@ z-index: 2; } + .event__collection { + font-size: var(--text-x-small); + font-weight: 500; + opacity: 0.66; + } + .event__grid-item { background-color: var(--color-container); block-size: 100%; diff --git a/app/assets/stylesheets/filters.css b/app/assets/stylesheets/filters.css index cf7c894f0..e374ca3d0 100644 --- a/app/assets/stylesheets/filters.css +++ b/app/assets/stylesheets/filters.css @@ -107,3 +107,11 @@ } } } + +.filter--active li { + display: none; + + &.selected { + display: flex; + } +} diff --git a/app/assets/stylesheets/panels.css b/app/assets/stylesheets/panels.css index 108d7c42a..3d4620288 100644 --- a/app/assets/stylesheets/panels.css +++ b/app/assets/stylesheets/panels.css @@ -12,4 +12,20 @@ --panel-border-color: var(--color-subtle-dark); } } + + .panels--two-up { + --panel-size: auto; + + display: flex; + flex-wrap: wrap; + gap: var(--block-space-double); + align-content: start; + max-inline-size: min(100ch, 100%); + margin: auto; + + .panel { + flex: 1 1 33%; + min-inline-size: 36ch; + } + } } diff --git a/app/assets/stylesheets/users.css b/app/assets/stylesheets/users.css new file mode 100644 index 000000000..e3e427779 --- /dev/null +++ b/app/assets/stylesheets/users.css @@ -0,0 +1,4 @@ +.users-list { + max-block-size: 40dvh; + overflow: auto; +} diff --git a/app/assets/stylesheets/utilities.css b/app/assets/stylesheets/utilities.css index 4fbcd0425..7c50c3b9d 100644 --- a/app/assets/stylesheets/utilities.css +++ b/app/assets/stylesheets/utilities.css @@ -108,6 +108,7 @@ .pad-inline-double { padding-inline: var(--inline-space-double); } .unpad { padding: 0; } + .unpad-block-end { padding-block-end: 0; } .unpad-inline { padding-inline: 0; } /* Margins */ diff --git a/app/assets/stylesheets/workflows.css b/app/assets/stylesheets/workflows.css index 21e36b9c6..a2b852b43 100644 --- a/app/assets/stylesheets/workflows.css +++ b/app/assets/stylesheets/workflows.css @@ -28,4 +28,40 @@ } } } + + .workflow-preview { + --border-size: 3px; + + flex: 1 1 30%; + max-inline-size: 33%; + padding: 0.5em 1em; + + button { + --hover-size: 0; + + appearance: none; + background: transparent; + border: none; + cursor: pointer; + inline-size: auto; + margin: 0; + max-inline-size: 100%; + outline: 0; + padding: 0; + text-align: left; + } + } + + .workflow-preview--selected { + --border-color: var(--color-link); + } + + .workflow-preview__swatch { + --btn-size: 1em; + --btn-border-radius: 50%; + --btn-border-size: 0; + --hover-size: 0; + + cursor: auto; + } } diff --git a/app/helpers/accesses_helper.rb b/app/helpers/accesses_helper.rb index a139ac3d4..8715b8165 100644 --- a/app/helpers/accesses_helper.rb +++ b/app/helpers/accesses_helper.rb @@ -1,6 +1,6 @@ module AccessesHelper def access_menu_tag(collection, &) - tag.menu class: [ "flex flex-column gap margin-none pad txt-medium", { "toggler--toggled": collection.all_access? } ], data: { + tag.menu class: [ "flex flex-column gap-half unpad margin-none txt-medium", { "toggler--toggled": collection.all_access? } ], data: { controller: "filter toggle-class", filter_active_class: "filter--active", filter_selected_class: "selected", toggle_class_toggle_class: "toggler--toggled" }, & diff --git a/app/models/card/closeable.rb b/app/models/card/closeable.rb index 64945af0c..1040c27dd 100644 --- a/app/models/card/closeable.rb +++ b/app/models/card/closeable.rb @@ -1,6 +1,15 @@ module Card::Closeable extend ActiveSupport::Concern + AUTO_CLOSE_OPTIONS = [ + [ "30 days", 30.days ], + [ "60 days", 60.days ], + [ "90 days", 90.days ], + [ "6 months", 180.days ], + [ "1 year", 365.days ], + [ "Never", nil ] + ].freeze + AUTO_CLOSE_AFTER = 30.days included do diff --git a/app/views/collections/_access_toggle.erb b/app/views/collections/_access_toggle.erb index aee7bb248..e08f1dc85 100644 --- a/app/views/collections/_access_toggle.erb +++ b/app/views/collections/_access_toggle.erb @@ -1,4 +1,4 @@ -