From 951a04574528646272724f4263dd2d5db4fa496d Mon Sep 17 00:00:00 2001 From: f Date: Wed, 29 Mar 2023 16:43:11 -0300 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20no=20mostrar=20un=20t=C3=ADtulo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/devise/shared/_error_messages.haml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/app/views/devise/shared/_error_messages.haml b/app/views/devise/shared/_error_messages.haml index 0f0c1835..64340e4f 100644 --- a/app/views/devise/shared/_error_messages.haml +++ b/app/views/devise/shared/_error_messages.haml @@ -1,8 +1,4 @@ - if resource.errors.any? = render 'bootstrap/alert' do - %h4.alert-heading - = I18n.t("errors.messages.not_saved", | - count: resource.errors.count, | - resource: resource.class.model_name.human.downcase) | - resource.errors.full_messages.each do |message| %p= message From 167aaf5549106394e15c448731ec938d13ea068d Mon Sep 17 00:00:00 2001 From: f Date: Wed, 29 Mar 2023 16:43:19 -0300 Subject: [PATCH 2/3] =?UTF-8?q?Revert=20"fix:=20mostrar=20siempre=20los=20?= =?UTF-8?q?links=20de=20recuperaci=C3=B3n"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 944668edbe6c2fa51d0bdce2c8dcb22802760798. --- app/views/devise/shared/_links.haml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/app/views/devise/shared/_links.haml b/app/views/devise/shared/_links.haml index 479eb457..b4b89175 100644 --- a/app/views/devise/shared/_links.haml +++ b/app/views/devise/shared/_links.haml @@ -18,16 +18,17 @@ new_password_path(resource_name, params: locale) %br/ -- if devise_mapping.confirmable? +- if devise_mapping.confirmable? && controller_name != 'confirmations' = link_to t('.didn_t_receive_confirmation_instructions'), new_confirmation_path(resource_name, params: locale) %br/ - if devise_mapping.lockable? - if resource_class.unlock_strategy_enabled?(:email) - = link_to t('.didn_t_receive_unlock_instructions'), - new_unlock_path(resource_name, params: locale) - %br/ + - if controller_name != 'unlocks' + = link_to t('.didn_t_receive_unlock_instructions'), + new_unlock_path(resource_name, params: locale) + %br/ - if devise_mapping.omniauthable? - resource_class.omniauth_providers.each do |provider| From 1f921d836f537994fbba18c4df302dea4a9455e5 Mon Sep 17 00:00:00 2001 From: f Date: Wed, 29 Mar 2023 20:18:52 -0300 Subject: [PATCH 3/3] =?UTF-8?q?fixup!=20feat:=20anchos=20y=20altos=20m?= =?UTF-8?q?=C3=A1ximos=20y=20m=C3=ADnimos?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/assets/stylesheets/application.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 830769a7..0e602ac0 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -408,8 +408,8 @@ $bezier: cubic-bezier(0.75, 0, 0.25, 1); @each $prop, $abbrev in (width: w, height: h) { @each $size, $length in $sizes { .#{$abbrev}-#{$grid-breakpoint}-#{$size} { #{$prop}: $length !important; } - .min-#{$abbrev}#{$infix}-#{$size} { min-#{$prop}: $length !important; } - .max-#{$abbrev}#{$infix}-#{$size} { max-#{$prop}: $length !important; } + .min-#{$abbrev}#{$grid-breakpoint}-#{$size} { min-#{$prop}: $length !important; } + .max-#{$abbrev}#{$grid-breakpoint}-#{$size} { max-#{$prop}: $length !important; } } }