fix spacing

opf · Jan 16, 2025 · 7cd5622 · 7cd5622
1 parent 27fab51
commit 7cd5622
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
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
@@ -10,7 +10,7 @@
     ) %>
   <% end %>
   <% d.with_footer(variant: :large) do %>
-    <% flex_layout(justify_content: :space_between, classes: 'time-entry-dialog-footer-buttons') do |flex| %>
+    <% flex_layout(justify_content: :flex_end, classes: 'time-entry-dialog-footer-buttons') do |flex| %>
       <% if time_entry.persisted? %>
         <% flex.with_column do %>
           <%= render(
@@ -28,6 +28,7 @@
           ) { t("button_delete") } %>
         <% end %>
       <% end %>
+      <% flex.with_column(classes: "time-entry-button-push") %>
       <% flex.with_column do %>
         <%= render(
           Primer::ButtonComponent.new(data: { "close-dialog-id": "time-entry-dialog" }),

diff --git a/modules/costs/app/components/time_entries/entry_dialog_component.sass b/modules/costs/app/components/time_entries/entry_dialog_component.sass
@@ -30,3 +30,10 @@
 
 .time-entry-dialog-footer-buttons
   width: 100%
+
+.time-entry-button-push
+  margin-left: auto
+
+
+.time-entry-dialog-form-spacing
+  row-gap: var(--stack-gap-normal)
diff --git a/modules/costs/app/components/time_entries/time_entry_form_component.html.erb b/modules/costs/app/components/time_entries/time_entry_form_component.html.erb
@@ -29,7 +29,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
   <%= component_wrapper do
     primer_form_with(**form_options) do |form|
-      flex_layout do |body|
+      flex_layout(classes: "time-entry-dialog-form-spacing") do |body|
         body.with_row do
           render(TimeEntries::UserForm.new(form, visible: show_user))
         end