diff --git a/app/assets/stylesheets/card-columns.css b/app/assets/stylesheets/card-columns.css index de0086391..2ee21a9f8 100644 --- a/app/assets/stylesheets/card-columns.css +++ b/app/assets/stylesheets/card-columns.css @@ -492,6 +492,7 @@ --column-color: var(--color-ink-lighter); margin-block: var(--cards-gap); + margin-inline-start: auto; .card { --card-color: var(--color-card-complete) !important; diff --git a/app/views/cards/index.html.erb b/app/views/cards/index.html.erb index 24f7b8562..92b00a7b7 100644 --- a/app/views/cards/index.html.erb +++ b/app/views/cards/index.html.erb @@ -18,7 +18,9 @@ <% end %> - <%= render "filters/settings", user_filtering: @user_filtering %> +

+ <%= @user_filtering.selected_collections_label %> +

<% if collection = @filter.single_collection %> @@ -27,6 +29,8 @@
<% end %> +<%= render "filters/settings", user_filtering: @user_filtering %> + <%= tag.div data: { controller: "drag-and-drop", drag_and_drop_dragged_item_class: "drag-and-drop__dragged-item", diff --git a/app/views/cards/index/_columns.html.erb b/app/views/cards/index/_columns.html.erb index f826f2e47..76a911121 100644 --- a/app/views/cards/index/_columns.html.erb +++ b/app/views/cards/index/_columns.html.erb @@ -1,19 +1,6 @@ <% cache @cache_key do %> <%= turbo_frame_tag :card_columns do %>
- -
-

- <%= @user_filtering.selected_collections_label %> -

- - <% user_filtering.collections.limit(5).last(4).each do |collection| %> -
- <%= link_to collection.name, cards_path(collection_ids: [ collection ]), class: "btn btn--plain font-weight-black txt-subtle txt-normal" %> -
- <% end %> -
- <%= render "cards/index/engagement/on_deck", user_filtering: user_filtering, **on_deck.to_h %> <%= render "cards/index/engagement/considering", user_filtering: user_filtering, **considering.to_h %> diff --git a/app/views/filters/_settings.html.erb b/app/views/filters/_settings.html.erb index 6b2278817..6297a7219 100644 --- a/app/views/filters/_settings.html.erb +++ b/app/views/filters/_settings.html.erb @@ -3,6 +3,9 @@ class: class_names("filters flex align-center gap-half justify-center center margin-block-end", { "filters--expanded": user_filtering.expanded? }), data: { controller: "toggle-class", toggle_class_toggle_class: "filters--expanded" } do %>
+ <%= render "filters/settings/terms", user_filtering: user_filtering %> <%= render "filters/settings/controls", user_filtering: user_filtering %>