diff --git a/.gitattributes b/.gitattributes index 8dc43234357..fe50833f511 100644 --- a/.gitattributes +++ b/.gitattributes @@ -7,3 +7,8 @@ db/schema.rb linguist-generated vendor/* linguist-vendored config/credentials/*.yml.enc diff=rails_credentials config/credentials.yml.enc diff=rails_credentials + +# Ensure consistent line endings for scripts and Ruby files to avoid shebang issues on Unix +bin/* text eol=lf +*.sh text eol=lf +*.rb text eol=lf diff --git a/app/components/DS/dialog.html.erb b/app/components/DS/dialog.html.erb index ca8f86b7d5d..8d0736df0dd 100644 --- a/app/components/DS/dialog.html.erb +++ b/app/components/DS/dialog.html.erb @@ -26,7 +26,7 @@ <% if actions? %> -
+
<% actions.each do |action| %> <%= action %> <% end %> diff --git a/app/components/DS/dialog.rb b/app/components/DS/dialog.rb index 3385003c112..fb03ac05c41 100644 --- a/app/components/DS/dialog.rb +++ b/app/components/DS/dialog.rb @@ -90,7 +90,7 @@ def dialog_inner_classes end class_names( - "flex flex-col bg-container rounded-xl shadow-border-xs mx-3 lg:mx-0 w-full overflow-hidden", + "flex flex-col bg-container rounded-xl shadow-border-xs mx-3 lg:mx-0 w-full overflow-hidden pt-[env(safe-area-inset-top)] pb-[env(safe-area-inset-bottom)]", variant_classes ) end diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 796c55aeb83..46b34c36723 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -112,7 +112,8 @@ <% end %> <%# SHARED - Main content %> - <%= tag.main class: class_names("grow overflow-y-auto px-3 lg:px-10 py-4 w-full mx-auto max-w-5xl"), data: { app_layout_target: "content" } do %> + <%# Add bottom padding to account for fixed mobile nav + safe area inset %> + <%= tag.main class: class_names("grow overflow-y-auto px-3 lg:px-10 py-4 pb-[calc(3.75rem+env(safe-area-inset-bottom))] w-full mx-auto max-w-5xl"), data: { app_layout_target: "content" } do %>