diff --git a/app/assets/stylesheets/card-columns.css b/app/assets/stylesheets/card-columns.css index 648cd1df7..675f3fe13 100644 --- a/app/assets/stylesheets/card-columns.css +++ b/app/assets/stylesheets/card-columns.css @@ -400,6 +400,10 @@ box-shadow: none !important; color: color-mix(in srgb, var(--card-color) 70%, var(--color-canvas)); + .cards--considering & { + background-color: var(--card-bg-color) !important; + } + p { font-size: var(--text-small); overflow: hidden; diff --git a/app/assets/stylesheets/cards.css b/app/assets/stylesheets/cards.css index 4b0569b54..2591332d9 100644 --- a/app/assets/stylesheets/cards.css +++ b/app/assets/stylesheets/cards.css @@ -179,17 +179,20 @@ display: none; } - & ~ .btn { - --btn-background: var(--card-color); - --btn-color: var(--color-ink-inverted); - } - } - - .card-field__description { lexxy-toolbar { border-block-start: 1px solid var(--color-ink-light); margin-block-start: var(--block-space-half) !important; } + + & ~ .btn.btn--reversed { + --btn-background: var(--card-color); + --btn-color: var(--color-ink-inverted); + } + + & ~ .btn { + --btn-border-color: var(--card-color); + --btn-color: var(--card-color); + } } .card__stages { diff --git a/app/assets/stylesheets/panels.css b/app/assets/stylesheets/panels.css index 9b0345096..a82dc1665 100644 --- a/app/assets/stylesheets/panels.css +++ b/app/assets/stylesheets/panels.css @@ -6,12 +6,22 @@ color: var(--color-ink); inline-size: var(--panel-size, 60ch); max-inline-size: 100%; - padding: var(--panel-padding, calc(var(--block-space) * 2)); + padding: var(--panel-padding, var(--block-space)); + + @media (min-width: 640px) { + --panel-size: 100%; + + padding: var(--panel-padding, var(--block-space-double)); + } } .panel--centered { --panel-border-size: 0; - --panel-size: 42ch; + --panel-size: 100%; + + @media (min-width: 640px) { + --panel-size: 42ch; + } #main:has(&) { display: grid; diff --git a/app/assets/stylesheets/tooltips.css b/app/assets/stylesheets/tooltips.css index 20a02985b..419664fc6 100644 --- a/app/assets/stylesheets/tooltips.css +++ b/app/assets/stylesheets/tooltips.css @@ -1,5 +1,5 @@ @layer components { - [data-controller^="tooltip"] { + [data-controller~="tooltip"] { --tooltip-delay: 750ms; --tooltip-duration: 150ms; diff --git a/app/controllers/account/entropies_controller.rb b/app/controllers/account/entropies_controller.rb index f45f3ef5f..00d195584 100644 --- a/app/controllers/account/entropies_controller.rb +++ b/app/controllers/account/entropies_controller.rb @@ -1,4 +1,6 @@ class Account::EntropiesController < ApplicationController + before_action :ensure_admin + def update Account.sole.entropy.update!(entropy_params) redirect_to account_settings_path, notice: "Account updated" diff --git a/app/controllers/account/join_codes_controller.rb b/app/controllers/account/join_codes_controller.rb index 026c692f9..562ffaa0d 100644 --- a/app/controllers/account/join_codes_controller.rb +++ b/app/controllers/account/join_codes_controller.rb @@ -1,5 +1,6 @@ class Account::JoinCodesController < ApplicationController before_action :set_join_code + before_action :ensure_admin, only: %i[ update destroy ] def show end diff --git a/app/controllers/boards/entropies_controller.rb b/app/controllers/boards/entropies_controller.rb index 153dafe5f..e07272e9b 100644 --- a/app/controllers/boards/entropies_controller.rb +++ b/app/controllers/boards/entropies_controller.rb @@ -1,6 +1,8 @@ class Boards::EntropiesController < ApplicationController include BoardScoped + before_action :ensure_permission_to_admin_board + def update @board.entropy.update!(entropy_params) end diff --git a/app/controllers/boards/publications_controller.rb b/app/controllers/boards/publications_controller.rb index b7cda07ee..9435bd8bf 100644 --- a/app/controllers/boards/publications_controller.rb +++ b/app/controllers/boards/publications_controller.rb @@ -1,6 +1,8 @@ class Boards::PublicationsController < ApplicationController include BoardScoped + before_action :ensure_permission_to_admin_board + def create @board.publish end diff --git a/app/controllers/boards_controller.rb b/app/controllers/boards_controller.rb index 4bff8dde4..70383e139 100644 --- a/app/controllers/boards_controller.rb +++ b/app/controllers/boards_controller.rb @@ -2,7 +2,7 @@ class BoardsController < ApplicationController include FilterScoped before_action :set_board, except: %i[ new create ] - before_action :ensure_permission_to_change_accesses, only: %i[ update ] + before_action :ensure_permission_to_admin_board, only: %i[ update ] def show if @filter.used?(ignore_boards: true) @@ -48,20 +48,12 @@ class BoardsController < ApplicationController @board = Current.user.boards.find params[:id] end - def ensure_permission_to_change_accesses - if trying_to_change_accesses? && !Current.user.can_administer_board?(@board) + def ensure_permission_to_admin_board + unless Current.user.can_administer_board?(@board) head :forbidden end end - def trying_to_change_accesses? - all_access_changed? || grantees_changed? - end - - def all_access_changed? - params[:board]&.key?(:all_access) - end - def grantees_changed? params.key?(:user_ids) end diff --git a/app/controllers/cards/assignments_controller.rb b/app/controllers/cards/assignments_controller.rb index cac32efde..fdd2a86dc 100644 --- a/app/controllers/cards/assignments_controller.rb +++ b/app/controllers/cards/assignments_controller.rb @@ -3,7 +3,7 @@ class Cards::AssignmentsController < ApplicationController def new @users = @board.users.active.alphabetically - fresh_when @users + fresh_when etag: [ @users, @card.assignees ] end def create diff --git a/app/controllers/cards/taggings_controller.rb b/app/controllers/cards/taggings_controller.rb index 50f58e34b..23bac85e3 100644 --- a/app/controllers/cards/taggings_controller.rb +++ b/app/controllers/cards/taggings_controller.rb @@ -3,7 +3,7 @@ class Cards::TaggingsController < ApplicationController def new @tags = Tag.all.alphabetically - fresh_when @tags + fresh_when etag: [ @tags, @card.tags ] end def create diff --git a/app/controllers/concerns/board_scoped.rb b/app/controllers/concerns/board_scoped.rb index 2772c7d01..f4f3a3e2b 100644 --- a/app/controllers/concerns/board_scoped.rb +++ b/app/controllers/concerns/board_scoped.rb @@ -9,4 +9,10 @@ module BoardScoped def set_board @board = Current.user.boards.find(params[:board_id]) end + + def ensure_permission_to_admin_board + unless Current.user.can_administer_board?(@board) + head :forbidden + end + end end diff --git a/app/controllers/memberships/email_addresses_controller.rb b/app/controllers/memberships/email_addresses_controller.rb index c75783ac1..0870410a9 100644 --- a/app/controllers/memberships/email_addresses_controller.rb +++ b/app/controllers/memberships/email_addresses_controller.rb @@ -1,6 +1,8 @@ class Memberships::EmailAddressesController < ApplicationController require_untenanted_access + layout "public" + before_action :set_membership rate_limit to: 5, within: 1.hour, only: :create diff --git a/app/helpers/boards_helper.rb b/app/helpers/boards_helper.rb index 7c83c5799..3fde0d2ad 100644 --- a/app/helpers/boards_helper.rb +++ b/app/helpers/boards_helper.rb @@ -1,8 +1,8 @@ module BoardsHelper def link_back_to_board(board) link_to board, class: "btn borderless txt-medium", - data: { controller: "hotkey", action: "keydown.b@document->hotkey#click click->turbo-navigation#backIfSamePath" } do - tag.span ("←" + tag.strong(board.name, class: "overflow-ellipsis") + tag.kbd("b", class: "txt-x-small margin-inline-start hide-on-touch")).html_safe + data: { controller: "hotkey", action: "keydown.left@document->hotkey#click click->turbo-navigation#backIfSamePath" } do + tag.span(tag.strong("Back to #{board.name}", class: "overflow-ellipsis") + tag.kbd("←", class: "txt-x-small margin-inline-start hide-on-touch"), class: "flex align-center").html_safe end end diff --git a/app/helpers/clipboard_helper.rb b/app/helpers/clipboard_helper.rb index b079dc6a9..972856b15 100644 --- a/app/helpers/clipboard_helper.rb +++ b/app/helpers/clipboard_helper.rb @@ -1,7 +1,7 @@ module ClipboardHelper def button_to_copy_to_clipboard(url, &) tag.button class: "btn", data: { - controller: "copy-to-clipboard", action: "copy-to-clipboard#copy", + controller: "copy-to-clipboard tooltip", action: "copy-to-clipboard#copy", copy_to_clipboard_success_class: "btn--success", copy_to_clipboard_content_value: url }, & end diff --git a/app/models/user/role.rb b/app/models/user/role.rb index a327ffcf6..e12bf0191 100644 --- a/app/models/user/role.rb +++ b/app/models/user/role.rb @@ -18,7 +18,7 @@ module User::Role admin? || other == self end - def can_administer?(other = nil) + def can_administer?(other) admin? && other != self end diff --git a/app/views/account/join_codes/edit.html.erb b/app/views/account/join_codes/edit.html.erb index de53bf8c8..14958a44c 100644 --- a/app/views/account/join_codes/edit.html.erb +++ b/app/views/account/join_codes/edit.html.erb @@ -2,8 +2,11 @@ <% content_for :header do %>
- <%= link_to account_join_code_path, class: "btn borderless txt-medium", data: { controller: "hotkey", action: "keydown.esc@document->hotkey#click" } do %> - ← Invite link + <%= link_to account_join_code_path, class: "btn borderless txt-medium", data: { controller: "hotkey", action: "keydown.left@document->hotkey#click" } do %> + + Back to Invite link + ← + <% end %>
<% end %> diff --git a/app/views/account/join_codes/show.html.erb b/app/views/account/join_codes/show.html.erb index a1efbcc5a..c528bb07d 100644 --- a/app/views/account/join_codes/show.html.erb +++ b/app/views/account/join_codes/show.html.erb @@ -2,8 +2,11 @@ <% content_for :header do %>
- <%= link_to account_settings_path, class: "btn borderless txt-medium", data: { controller: "hotkey", action: "keydown.esc@document->hotkey#click" } do %> - ← Account Settings + <%= link_to account_settings_path, class: "btn borderless txt-medium", data: { controller: "hotkey", action: "keydown.left@document->hotkey#click" } do %> + + Back to Account Settings + ← + <% end %>
<% end %> @@ -18,7 +21,7 @@
- <% if Current.user.can_administer? %> + <% if Current.user.admin? %> <%= button_to account_join_code_path, method: :delete, class: "btn btn--circle txt-small", data: { turbo_confirm: "Are you sure you want to generate a new link? The previous code will stop working." } do %> <%= icon_tag "refresh" %> @@ -62,7 +65,7 @@ This code has been used <%= @join_code.usage_count %>/<%= @join_code.usage_limit %> times (<%= @join_code.active? ? @join_code.usage_limit - @join_code.usage_count : "none" %> remaining) - <% if Current.user.can_administer? %> + <% if Current.user.admin? %> <%= link_to edit_account_join_code_path, class: @join_code.active? ? "txt-link" : "txt-negative txt-underline" do %> Change limit <% end %> diff --git a/app/views/account/settings/_entropy.html.erb b/app/views/account/settings/_entropy.html.erb index 034d8128f..11ff9b326 100644 --- a/app/views/account/settings/_entropy.html.erb +++ b/app/views/account/settings/_entropy.html.erb @@ -4,5 +4,5 @@

Fizzy doesn’t let stale cards stick around forever. Cards automatically close as “Not Now” without activity for specific period of time. This is the default, global setting — you can override it on each board.

- <%= render "entropy/auto_close", model: account.entropy, url: account_entropy_path, disabled: !Current.user.can_administer? %> + <%= render "entropy/auto_close", model: account.entropy, url: account_entropy_path, disabled: !Current.user.admin? %>
diff --git a/app/views/account/settings/_name.html.erb b/app/views/account/settings/_name.html.erb index 3c4f68f03..e3b12f325 100644 --- a/app/views/account/settings/_name.html.erb +++ b/app/views/account/settings/_name.html.erb @@ -1,7 +1,7 @@ <%= form_with model: account, url: account_settings_path, method: :put, scope: :account, data: { controller: "form" }, class: "flex gap-half" do |form| %> - <%= form.text_field :name, required: true, class: "input input--transparent full-width txt-medium", placeholder: "Account name…", data: { action: "input->form#disableSubmitWhenInvalid" }, readonly: !Current.user.can_administer? %> + <%= form.text_field :name, required: true, class: "input input--transparent full-width txt-medium", placeholder: "Account name…", data: { action: "input->form#disableSubmitWhenInvalid" }, readonly: !Current.user.admin? %> - <% if Current.user.can_administer? %> + <% if Current.user.admin? %> <%= form.button class: "btn btn--circle btn--link txt-medium", data: { form_target: "submit" }, disabled: form.object do %> <%= icon_tag "arrow-right" %> Save changes diff --git a/app/views/account/settings/show.html.erb b/app/views/account/settings/show.html.erb index 9df7b9889..57f3913bf 100644 --- a/app/views/account/settings/show.html.erb +++ b/app/views/account/settings/show.html.erb @@ -3,7 +3,7 @@ <% content_for :header do %>

<%= @page_title %> - <% unless Current.user.can_administer?%> + <% unless Current.user.admin? %>
Only admins can change these settings
<% end %>

diff --git a/app/views/boards/columns/closeds/show.html.erb b/app/views/boards/columns/closeds/show.html.erb index 9aeb21044..a67c45c3b 100644 --- a/app/views/boards/columns/closeds/show.html.erb +++ b/app/views/boards/columns/closeds/show.html.erb @@ -2,12 +2,7 @@ <% content_for :header do %>
- <%= link_to @board, class: "btn borderless txt-medium", data: { controller: "hotkey", action: "keydown.esc@document->hotkey#click" } do %> - - ← - <%= @board.name %> - - <% end %> + <%= link_back_to_board(@board) %>

diff --git a/app/views/boards/columns/not_nows/show.html.erb b/app/views/boards/columns/not_nows/show.html.erb index 4bd6a0524..379d92dea 100644 --- a/app/views/boards/columns/not_nows/show.html.erb +++ b/app/views/boards/columns/not_nows/show.html.erb @@ -2,12 +2,7 @@ <% content_for :header do %>
- <%= link_to @board, class: "btn borderless txt-medium", data: { controller: "hotkey", action: "keydown.esc@document->hotkey#click" } do %> - - ← - <%= @board.name %> - - <% end %> + <%= link_back_to_board(@board) %>

diff --git a/app/views/boards/columns/show.html.erb b/app/views/boards/columns/show.html.erb index 56fca64ff..83931aaff 100644 --- a/app/views/boards/columns/show.html.erb +++ b/app/views/boards/columns/show.html.erb @@ -2,12 +2,7 @@ <% content_for :header do %>
- <%= link_to @column.board, class: "btn borderless txt-medium", data: { controller: "hotkey", action: "keydown.esc@document->hotkey#click" } do %> - - ← - <%= @column.board.name %> - - <% end %> + <%= link_back_to_board(@column.board) %>

diff --git a/app/views/boards/columns/streams/show.html.erb b/app/views/boards/columns/streams/show.html.erb index 59e929464..141584283 100644 --- a/app/views/boards/columns/streams/show.html.erb +++ b/app/views/boards/columns/streams/show.html.erb @@ -2,12 +2,7 @@ <% content_for :header do %>
- <%= link_to @board, class: "btn borderless txt-medium", data: { controller: "hotkey", action: "keydown.esc@document->hotkey#click" } do %> - - ← - <%= @board.name %> - - <% end %> + <%= link_back_to_board(@board) %>

diff --git a/app/views/boards/edit.html.erb b/app/views/boards/edit.html.erb index 7428e0bb9..36beee3c8 100644 --- a/app/views/boards/edit.html.erb +++ b/app/views/boards/edit.html.erb @@ -2,12 +2,7 @@ <% content_for :header do %>
- <%= link_to @board, class: "btn borderless txt-medium", data: { controller: "hotkey", action: "keydown.esc@document->hotkey#click" } do %> - - ← - <%= @board.name %> - - <% end %> + <%= link_back_to_board(@board) %>

diff --git a/app/views/boards/show/menu/_columns.html.erb b/app/views/boards/show/menu/_columns.html.erb index b3ea1cd56..70aac7c90 100644 --- a/app/views/boards/show/menu/_columns.html.erb +++ b/app/views/boards/show/menu/_columns.html.erb @@ -1,6 +1,7 @@
- <%= render "boards/show/menu/column_form", board: board, column: Column.new, label: "Add column" %> diff --git a/app/views/cards/comments/_new.html.erb b/app/views/cards/comments/_new.html.erb index 46e6333b0..cd46d7cb4 100644 --- a/app/views/cards/comments/_new.html.erb +++ b/app/views/cards/comments/_new.html.erb @@ -13,13 +13,16 @@ data: { local_save_target: "input", action: "lexxy:change->form#disableSubmitWhenInvalid lexxy:change->local-save#save turbo:morph-element->local-save#restoreContent" } do %> <%= general_prompts(@card.board) %> <% end %> - <%= form.button class: "comment__submit btn btn--reversed flex-item-justify-start", - data: { form_target: "submit" }, disabled: true do %> - Post this comment - + + + <%= form.button class: "comment__submit btn btn--reversed", + data: { form_target: "submit" }, disabled: true do %> + Post + <% end %> + <%= hotkey_label([ "ctrl", "enter" ]) %> - <% end %> + <% end %>
diff --git a/app/views/cards/container/_title.html.erb b/app/views/cards/container/_title.html.erb index de52542fe..98b0b3bb6 100644 --- a/app/views/cards/container/_title.html.erb +++ b/app/views/cards/container/_title.html.erb @@ -10,7 +10,10 @@ <% end %> - <%= link_to "Edit", edit_card_path(card), class: "btn btn--reversed fit-content", style: "--btn-background: #{card.color}" %> + <%= link_to edit_card_path(card), class: "btn fit-content txt-small", data: { controller: "hotkey", action: "keydown.e@document->hotkey#click" } do %> + Edit + e + <% end %> <% end %> <% else %> <%= form_with model: card, id: "card_form", data: { controller: "autoresize auto-save" } do |form| %> @@ -23,7 +26,7 @@ <% end %>

- <%= form.rich_textarea :description, class: "card-field__description rich-text-content", + <%= form.rich_textarea :description, class: "card__description rich-text-content", placeholder: "Add some notes, context, pictures, or video about this…", data: { action: "lexxy:change->auto-save#change focusout->auto-save#submit" } do %> <%= general_prompts(card.board) %> diff --git a/app/views/cards/edit.html.erb b/app/views/cards/edit.html.erb index 1a1eda843..58b2d7bde 100644 --- a/app/views/cards/edit.html.erb +++ b/app/views/cards/edit.html.erb @@ -9,13 +9,16 @@ <% end %> - <%= form.rich_textarea :description, class: "card-field__description rich-text-content", + <%= form.rich_textarea :description, class: "card__description rich-text-content", placeholder: "Add some notes, context, pictures, or video about this…", data: { local_save_target: "input", action: "lexxy:change->local-save#save turbo:morph-element->local-save#restoreContent keydown.ctrl+enter->form#submit:prevent keydown.meta+enter->form#submit:prevent keydown.esc->form#cancel:stop" } do %> <%= general_prompts(@card.board) %> <% end %> - <%= form.button "Save changes", type: :submit, class: "btn btn--reversed fit-content", style: "--btn-background: #{@card.color}" %> + <%= form.button type: :submit, class: "btn btn--reversed fit-content txt-small", data: { form_target: "submit" } do %> + Save changes + <%= hotkey_label([ "ctrl", "enter" ]) %> + <% end %> <%= link_to "Close editor and discard changes", @card, data: { form_target: "cancel" }, hidden: true %> <% end %> <% end %> diff --git a/app/views/filters/_filter_toggle.html.erb b/app/views/filters/_filter_toggle.html.erb index 76f599384..09e65c583 100644 --- a/app/views/filters/_filter_toggle.html.erb +++ b/app/views/filters/_filter_toggle.html.erb @@ -1,13 +1,13 @@
<% if filter.persisted? %> - <%= button_to filter_path(filter), method: :delete, class: "btn txt-x-small btn--reversed", form_class: "inline" do %> + <%= button_to filter_path(filter), method: :delete, class: "btn txt-x-small btn--reversed", data: { controller: "tooltip" }, form_class: "inline" do %> <%= icon_tag "bookmark-outline" %> - Remove saved filter + Delete custom view <% end %> <% else %> - <%= button_to filters_path(filter.as_params), method: :post, class: "btn txt-x-small", form_class: "inline" do %> + <%= button_to filters_path(filter.as_params), method: :post, class: "btn txt-x-small", data: { controller: "tooltip" }, form_class: "inline" do %> <%= icon_tag "bookmark-outline" %> - Save filter + Save custom view <% end %> <% end %>
diff --git a/app/views/filters/settings/_manage.html.erb b/app/views/filters/settings/_manage.html.erb index 8a13490ad..333e9973e 100644 --- a/app/views/filters/settings/_manage.html.erb +++ b/app/views/filters/settings/_manage.html.erb @@ -3,7 +3,7 @@
<%= render "filters/filter_toggle", filter: filter %> - <%= link_to no_filtering_url, class: "btn btn--remove txt-x-small", data: { controller: "hotkey", action: "keydown.esc@document->hotkey#click"} do %> + <%= link_to no_filtering_url, class: "btn btn--remove txt-x-small", data: { controller: "hotkey tooltip", action: "keydown.esc@document->hotkey#click"} do %> <%= icon_tag "close" %> Clear all <% end %> diff --git a/app/views/filters/settings/_toggle.html.erb b/app/views/filters/settings/_toggle.html.erb index 1f6459e0a..d1e7d10bf 100644 --- a/app/views/filters/settings/_toggle.html.erb +++ b/app/views/filters/settings/_toggle.html.erb @@ -1,11 +1,13 @@ <% filter = user_filtering.filter %> <% if user_filtering.expanded? %> - <% else %> - <% end %> diff --git a/app/views/memberships/email_addresses/create.html.erb b/app/views/memberships/email_addresses/create.html.erb index 53851105d..44711b5cf 100644 --- a/app/views/memberships/email_addresses/create.html.erb +++ b/app/views/memberships/email_addresses/create.html.erb @@ -1,14 +1,17 @@ <% @page_title = "Confirm your new email address" %> <% content_for :header do %> -
- <%= link_to edit_user_path(@membership.user, script_name: "/#{@tenant}"), class: "btn borderless txt-medium", data: { controller: "hotkey", action: "keydown.esc@document->hotkey#click" } do %> - ← My profile +
+ <%= link_to edit_user_path(@membership.user, script_name: "/#{@tenant}"), class: "btn borderless txt-medium", data: { controller: "hotkey", action: "keydown.left@document->hotkey#click" } do %> + + Back to My profile + ← + <% end %>
<% end %> -
+

Check your email

We just sent an email to <%= params[:email_address] %>

Hit the link in the email to confirm this is the email address you want to use with Fizzy going forward.

diff --git a/app/views/memberships/email_addresses/new.html.erb b/app/views/memberships/email_addresses/new.html.erb index e99596471..4b493d667 100644 --- a/app/views/memberships/email_addresses/new.html.erb +++ b/app/views/memberships/email_addresses/new.html.erb @@ -1,28 +1,30 @@ <% @page_title = "Change your email" %> <% content_for :header do %> -
- <%= link_to edit_user_path(@membership.user, script_name: "/#{@membership.tenant}"), class: "btn borderless txt-medium", data: { controller: "hotkey", action: "keydown.esc@document->hotkey#click" } do %> - ← My profile +
+ <%= link_to edit_user_path(@membership.user, script_name: "/#{@membership.tenant}"), class: "btn borderless txt-medium", data: { controller: "hotkey", action: "keydown.left@document->hotkey#click" } do %> + + Back to My profile + ← + <% end %>
<% end %> -
-
-

- <%= @page_title %> -

-

Enter your new email address, then hit the link to confirm it

-
+
+

+ <%= @page_title %> +

- <%= form_with url: email_addresses_path(membership_id: @membership.id), method: :post, class: "flex flex-column gap", data: { controller: "form", turbo: false } do |form| %> -
+ <%= form_with url: email_addresses_path(membership_id: @membership.id), method: :post, class: "flex flex-column gap-half", data: { controller: "form", turbo: false } do |form| %> +
+

Enter your new email address, then hit the link to confirm it

+
<%= yield %> diff --git a/app/views/my/menus/show.html.erb b/app/views/my/menus/show.html.erb index fccbde638..b722aa658 100644 --- a/app/views/my/menus/show.html.erb +++ b/app/views/my/menus/show.html.erb @@ -1,20 +1,5 @@ <%= turbo_frame_tag "my_menu", target: "_top" do %> <%= render "my/menus/jump" do %> - <%= collapsible_nav_section "Saved filters", id: "my-filters" do %> - <%= form_with url: cards_path, method: :get, data: { controller: "form" } do |form| %> -
  • - <%= icon_tag "bookmark", class: "popup__icon" %> - <%= link_to cards_path(expand_all: true), class: "popup__btn btn" do %> - Add a filter - <% end %> -
    • - - <% @filters.each do |filter| %> - <%= my_menu_filter_item(filter) %> - <% end %> - <% end %> - <% end %> - <%= collapsible_nav_section "Boards" do %>
  • <%= icon_tag "add", class: "popup__icon" %> @@ -28,6 +13,21 @@ <% end %> <% end %> + <%= collapsible_nav_section "Custom views", id: "my-filters" do %> + <%= form_with url: cards_path, method: :get, data: { controller: "form" } do |form| %> +
  • + <%= icon_tag "bookmark", class: "popup__icon" %> + <%= link_to cards_path(expand_all: true), class: "popup__btn btn" do %> + Create a custom view + <% end %> +
    • + + <% @filters.each do |filter| %> + <%= my_menu_filter_item(filter) %> + <% end %> + <% end %> + <% end %> + <%= collapsible_nav_section "Tags" do %> <% @tags.each do |tag| %> <%= my_menu_tag_item(tag) %> @@ -47,10 +47,10 @@ <% end %> <% end %> - <%= collapsible_nav_section "Jump to…" do %> + <%= collapsible_nav_section "Settings" do %> <%= filter_place_menu_item account_settings_path, "Account Settings", "settings" %> <%= filter_place_menu_item user_path(Current.user), "My Profile", "person" %> - <%= filter_place_menu_item notifications_path, "Notifications", "bell" %> + <%= filter_place_menu_item notifications_path, "All notifications", "bell" %> <%= filter_place_menu_item notifications_settings_path, "Notification Settings", "settings" %> <%= tag.li class: "popup__item", data: { filter_target: "item", navigable_list_target: "item" } do %> @@ -65,6 +65,6 @@ <% end %>
    - <%= link_to "Fizzy", "https://www.fizzy.do", class: "txt-ink", target: "_blank" %> is designed, built, and backed by <%= icon_tag "37signals", class: "v-align-middle", target: "_blank" %> 37signals + <%= link_to "Fizzy™", "https://www.fizzy.do", class: "txt-ink", target: "_blank" %> is designed, built, and backed by <%= icon_tag "37signals", class: "v-align-middle", target: "_blank" %> 37signals™
    <% end %> diff --git a/app/views/public/cards/show.html.erb b/app/views/public/cards/show.html.erb index fc9eaca24..b6446ea7b 100644 --- a/app/views/public/cards/show.html.erb +++ b/app/views/public/cards/show.html.erb @@ -14,10 +14,10 @@ <% content_for :header do %>
    - <%= link_to published_board_url(@card.board), class: "btn borderless txt-medium", data: { controller: "hotkey", action: "keydown.left@document->hotkey#click" } do %> - - Back to <%= @card.board.name %> - ← + <%= link_to published_board_url(@card.board), class: "btn borderless txt-medium", style: "view-transistion-name: card-board-title;", data: { controller: "hotkey", action: "keydown.left@document->hotkey#click" } do %> + + Back to <%= @card.board.name %> + ← <% end %>
    diff --git a/app/views/sessions/_footer.html.erb b/app/views/sessions/_footer.html.erb index f0b4fe55a..596a359e3 100644 --- a/app/views/sessions/_footer.html.erb +++ b/app/views/sessions/_footer.html.erb @@ -1,4 +1,4 @@ -
    - <%= link_to "Fizzy", "https://www.fizzy.do", class: "txt-subtle" %> is designed, built, and backed by <%= icon_tag "37signals", class: "v-align-middle" %> 37signals. +
    + <%= link_to "Fizzy™", "https://www.fizzy.do", class: "txt-subtle" %> is designed, built, and backed by <%= icon_tag "37signals", class: "v-align-middle" %> 37signals™. Need help? <%= mail_to "support@fizzy.do", "Send us an email", class: "txt-link" %>
    \ No newline at end of file diff --git a/app/views/sessions/magic_links/show.html.erb b/app/views/sessions/magic_links/show.html.erb index 69a9f6cbd..e358f3284 100644 --- a/app/views/sessions/magic_links/show.html.erb +++ b/app/views/sessions/magic_links/show.html.erb @@ -3,7 +3,7 @@
    ">

    <%= @page_title %>

    -

    Then enter the verfifcation code included in the email below:

    +

    Then enter the verification code included in the email below:

    <%= form_with url: session_magic_link_path, method: :post, html: { data: { controller: token_list("form", "auto-submit" => params[:code].present?)} } do |form| %> diff --git a/app/views/sessions/new.html.erb b/app/views/sessions/new.html.erb index b4d0ae45b..68f0c7e83 100644 --- a/app/views/sessions/new.html.erb +++ b/app/views/sessions/new.html.erb @@ -1,9 +1,9 @@ <% @page_title = "Enter your email" %> -
    +

    Let’s get you in to Fizzy

    - <%= form_with url: session_path, class: "flex flex-column gap txt-medium" do |form| %> + <%= form_with url: session_path, class: "flex flex-column gap-half txt-medium" do |form| %>