diff --git a/app/assets/stylesheets/_global.css b/app/assets/stylesheets/_global.css index c7cdf4280..7c9136ab4 100644 --- a/app/assets/stylesheets/_global.css +++ b/app/assets/stylesheets/_global.css @@ -63,6 +63,10 @@ --tray-size: var(--footer-height); } + /* Layout */ + --main-padding: clamp(var(--inline-space), 3vw, calc(var(--inline-space) * 3)); + --main-width: 1400px; + /* Z-index */ --z-events-column-header: 1; --z-events-day-header: 3; diff --git a/app/assets/stylesheets/card-columns.css b/app/assets/stylesheets/card-columns.css index d7207cfab..b02f8b9bf 100644 --- a/app/assets/stylesheets/card-columns.css +++ b/app/assets/stylesheets/card-columns.css @@ -12,7 +12,7 @@ --bubble-size: 3.5rem; container-type: inline-size; - max-inline-size: 1400px; + max-inline-size: var(--main-width); @media (max-width: 639px) { --bubble-gap: -0.5rem; @@ -206,7 +206,7 @@ } .cards__decoration { - --size: 4em; + --size: 4.25em; background-color: var(--color-canvas); background-image: radial-gradient(ellipse at bottom, @@ -222,7 +222,7 @@ &:before { background: radial-gradient(ellipse at bottom, color-mix(in srgb, var(--color-considering) 30%, transparent) 0%, - transparent 60%); + transparent 70%); content: ""; inset: 0; mask: radial-gradient(6px at 50% calc(100% + 3px), transparent calc(99% - 2px), black calc(101% - 2px) 99%, transparent 101%) calc(50% - 8px) calc(50% - 3px + .5px)/16px 6px, diff --git a/app/assets/stylesheets/header.css b/app/assets/stylesheets/header.css index deb98906f..abe3dc6c6 100644 --- a/app/assets/stylesheets/header.css +++ b/app/assets/stylesheets/header.css @@ -13,7 +13,7 @@ "menu menu menu" "actions-start title actions-end"; max-inline-size: 100dvw; - padding: calc(var(--block-space-half) + env(safe-area-inset-top)) var(--inline-space); + padding: calc(var(--block-space-half) + env(safe-area-inset-top)) var(--main-padding); view-transition-name: header; /* Change the grid size depending on how many buttons are present */ @@ -25,6 +25,12 @@ row-gap: var(--block-space-half); } + &:has(~ #main .card-columns) { + inline-size: 100dvw; + margin-inline: auto; + max-inline-size: var(--main-width); + } + nav { grid-area: menu; margin-inline: auto; diff --git a/app/assets/stylesheets/layout.css b/app/assets/stylesheets/layout.css index 1833c3950..c7e682e75 100644 --- a/app/assets/stylesheets/layout.css +++ b/app/assets/stylesheets/layout.css @@ -9,8 +9,6 @@ } :where(#main) { - --main-padding: clamp(var(--inline-space), 3vw, calc(var(--inline-space) * 3)); - inline-size: 100dvw; margin-inline: auto; max-inline-size: 100dvw; diff --git a/app/assets/stylesheets/popup.css b/app/assets/stylesheets/popup.css index 914d3fc9e..eb3743f2e 100644 --- a/app/assets/stylesheets/popup.css +++ b/app/assets/stylesheets/popup.css @@ -32,7 +32,6 @@ } #header:has(&) { - max-inline-size: 100vw; position: relative; z-index: 5; } diff --git a/app/views/cards/index.html.erb b/app/views/cards/index.html.erb index 258fb089d..0f52be2ea 100644 --- a/app/views/cards/index.html.erb +++ b/app/views/cards/index.html.erb @@ -40,11 +40,13 @@ dragover->drag-and-drop#dragOver drop->drag-and-drop#drop dragend->drag-and-drop#dragEnd" } do %> -
Nothing here
+<%= @user_filtering.any? ? "No matches" : "Nothing here" %>
<% end %> diff --git a/app/views/cards/index/engagement/_doing.html.erb b/app/views/cards/index/engagement/_doing.html.erb index b158ce3d6..f17e26190 100644 --- a/app/views/cards/index/engagement/_doing.html.erb +++ b/app/views/cards/index/engagement/_doing.html.erb @@ -20,5 +20,7 @@ <%= cards_next_page_link "doing-cards", page: page, filter: filter %> <% end %> + <% else %> +<%= @user_filtering.any? ? "No matches" : "Nothing here" %>
<% end %> diff --git a/app/views/cards/index/engagement/_on_deck.html.erb b/app/views/cards/index/engagement/_on_deck.html.erb index 44105b2f6..1caf61147 100644 --- a/app/views/cards/index/engagement/_on_deck.html.erb +++ b/app/views/cards/index/engagement/_on_deck.html.erb @@ -14,5 +14,7 @@ <%= cards_next_page_link "on-deck-cards", page: page, filter: filter %> <% end %> + <% else %> +<%= @user_filtering.any? ? "No matches" : "Nothing here" %>
<% end %> diff --git a/app/views/collections/edit.html.erb b/app/views/collections/edit.html.erb index 499655d50..1b95d3f27 100644 --- a/app/views/collections/edit.html.erb +++ b/app/views/collections/edit.html.erb @@ -1,7 +1,16 @@ -<% @page_title = "Collection Settings" %> +<% @page_title = "Settings" %> <% content_for :header do %> <%= render "filters/menu", user_filtering: @user_filtering %> +