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 @@