diff --git a/app/assets/stylesheets/fizzy-menu.css b/app/assets/stylesheets/fizzy-menu.css index bb3cf24a3..1d768e9d6 100644 --- a/app/assets/stylesheets/fizzy-menu.css +++ b/app/assets/stylesheets/fizzy-menu.css @@ -1,13 +1,13 @@ @layer components { - .fizzy-header-logo { + .boxcar-header-logo { + color: var(--color-ink); inline-size: auto; margin-block-start: 0.1em; - svg { + img { block-size: auto; - inline-size: 1.1em; - margin-block-end: 0.2em; - margin-inline-end: 0.8ch; + inline-size: 1.15em; + margin-inline-end: 0.8ch; } } diff --git a/app/controllers/sessions/login_menus_controller.rb b/app/controllers/sessions/login_menus_controller.rb index ebd06191e..1b2d69bc9 100644 --- a/app/controllers/sessions/login_menus_controller.rb +++ b/app/controllers/sessions/login_menus_controller.rb @@ -2,6 +2,8 @@ class Sessions::LoginMenusController < ApplicationController require_untenanted_access require_identified_access + layout "public" + def show @tenants = IdentityProvider.tenants_for(resume_identity) end diff --git a/app/controllers/sessions/magic_links_controller.rb b/app/controllers/sessions/magic_links_controller.rb index a955cda75..4f90b38d0 100644 --- a/app/controllers/sessions/magic_links_controller.rb +++ b/app/controllers/sessions/magic_links_controller.rb @@ -3,6 +3,8 @@ class Sessions::MagicLinksController < ApplicationController require_unidentified_access rate_limit to: 10, within: 15.minutes, only: :create, with: -> { redirect_to session_magic_link_path, alert: "Try again in 15 minutes." } + layout "public" + def show end diff --git a/app/controllers/sessions/starts_controller.rb b/app/controllers/sessions/starts_controller.rb index f0db9d89a..b2a99aa88 100644 --- a/app/controllers/sessions/starts_controller.rb +++ b/app/controllers/sessions/starts_controller.rb @@ -2,6 +2,8 @@ class Sessions::StartsController < ApplicationController allow_unauthenticated_access require_identified_access + layout "public" + def new end diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb index ef54fc34f..a7a09c764 100644 --- a/app/controllers/sessions_controller.rb +++ b/app/controllers/sessions_controller.rb @@ -3,6 +3,8 @@ class SessionsController < ApplicationController require_unidentified_access only: %i[ new create ] rate_limit to: 10, within: 3.minutes, only: :create, with: -> { redirect_to new_session_path, alert: "Try again later." } + layout "public" + def new end diff --git a/app/views/layouts/public.html.erb b/app/views/layouts/public.html.erb index f8c93b208..6df1eabeb 100644 --- a/app/views/layouts/public.html.erb +++ b/app/views/layouts/public.html.erb @@ -5,7 +5,12 @@
@@ -13,10 +18,6 @@
+ <%= yield :footer %> diff --git a/app/views/sessions/_footer.html.erb b/app/views/sessions/_footer.html.erb new file mode 100644 index 000000000..208f47a3f --- /dev/null +++ b/app/views/sessions/_footer.html.erb @@ -0,0 +1,3 @@ +
+ BOXCAR beta. <%= mail_to "support@37signals.com", "Need help?", class: "txt-link" %> +
\ No newline at end of file diff --git a/app/views/sessions/login_menus/show.html.erb b/app/views/sessions/login_menus/show.html.erb index 0a3c6c63d..64433c830 100644 --- a/app/views/sessions/login_menus/show.html.erb +++ b/app/views/sessions/login_menus/show.html.erb @@ -1,22 +1,13 @@ <% @page_title = "Choose an account" %> -<% content_for :header do %> - -<% end %> - <% cache [ Current.identity_token, @tenants ] do %>
<% if @tenants.present? %>

- Choose a Fizzy account + Your BOXCAR accounts

<% @tenants.each do |tenant| %> @@ -30,14 +21,13 @@ <% else %>

Hmm...

-

You don’t have any Fizzy accounts.

+

You don’t have any BOXCAR accounts.

<% end %> <% if defined?(saas) %>
- <%= link_to saas.new_signup_completion_path, class: "btn center txt-small" do %> - <%= icon_tag "add" %> - Create a Fizzy account + <%= link_to saas.new_signup_completion_path, class: "btn btn--plain txt-link center txt-small" do %> + Sign up for a new BOXCAR account <% end %>
<% end %> @@ -45,7 +35,5 @@ <% end %> <% content_for :footer do %> -
- Fizzy™ Beta. <%= mail_to "support@37signals.com", "Need help?", class: "txt-link" %> -
+ <%= render "sessions/footer" %> <% end %> diff --git a/app/views/sessions/magic_links/show.html.erb b/app/views/sessions/magic_links/show.html.erb index 079fbdb10..57932a475 100644 --- a/app/views/sessions/magic_links/show.html.erb +++ b/app/views/sessions/magic_links/show.html.erb @@ -1,34 +1,21 @@ -<% @page_title = "Enter your sign-in code" %> +<% @page_title = "Check your email" %> -<% content_for :header do %> - -<% end %> - -
" style="--panel-size: 42ch; view-transition-name: sign-in-panel"> +
">
-

Check your email

-

We just emailed you a special code

+

<%= @page_title %>

+

We just emailed you a link to sign in.

- <%= form_with url: session_magic_link_path, method: :post, html: { class: "flex flex-column gap", data: { controller: token_list("auto-submit" => params[:code].present?)} } do |form| %> -
- <%= form.text_field :code, required: true, class: "input center txt-align-enter", autofocus: true, "data-1p-ignore": true, autocomplete: "one-time-code", maxlength: "6", placeholder: "••••••", value: params[:code] %> -
+

If your email is on a different device, enter the 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| %> + <%= form.text_field :code, required: true, class: "input center txt-align-enter txt-normal", + autofocus: false, autocorrect: "off", autocapitalize: "off", spellcheck: "false", "data-1p-ignore": true, + autocomplete: "one-time-code", maxlength: "6", placeholder: "••••••", value: params[:code], + data: { form_target: "input", action: "paste->form#submit, keydown.enter->form#submit" } %> <% end %>
<% content_for :footer do %> -
- Fizzy™ Beta. <%= mail_to "support@37signals.com", "Need help?", class: "txt-link" %> -
+ <%= render "sessions/footer" %> <% end %> diff --git a/app/views/sessions/new.html.erb b/app/views/sessions/new.html.erb index 203ac23d7..be35c17b1 100644 --- a/app/views/sessions/new.html.erb +++ b/app/views/sessions/new.html.erb @@ -1,19 +1,7 @@ <% @page_title = "Sign in" %> -<% content_for :header do %> - -<% end %> - -
-
-

<%= @page_title %>

-

Enter your email address to continue

-
+
+

<%= @page_title %>

<%= form_with url: session_path, class: "flex flex-column gap txt-medium" do |form| %>
@@ -23,14 +11,12 @@
<% end %>
<% content_for :footer do %> -
- BOXCAR™ Beta. <%= mail_to "support@37signals.com", "Need help?", class: "txt-link" %> -
+ <%= render "sessions/footer" %> <% end %> diff --git a/app/views/sessions/starts/new.html.erb b/app/views/sessions/starts/new.html.erb index a4da6f920..dbc15e3a8 100644 --- a/app/views/sessions/starts/new.html.erb +++ b/app/views/sessions/starts/new.html.erb @@ -1,16 +1,7 @@ <% @hide_footer_frames = true %> <% @page_title = "Signing in..." %> -<% content_for :header do %> - -<% end %> - -
+

<%= @page_title %> @@ -24,7 +15,5 @@

<% content_for :footer do %> -
- Fizzy™ Beta. <%= mail_to "support@37signals.com", "Need help?", class: "txt-link" %> -
+ <%= render "sessions/footer" %> <% end %> diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb index 1df533f75..8a806bb29 100644 --- a/app/views/users/new.html.erb +++ b/app/views/users/new.html.erb @@ -1,18 +1,6 @@ <% @page_title = "Join #{Account.sole.name}" %> -<% content_for :header do %> - -<% end %> - -
+

<%= @page_title %> @@ -42,7 +30,5 @@

<% content_for :footer do %> -
- BOXCAR™ Beta. <%= mail_to "support@37signals.com", "Need help?", class: "txt-link" %> -
+ <%= render "sessions/footer" %> <% end %>