diff --git a/Gemfile.lock b/Gemfile.lock index 25438c4..b5b1183 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -93,7 +93,7 @@ GEM dotenv (= 3.2.0) railties (>= 6.1) drb (2.2.3) - erb (6.0.1) + erb (6.0.2) error_highlight (0.7.1) erubi (1.13.1) et-orbi (1.4.0) @@ -143,7 +143,8 @@ GEM net-smtp marcel (1.1.0) mini_mime (1.1.5) - minitest (6.0.1) + minitest (6.0.2) + drb (~> 2.0) prism (~> 1.5) msgpack (1.8.0) net-imap (0.6.3) @@ -413,7 +414,7 @@ CHECKSUMS dotenv (3.2.0) sha256=e375b83121ea7ca4ce20f214740076129ab8514cd81378161f11c03853fe619d dotenv-rails (3.2.0) sha256=657e25554ba622ffc95d8c4f1670286510f47f2edda9f68293c3f661b303beab drb (2.2.3) sha256=0b00d6fdb50995fe4a45dea13663493c841112e4068656854646f418fda13373 - erb (6.0.1) sha256=28ecdd99c5472aebd5674d6061e3c6b0a45c049578b071e5a52c2a7f13c197e5 + erb (6.0.2) sha256=9fe6264d44f79422c87490a1558479bd0e7dad4dd0e317656e67ea3077b5242b error_highlight (0.7.1) sha256=1fcdb7330e56982c33e85f57000fec9c4397ece93bf59b73a51e517dff693781 erubi (1.13.1) sha256=a082103b0885dbc5ecf1172fede897f9ebdb745a4b97a5e8dc63953db1ee4ad9 et-orbi (1.4.0) sha256=6c7e3c90779821f9e3b324c5e96fda9767f72995d6ae435b96678a4f3e2de8bc @@ -441,7 +442,7 @@ CHECKSUMS mail (2.9.0) sha256=6fa6673ecd71c60c2d996260f9ee3dd387d4673b8169b502134659ece6d34941 marcel (1.1.0) sha256=fdcfcfa33cc52e93c4308d40e4090a5d4ea279e160a7f6af988260fa970e0bee mini_mime (1.1.5) sha256=8681b7e2e4215f2a159f9400b5816d85e9d8c6c6b491e96a12797e798f8bccef - minitest (6.0.1) sha256=7854c74f48e2e975969062833adc4013f249a4b212f5e7b9d5c040bf838d54bb + minitest (6.0.2) sha256=db6e57956f6ecc6134683b4c87467d6dd792323c7f0eea7b93f66bd284adbc3d msgpack (1.8.0) sha256=e64ce0212000d016809f5048b48eb3a65ffb169db22238fb4b72472fecb2d732 net-imap (0.6.3) sha256=9bab75f876596d09ee7bf911a291da478e0cd6badc54dfb82874855ccc82f2ad net-pop (0.1.2) sha256=848b4e982013c15b2f0382792268763b748cce91c9e91e36b0f27ed26420dff3 diff --git a/app/views/layouts/components/_main_dialog.html.erb b/app/views/layouts/components/_main_dialog.html.erb index 5090a1a..c25a3d6 100644 --- a/app/views/layouts/components/_main_dialog.html.erb +++ b/app/views/layouts/components/_main_dialog.html.erb @@ -1,8 +1,11 @@

Dialog Title

@@ -15,7 +18,7 @@

- <%= button_link_to 'OK', autofocus: true, value: 'confirm', class: "btn btn-primary", command: 'close', commandfor: 'main-dialog' %> - <%= button_link_to 'Cancel', value: 'cancel', class: "btn btn-neutral", command: 'close', commandfor: 'main-dialog' %> + <%= button_link_to 'OK', autofocus: true, value: 'confirm', class: "btn btn-accent ring-2 hover:ring-3", command: 'close', commandfor: 'main-dialog' %> + <%= button_link_to 'Cancel', value: 'cancel', class: "btn btn-primary ring-2 hover:ring-3", command: 'close', commandfor: 'main-dialog' %>
diff --git a/config/puma.rb b/config/puma.rb index 1d49c2a..676997f 100644 --- a/config/puma.rb +++ b/config/puma.rb @@ -1,3 +1,5 @@ +require_relative 'application' + # This configuration file will be evaluated by Puma. The top-level methods that # are invoked here are part of Puma's configuration DSL. For more information # about methods provided by the DSL, see https://puma.io/puma/Puma/DSL.html. @@ -25,21 +27,21 @@ # Any libraries that use a connection pool or another resource pool should # be configured to provide at least as many connections as the number of # threads. This includes Active Record's `pool` parameter in `database.yml`. -threads_count = ENV.fetch("RAILS_MAX_THREADS", 3) +threads_count = ENV.fetch('RAILS_MAX_THREADS', 3) threads threads_count, threads_count # Specifies the `port` that Puma will listen on to receive requests; default is 3000. -port ENV.fetch("PORT", 3000) +port ENV.fetch('PORT', 3000) # Allow puma to be restarted by `bin/rails restart` command. plugin :tmp_restart # Run the Tailwindcss watcher alongside Puma -plugin :tailwindcss if ENV.fetch("RAILS_ENV", "development") == "development" +plugin :tailwindcss if ENV.fetch('RAILS_ENV', 'development') == 'development' # Run the Solid Queue supervisor inside of Puma for single-server deployments. -plugin :solid_queue if ENV["SOLID_QUEUE_IN_PUMA"] +plugin :solid_queue if ENV['SOLID_QUEUE_IN_PUMA'] # Specify the PID file. Defaults to tmp/pids/server.pid in development. # In other environments, only set the PID file if requested. -pidfile ENV["PIDFILE"] if ENV["PIDFILE"] +pidfile ENV['PIDFILE'] if ENV['PIDFILE'] diff --git a/config/tailwind.config.js b/config/tailwind.config.js index ca57a97..c90e021 100644 --- a/config/tailwind.config.js +++ b/config/tailwind.config.js @@ -9,23 +9,13 @@ export const theme = { extend: { colors: {}, keyframes: { - "fade-in": { - "0%": { opacity: 0, transform: "translateY(-30)" }, - "60%": { transform: "translateY(0)" }, - "100%": { opacity: "100%" } + "aurora": { + "0%": { transform: "translateY(-20%)" }, + "100%": { transform: "translateY(0)" } }, - }, - swing: { - "0%": { transform: "rotate(0deg)" }, - "20%": { transform: "rotate(15deg)" }, - "40%": { transform: "rotate(-10deg)" }, - "60%": { transform: "rotate(5deg)" }, - "100%": { transform: "rotate(0deg)" }, - }, + } }, animation: { - "fade-in": "fade-in .2s ease-in-out", - swing: "swing 1s ease-in-out forwards", + "aurora": "aurora .2s ease-out", }, -}, -}; +}