diff --git a/app/assets/stylesheets/bar.css b/app/assets/stylesheets/bar.css index 29889ef38..23376ce97 100644 --- a/app/assets/stylesheets/bar.css +++ b/app/assets/stylesheets/bar.css @@ -10,7 +10,7 @@ font-size: 0.9em; inset: auto 0 0 0; max-block-size: 100%; - padding: 0 calc(var(--tray-size) + calc(var(--inline-space) * 3)) env(safe-area-inset-bottom); + padding: var(--block-space) calc(var(--tray-size) + calc(var(--inline-space) * 3)) calc(var(--block-space) + env(safe-area-inset-bottom)); place-content: center; position: fixed; z-index: var(--z-terminal); diff --git a/app/assets/stylesheets/card-columns.css b/app/assets/stylesheets/card-columns.css index de52fe37c..88e829f7a 100644 --- a/app/assets/stylesheets/card-columns.css +++ b/app/assets/stylesheets/card-columns.css @@ -461,7 +461,7 @@ inset: calc(var(--column-width-collapsed) + var(--block-space-half)) 0 0 0; mask: var(--wavy-background-mask); position: absolute; - z-index: 0; + z-index: -1; } } diff --git a/app/assets/stylesheets/filters.css b/app/assets/stylesheets/filters.css index b911649da..5999d2598 100644 --- a/app/assets/stylesheets/filters.css +++ b/app/assets/stylesheets/filters.css @@ -108,8 +108,8 @@ --input-border-radius: 5em; --input-padding: 0.5em 2.3em 0.5em 1.3em; - inline-size: 22ch; - min-inline-size: 22ch; + inline-size: 25ch; + min-inline-size: 25ch; .filters:not(.filters--expanded, .filters--has-filters-set) & { margin-inline-end: calc((var(--btn-size) + var(--inline-space-half) + 0.25em) * -1); diff --git a/app/assets/stylesheets/search.css b/app/assets/stylesheets/search.css index 371ed21fd..bf6b44c07 100644 --- a/app/assets/stylesheets/search.css +++ b/app/assets/stylesheets/search.css @@ -69,6 +69,7 @@ summary { inset: 0 0 auto 0; justify-content: flex-end; padding: var(--block-space-half) var(--block-space); + pointer-events: none; position: absolute; } diff --git a/app/assets/stylesheets/settings.css b/app/assets/stylesheets/settings.css index afc3beed8..a1c37e88d 100644 --- a/app/assets/stylesheets/settings.css +++ b/app/assets/stylesheets/settings.css @@ -19,7 +19,7 @@ display: flex; flex-direction: column; - gap: var(--settings-spacer); + gap: calc(var(--settings-spacer) / 2); min-block-size: 100%; min-inline-size: 0; @@ -45,7 +45,7 @@ display: flex; flex-direction: column; - gap: var(--settings-spacer); + gap: calc(var(--settings-spacer) / 4); min-height: 0; } diff --git a/app/assets/stylesheets/trays.css b/app/assets/stylesheets/trays.css index b024a0412..f36927d1c 100644 --- a/app/assets/stylesheets/trays.css +++ b/app/assets/stylesheets/trays.css @@ -383,11 +383,13 @@ background-color: var(--card-bg-color); inset: 0 0 auto auto; opacity: 0; + pointer-events: none; position: absolute; z-index: 1; .tray__dialog[open] & { opacity: 0.66; + pointer-events: unset; &:hover { opacity: 1; diff --git a/app/helpers/pagination_helper.rb b/app/helpers/pagination_helper.rb index 6c67400c7..4a1603e6a 100644 --- a/app/helpers/pagination_helper.rb +++ b/app/helpers/pagination_helper.rb @@ -5,7 +5,7 @@ module PaginationHelper def link_to_next_page(namespace, page, activate_when_observed: false, label: "Load more...", data: {}, **attributes) if page.before_last? && !params[:previous] - pagination_link(namespace, page.number + 1, label: label, activate_when_observed: activate_when_observed, data: data, class: "margin-block btn txt-small center", **attributes) + pagination_link(namespace, page.number + 1, label: label, activate_when_observed: activate_when_observed, data: data, class: "btn txt-small center-block center", **attributes) end end diff --git a/app/views/account/_user.html.erb b/app/views/account/_user.html.erb index add56b38f..78395ff1c 100644 --- a/app/views/account/_user.html.erb +++ b/app/views/account/_user.html.erb @@ -1,7 +1,10 @@
  • <%= link_to user, class: "txt-ink flex gap-half align-center min-width" do %> <%= avatar_preview_tag user, hidden_for_screen_reader: true %> - <%= user.name %> +
    + <%= user.name %> +
    <%= user.email_address %>
    +
    <% end %> diff --git a/app/views/account/settings/_users.html.erb b/app/views/account/settings/_users.html.erb index cbcbaee50..61449f09a 100644 --- a/app/views/account/settings/_users.html.erb +++ b/app/views/account/settings/_users.html.erb @@ -8,14 +8,10 @@ <%#= render "account/invite" # Scheduled work in https://3.basecamp.com/2914079/buckets/37331921/todos/8746162337 %>
    - + -
    <% end %> diff --git a/app/views/collections/_access_toggle.erb b/app/views/collections/_access_toggle.erb index 9940d6b14..824cace65 100644 --- a/app/views/collections/_access_toggle.erb +++ b/app/views/collections/_access_toggle.erb @@ -1,7 +1,10 @@
  • <%= link_to user, class: "txt-ink flex gap-half align-center min-width" do %> <%= avatar_preview_tag user, hidden_for_screen_reader: true %> - <%= user.name %> +
    + <%= user.name %> +
    <%= user.email_address %>
    +
    <% end %> diff --git a/app/views/collections/edit/_users.html.erb b/app/views/collections/edit/_users.html.erb index ea518b681..6e12f5016 100644 --- a/app/views/collections/edit/_users.html.erb +++ b/app/views/collections/edit/_users.html.erb @@ -18,7 +18,7 @@
  • - +