diff --git a/app/assets/stylesheets/popup.css b/app/assets/stylesheets/popup.css
index e9c3bcbaf..4deab9f7e 100644
--- a/app/assets/stylesheets/popup.css
+++ b/app/assets/stylesheets/popup.css
@@ -41,17 +41,9 @@
}
}
- .popup__footer {
- background-color: var(--color-canvas);
- border-block-start: 1px solid var(--color-ink-lighter);
- font-size: var(--text-small);
- inset: auto 0 0;
- line-height: 1.6;
- margin-block-start: var(--block-space-half);
- padding: 1.5ch;
- position: sticky;
- text-align: center;
- z-index: 1;
+ .popup__title {
+ font-weight: 800;
+ white-space: nowrap;
}
.popup__group {
@@ -87,6 +79,22 @@
}
}
+ .popup__group-title {
+ background: var(--color-canvas);
+ font-size: var(--text-small);
+ font-weight: bold;
+ list-style: none;
+ padding: var(--block-space-half) var(--inline-space-half);
+ position: sticky;
+ text-transform: uppercase;
+ top: calc(-1 * var(--block-space));
+ z-index: 1;
+
+ &::-webkit-details-marker {
+ display: none;
+ }
+ }
+
.popup__list {
display: flex;
flex-direction: column;
@@ -125,8 +133,7 @@
}
.icon {
- block-size: 1em;
- inline-size: 1em;
+ --icon-size: 1em;
}
&:has(input:checked) {
@@ -155,21 +162,22 @@
}
}
- .popup__title {
- font-weight: 800;
- }
-
- .popup__group-title {
- background: var(--color-canvas);
+ .popup__footer {
+ background-color: var(--color-canvas);
+ border-block-start: 1px solid var(--color-ink-lighter);
font-size: var(--text-small);
- font-weight: bold;
- padding: var(--block-space-half) var(--inline-space-half);
+ inset: auto 0 0;
+ line-height: 1.6;
+ margin-block-start: var(--block-space-half);
+ padding: 1.5ch;
position: sticky;
- text-transform: uppercase;
- top: calc(-1 * var(--block-space));
+ text-align: center;
z-index: 1;
}
+ /* Variants
+ /* ------------------------------------------------------------------------ */
+
.popup--animated {
opacity: 0;
transform: scale(0.2) translateX(-50%);
diff --git a/app/views/cards/assignments/new.html.erb b/app/views/cards/assignments/new.html.erb
index 69c499524..27eaf3a91 100644
--- a/app/views/cards/assignments/new.html.erb
+++ b/app/views/cards/assignments/new.html.erb
@@ -5,7 +5,7 @@
dialog_target: "dialog",
navigable_list_focus_on_selection_value: false,
navigable_list_actionable_items_value: true } do %>
- Assign this to…
+ Assign this to…
<% if @collection.users.active.count > 1 %>
<%= text_field_tag :search, nil, placeholder: "Filter…", class: "input input--transparent txt-small margin-block-half", autofocus: true,
diff --git a/app/views/cards/display/perma/_collection.html.erb b/app/views/cards/display/perma/_collection.html.erb
index bd8bb7873..d73e49486 100644
--- a/app/views/cards/display/perma/_collection.html.erb
+++ b/app/views/cards/display/perma/_collection.html.erb
@@ -12,7 +12,7 @@
dialog_target: "dialog",
navigable_list_focus_on_selection_value: false,
navigable_list_actionable_items_value: true } do %>
- Move this card to…
+ Move this card to…
<% if Current.user.collections.count > 1 %>
<%= text_field_tag :search, nil, placeholder: "Filter…", class: "input input--transparent txt-small margin-block-half font-weight-normal", autofocus: true,
diff --git a/app/views/cards/taggings/new.html.erb b/app/views/cards/taggings/new.html.erb
index fda452f3a..ae49ef1cd 100644
--- a/app/views/cards/taggings/new.html.erb
+++ b/app/views/cards/taggings/new.html.erb
@@ -5,7 +5,7 @@
data-navigable-list-actionable-items-value="true"
data-action="keydown->navigable-list#navigate filter:changed->navigable-list#reset dialog:show@document->navigable-list#reset"
>
- Tag this…
+ Tag this…
<%= form_with url: card_taggings_path(@card), class: "flex flex-column gap-half full-width margin-block-half" do |form| %>
<%= form.text_field :tag_title, placeholder: @tags.any? ? "Add a new tag or filter…" : "Name this tag…", class: "input txt-small full-width",
diff --git a/app/views/filters/menu/_collections.html.erb b/app/views/filters/menu/_collections.html.erb
index 0375ff705..2b81a5890 100644
--- a/app/views/filters/menu/_collections.html.erb
+++ b/app/views/filters/menu/_collections.html.erb
@@ -1,11 +1,12 @@
-<%= form_with url: user_filtering.self_filter_path, method: :get, class: "display-contents",
- data: { controller: "form" } do |form| %>
- <% if user_filtering.collections.any? %>
+<% if user_filtering.collections.any? %>
+ Collections
-
-
- <% end %>
+ <%= form_with url: user_filtering.self_filter_path, method: :get, class: "display-contents", data: { controller: "form" } do |form| %>
+
+ <%= render "filters/menu/collections/all_option", form: form, user_filtering: user_filtering %>
+ <%= render partial: "filters/menu/collections/collection", collection: user_filtering.collections, as: :collection, locals: { form: form, user_filtering: user_filtering } %>
+
+ <% end %>
+