From 0c7ac32935c2813ef5d9db4733099aa31b637ea2 Mon Sep 17 00:00:00 2001 From: Alex Turchyn Date: Sun, 4 Jun 2023 21:30:50 +0300 Subject: [PATCH] migrate to daisy UI v3.0.3 --- app/javascript/application.scss | 2 +- .../devise/shared/_error_messages.html.erb | 14 +- app/views/layouts/application.html.erb | 8 +- app/views/shared/_navbar.html.erb | 6 +- app/views/shared/_settings_nav.html.erb | 4 +- .../storage_settings/_disk_form.html.erb | 16 +-- app/views/submissions/index.html.erb | 42 +++--- app/views/users/index.html.erb | 127 +++++++++--------- package.json | 2 +- yarn.lock | 50 ++----- 10 files changed, 115 insertions(+), 156 deletions(-) diff --git a/app/javascript/application.scss b/app/javascript/application.scss index b84ff8b6..fd0c7b42 100644 --- a/app/javascript/application.scss +++ b/app/javascript/application.scss @@ -44,7 +44,7 @@ button[disabled] .enabled { } .base-button { - @apply btn text-white text-base; + @apply btn btn-neutral text-white text-base; } .white-button { diff --git a/app/views/devise/shared/_error_messages.html.erb b/app/views/devise/shared/_error_messages.html.erb index 52de543c..aa9ea769 100644 --- a/app/views/devise/shared/_error_messages.html.erb +++ b/app/views/devise/shared/_error_messages.html.erb @@ -1,17 +1,15 @@ <% if resource.errors.any? %>
+
- -
-

- <%= I18n.t('errors.messages.not_saved', +

+ <%= I18n.t('errors.messages.not_saved', count: resource.errors.count, resource: resource.class.model_name.human.downcase) %>

- <% resource.errors.full_messages.each do |message| %> -

<%= message %>

- <% end %> -
+ <% resource.errors.full_messages.each do |message| %> +

<%= message %>

+ <% end %>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 3bae5911..805efd5e 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -18,11 +18,11 @@