Skip to content

Commit

Permalink
Merge branch 'main' into 64-undo-functionality-in-flash-messages
Browse files Browse the repository at this point in the history
  • Loading branch information
wuletawwonte committed Sep 20, 2024
2 parents 13b98a5 + 9dc1aa2 commit 6b12a24
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .env.template
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ RSPEC_RETRY_RETRY_COUNT=0
MAILER_SENDER="Rails World <hello@teloslabs.co>"
REGISTRATION_ENABLED=true
SESSION_REMINDERS_ENABLED=true
ONLY_TESTER_REGISTRATION_ENABLED=false
ONLY_TESTER_REGISTRATION_ENABLED=false
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

## About

- Ruby on Rails 7.1.x
- Ruby on Rails 7.2.x
- Ruby 3.3.x
- SQLite3
- SolidQueue
Expand Down
5 changes: 3 additions & 2 deletions app/views/layouts/_flash_message.html.erb
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<%# locals: (message:, type:) %>

<div class="flex flex-col items-center justify-center fixed bottom-[64px] w-full z-20 px-5">
<div data-controller="closable" class="flex justify-between gap-8 bg-black/70 shadow-simple backdrop-blur-[25px] rounded-lg px-5 py-4 absolute transition-all bottom-0 max-w-screen-sm text-white z-20 sticky">

<div class="flex flex-col items-center justify-center fixed bottom-[64px] pb-safe-area-1 w-full z-30 px-5">
<div data-controller="closable" class="flex justify-between gap-8 bg-black/70 shadow-simple backdrop-blur-[25px] rounded-lg px-5 py-4 transition-all bottom-0 max-w-screen-sm text-white z-20 sticky">
<%= message %>
<% if type == "notice" && flash[:undo].present? %>
<%= button_to "Undo", flash[:undo]["path"], class: "italic font-bold" %>
Expand Down

0 comments on commit 6b12a24

Please sign in to comment.