Skip to content

[8.0-stable] fix(leave dialog): Re-align buttons #3646

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tvdeyen merged 1 commit into from
Feb 5, 2026
+23 −17
Merged

[8.0-stable] fix(leave dialog): Re-align buttons #3646

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/assets/builds/alchemy/admin.css
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/stylesheets/alchemy/admin/base.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ body {
overflow: hidden;
}

&:has(:not(:defined)) {
&:has(alchemy-spinner:not(:defined)) {
opacity: var(--custom-elements-loaded, 0);
animation: custom-elements-loaded 0 linear 250ms forwards;
}
Expand Down
16 changes: 11 additions & 5 deletions app/stylesheets/alchemy/admin/dialogs.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,11 +192,17 @@
}

.buttons {
text-align: right;

label {
float: left;
margin-top: var(--spacing-3);
display: grid;
grid-template-columns: 1fr 1fr;
grid-auto-rows: auto;
gap: var(--spacing-3);
align-items: center;
margin-top: 2em;
margin-bottom: 0;

> .button {
width: 100%;
white-space: nowrap;
}
}
}
Expand Down
18 changes: 9 additions & 9 deletions app/views/alchemy/admin/leave.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<%= render_message do %>
<%= Alchemy.t("You are about to leave Alchemy") %>
<% end %>
<div data-turbo="false">
<p class="buttons">
<label><%= Alchemy.t("Do you want to") %></label>
<%= link_to Alchemy.t('stay logged in'), alchemy.root_path, class: 'button secondary' %>
</p>
<%= form_tag Alchemy.logout_path, method: Alchemy.logout_method, class: 'buttons' do %>
<label><%= Alchemy.t('or to completely') %></label>
<%= form_tag Alchemy.logout_path, method: Alchemy.logout_method do %>
<div class="buttons">
<%= link_to Alchemy.t("stay logged in"),
alchemy.root_path,
rel: "noreferrer",
data: {turbo: false},
class: "button secondary" %>
<%= button_tag Alchemy.t(:logout), autofocus: true %>
<% end %>
</div>
</div>
<% end %>
2 changes: 1 addition & 1 deletion app/views/layouts/alchemy/admin.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
<label>#{Alchemy.t(:leave)}</label>
).html_safe,
alchemy.leave_admin_path, {
size: "300x155",
size: "320x140",
title: Alchemy.t("Leave Alchemy")
}, {'data-alchemy-hotkey' => 'alt+q'}) %>
<% else %>
Expand Down