From 54a42fbfb2f7ad231eb1cdf702243127f1ccc000 Mon Sep 17 00:00:00 2001 From: Torsten Date: Mon, 16 Jan 2023 20:17:23 +0200 Subject: [PATCH] unify button colors --- app/views/devise/confirmations/new.html.haml | 2 +- app/views/devise/passwords/edit.html.haml | 2 +- app/views/devise/passwords/new.html.haml | 4 ++-- app/views/devise/registrations/edit.html.haml | 2 +- app/views/devise/registrations/new.html.haml | 2 +- app/views/devise/sessions/new.html.haml | 2 +- app/views/devise/unlocks/new.html.haml | 4 ++-- app/views/layouts/_footer.haml | 4 ++-- app/views/layouts/_header.haml | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/app/views/devise/confirmations/new.html.haml b/app/views/devise/confirmations/new.html.haml index d49cb44..8ead264 100644 --- a/app/views/devise/confirmations/new.html.haml +++ b/app/views/devise/confirmations/new.html.haml @@ -15,6 +15,6 @@ class: "appearance-none border rounded w-full py-2 px-3 text-gray-700 leading-tight focus:outline-none shadow focus:shadow-outline" | .mb-4 = f.submit "Resend Confirmation Info", | - class: "button bg-blue-500 hover:bg-blue-700 font-bold text-white focus:outline-none py-2 px-4 rounded focus:shadow-outline w-full" | + class: "button bg-cyan-700 hover:bg-cyan-500 font-bold text-white focus:outline-none py-2 px-4 rounded focus:shadow-outline w-full" | = render "devise/shared/links" = render "devise/shared/form_footer" diff --git a/app/views/devise/passwords/edit.html.haml b/app/views/devise/passwords/edit.html.haml index 96d699a..75056ee 100644 --- a/app/views/devise/passwords/edit.html.haml +++ b/app/views/devise/passwords/edit.html.haml @@ -27,6 +27,6 @@ class: "shadow appearance-none border rounded w-full py-2 px-3 text-gray-700 mb-3 leading-tight focus:outline-none focus:shadow-outline" .mb-4 = f.submit "Change My Password", | - class: "button bg-blue-500 hover:bg-blue-700 text-white font-bold py-2 px-4 rounded focus:outline-none focus:shadow-outline w-full" + class: "button bg-cyan-700 hover:bg-cyan-500 text-white font-bold py-2 px-4 rounded focus:outline-none focus:shadow-outline w-full" = render "devise/shared/links" = render "devise/shared/form_footer" diff --git a/app/views/devise/passwords/new.html.haml b/app/views/devise/passwords/new.html.haml index 7ebbece..cbfe3dd 100644 --- a/app/views/devise/passwords/new.html.haml +++ b/app/views/devise/passwords/new.html.haml @@ -4,7 +4,7 @@ = form_for(resource, as: resource_name, html: { method: :post, class: "bg-white mb-4 px-8 pt-6 pb-8 rounded shadow-md" } , - url: password_path(resource_name) ) do |f| + url: password_path(resource_name) ) do |f| = render "devise/shared/error_messages", resource: resource .mb-4 = f.label :email, class: "block font-bold mb-2 text-gray-700 text-sm" @@ -12,6 +12,6 @@ class: "appearance-none border leading-tight focus:outline-none px-3 py-2 rounded shadow focus:shadow-outline text-gray-700 w-full" | .mb-4 = f.submit "Send Password Reset Info", | - class: "button bg-blue-500 hover:bg-blue-700 text-white font-bold py-2 px-4 rounded focus:outline-none focus:shadow-outline w-full" | + class: "button bg-cyan-700 hover:bg-cyan-500 text-white font-bold py-2 px-4 rounded focus:outline-none focus:shadow-outline w-full" | = render "devise/shared/links" = render "devise/shared/form_footer" diff --git a/app/views/devise/registrations/edit.html.haml b/app/views/devise/registrations/edit.html.haml index 1c4b8fa..5181bc6 100644 --- a/app/views/devise/registrations/edit.html.haml +++ b/app/views/devise/registrations/edit.html.haml @@ -33,7 +33,7 @@ autocomplete: "current-password", | class: "shadow appearance-none border rounded w-full py-2 px-3 text-gray-700 mb-3 leading-tight focus:outline-none focus:shadow-outline" | .actions - = f.submit "Update", class: "button bg-blue-500 hover:bg-blue-700 font-bold text-white focus:outline-none py-2 px-4 rounded focus:shadow-outline w-full" + = f.submit "Update", class: "button bg-cyan-700 hover:bg-cyan-500 font-bold text-white focus:outline-none py-2 px-4 rounded focus:shadow-outline w-full" %p Unhappy? %span= button_to "Delete my account", registration_path(resource_name), data: { confirm: "Are you sure?" }, method: :delete diff --git a/app/views/devise/registrations/new.html.haml b/app/views/devise/registrations/new.html.haml index d1855ff..46a394c 100644 --- a/app/views/devise/registrations/new.html.haml +++ b/app/views/devise/registrations/new.html.haml @@ -27,6 +27,6 @@ class: "appearance-none border leading-tight focus:outline-none px-3 py-2 rounded shadow focus:shadow-outline text-gray-700 w-full" | .mb-4 = f.submit "Sign Up", | - class: "button bg-blue-500 hover:bg-blue-700 font-bold text-white focus:outline-none py-2 px-4 rounded focus:shadow-outline w-full" | + class: "button bg-cyan-700 hover:bg-cyan-700 font-bold text-white focus:outline-none py-2 px-4 rounded focus:shadow-outline w-full" | = render "devise/shared/links" = render "devise/shared/form_footer" diff --git a/app/views/devise/sessions/new.html.haml b/app/views/devise/sessions/new.html.haml index 8f10d69..722060e 100644 --- a/app/views/devise/sessions/new.html.haml +++ b/app/views/devise/sessions/new.html.haml @@ -21,6 +21,6 @@ class: "align-baseline inline-block text-gray-700 text-sm" .mb-4 = f.submit "Log in", - class: "button bg-blue-500 hover:bg-blue-700 text-white font-bold py-2 px-4 rounded focus:outline-none focus:shadow-outline w-full" + class: "button bg-cyan-700 hover:bg-cyan-500 text-white font-bold py-2 px-4 rounded focus:outline-none focus:shadow-outline w-full" = render "devise/shared/links" = render "devise/shared/form_footer" diff --git a/app/views/devise/unlocks/new.html.haml b/app/views/devise/unlocks/new.html.haml index 2445e8a..1f05ad9 100644 --- a/app/views/devise/unlocks/new.html.haml +++ b/app/views/devise/unlocks/new.html.haml @@ -4,7 +4,7 @@ = form_for(resource, as: resource_name, html: { class: "bg-white mb-4 px-8 pt-6 pb-8 rounded shadow-md" , method: :post } - url: unlock_path(resource_name) ) do |f| + url: unlock_path(resource_name) ) do |f| = render "devise/shared/error_messages", resource: resource .mb-4 = f.label :email, class: "block font-bold mb-2 text-gray-700 text-sm" @@ -14,6 +14,6 @@ class: "appearance-none border leading-tight focus:outline-none px-3 py-2 rounded shadow focus:shadow-outline text-gray-700 w-full" | .mb-4 = f.submit "Resend unlock instructions", | - class: "button bg-blue-500 hover:bg-blue-700 font-bold text-white focus:outline-none py-2 px-4 rounded focus:shadow-outline w-full" | + class: "button bg-cyan-700 hover:bg-cyan-500 font-bold text-white focus:outline-none py-2 px-4 rounded focus:shadow-outline w-full" | = render "devise/shared/links" = render "devise/shared/form_footer" diff --git a/app/views/layouts/_footer.haml b/app/views/layouts/_footer.haml index 15c1035..4ffed6a 100644 --- a/app/views/layouts/_footer.haml +++ b/app/views/layouts/_footer.haml @@ -14,8 +14,8 @@ %form.w-full %label.sr-only{:for => "UserEmail"} Email .p-2.border.border-gray-100.focus-within:ring.sm:flex.sm:items-center.sm:gap-4 - %input#UserEmail.w-full.border-none.focus:border-transparent.focus:ring-transparent.sm:text-sm{:placeholder => "jaakko@iki.fi", :type => "email"}/ - %button.w-full.px-6.py-3.mt-1.text-sm.font-bold.tracking-wide.text-white.uppercase.transition-none.bg-teal-500.hover:bg-teal-600.sm:mt-0.sm:w-auto.sm:flex-shrink-0 + %input.w-full.rounded.focus:border-transparent.focus:ring-transparent.sm:text-sm{:placeholder => "jaakko@iki.fi", :type => "email"}/ + %button.w-full.rounded.px-6.py-3.mt-1.text-sm.font-bold.tracking-wide.text-white.uppercase.bg-cyan-700.hover:bg-cyan-500.sm:mt-0.sm:w-auto.sm:flex-shrink-0 Sign Up .col-span-2.sm:col-span-1 %p.font-medium.text-gray-900 Main diff --git a/app/views/layouts/_header.haml b/app/views/layouts/_header.haml index 0fcce2b..1d03c5d 100644 --- a/app/views/layouts/_header.haml +++ b/app/views/layouts/_header.haml @@ -12,7 +12,7 @@ = image_tag("fb.webp" , class: "h-10 rounded-md") %li - unless member_signed_in? - %a.inline-flex.items-center.justify-center.h-12.px-6.font-medium.tracking-wide.text-white.transition.duration-200.rounded-lg.shadow-md.bg-green-800.hover:bg-blue-800.focus:shadow-outline.focus:outline-none{"aria-label" => "Sign up", :href => main_app.member_session_path, :title => "Log in or Sign up"} + %a.inline-flex.items-center.justify-center.h-12.px-6.font-medium.tracking-wide.text-white.transition.duration-200.rounded-lg.shadow-md.bg-cyan-700.hover:bg-cyan-500.focus:shadow-outline.focus:outline-none{"aria-label" => "Sign up", :href => main_app.member_session_path, :title => "Log in or Sign up"} Login - else .inline-flex.items-stretch.rounded-md.border