Skip to content

OpenProject is the leading open source project management software for product, project and portfolio management. A powerful Jira alternative with agile planning, issue tracking, roadmaps, Gantt charts, time tracking, collaboration features, and more. Available on premises or in the cloud. ⭐ Star us on GitHub

Use CSS grid for cleaner layout and apply correct spacing between buttons

Henriette Dargeb9fdef0e88bb
diff --git a/modules/costs/app/components/time_entries/entry_dialog_component.html.erb b/modules/costs/app/components/time_entries/entry_dialog_component.html.erb
index 9ee3dce66e8..3fdb2c68e1a 100644
--- a/modules/costs/app/components/time_entries/entry_dialog_component.html.erb
+++ b/modules/costs/app/components/time_entries/entry_dialog_component.html.erb
@@ -11,9 +11,9 @@
) %>
<% end %>
<% d.with_footer(variant: :large) do %>
- <% flex_layout(justify_content: :flex_end, classes: "time-entry-dialog-footer-buttons") do |flex| %>
+ <%= grid_layout("time-entry-dialog-footer", tag: :div) do |grid| %>
<% if can_delete_time_entry? %>
- <% flex.with_column do %>
+ <% grid.with_area("delete") do %>
<%= render(
Primer::Beta::Button.new(
scheme: :danger,
@@ -29,11 +29,12 @@
) { t("button_delete") } %>
<% end %>
<% end %>
- <% flex.with_column(classes: "time-entry-button-push") %>
- <% flex.with_column do %>
+ <% grid.with_area("cancel") do %>
<%= render(
Primer::Beta::Button.new(data: { "close-dialog-id": "time-entry-dialog" })
) { I18n.t("button_cancel") } %>
+ <% end %>
+ <% grid.with_area("confirm") do %>
<%= render(
Primer::Beta::Button.new(
scheme: :primary,
diff --git a/modules/costs/app/components/time_entries/entry_dialog_component.sass b/modules/costs/app/components/time_entries/entry_dialog_component.sass
index ebec1f7bbd1..3624d7acda6 100644
--- a/modules/costs/app/components/time_entries/entry_dialog_component.sass
+++ b/modules/costs/app/components/time_entries/entry_dialog_component.sass
@@ -28,12 +28,12 @@
/ ++
/
-.time-entry-dialog-footer-buttons
+.time-entry-dialog-footer
width: 100%
-
-.time-entry-button-push
- margin-left: auto
-
+ display: grid
+ grid-gap: var(--stack-gap-condensed)
+ grid-template-columns: auto 1fr auto auto
+ grid-template-areas: "delete . cancel confirm"
.time-entry-dialog-form-spacing
row-gap: var(--stack-gap-normal)