From b173e5c8cf3c8aa54ceee7818beb67de43641e1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=9E=97?= <yanglin@uyl.cn> Date: Fri, 27 Sep 2024 11:24:55 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BF=98=E8=AE=B0=E5=AF=86=E7=A0=81=E9=A2=9C?= =?UTF-8?q?=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../page_bundles/password_reset.scss | 45 +++++++++++-------- .../stylesheets/page_bundles/signin.scss | 32 +++++++++++++ jh/app/views/devise/passwords/new.html.haml | 1 + 3 files changed, 59 insertions(+), 19 deletions(-) diff --git a/jh/app/assets/stylesheets/page_bundles/password_reset.scss b/jh/app/assets/stylesheets/page_bundles/password_reset.scss index d8ed7f2d3dd6..8091eb40ec9b 100644 --- a/jh/app/assets/stylesheets/page_bundles/password_reset.scss +++ b/jh/app/assets/stylesheets/page_bundles/password_reset.scss @@ -24,23 +24,30 @@ } } -a { - color: #AB2325; -} -a::hover { - color: #AB2325; -} -.btn-confirm::hover { - background-color: #AB2325; -} -.btn-confirm { - background-color: #AB2325; -} -button.gl-button.btn-block.btn-confirm { - background-color: #AB2325; - box-shadow: none; -} -button.gl-button.btn-block.btn-confirm::hover { - background-color: #AB2325; - box-shadow: none; +body[data-page="passwords:new"] { + + a { + color: #AB2325; + } + a::hover { + color: #AB2325; + } + .btn-confirm::hover { + background-color: #AB2325; + } + .btn-confirm { + background-color: #AB2325; + } + button.gl-button.btn-block.btn-confirm { + background-color: #AB2325; + box-shadow: none; + &:hover { + background-color: #AB2325 !important; + box-shadow: none !important; + } + } + button.gl-button.btn-block.btn-confirm::hover { + background-color: #AB2325; + box-shadow: none; + } } diff --git a/jh/app/assets/stylesheets/page_bundles/signin.scss b/jh/app/assets/stylesheets/page_bundles/signin.scss index 3891e184cc72..52ef9349300b 100644 --- a/jh/app/assets/stylesheets/page_bundles/signin.scss +++ b/jh/app/assets/stylesheets/page_bundles/signin.scss @@ -33,6 +33,38 @@ button.gl-button.btn-block.btn-confirm { background-color: #AB2325; box-shadow: none; + &:hover { + background-color: #AB2325; + box-shadow: none; + } + } + button.gl-button.btn-block.btn-confirm::hover { + background-color: #AB2325; + box-shadow: none; + } +} + +body[data-page="passwords:new"] { + background-color: #AB2325; + a { + color: #AB2325; + } + a::hover { + color: #AB2325; + } + .btn-confirm::hover { + background-color: #AB2325; + } + .btn-confirm { + background-color: #AB2325; + } + button.gl-button.btn-block.btn-confirm { + background-color: #AB2325; + box-shadow: none; + &:hover { + background-color: #AB2325 !important; + box-shadow: none !important; + } } button.gl-button.btn-block.btn-confirm::hover { background-color: #AB2325; diff --git a/jh/app/views/devise/passwords/new.html.haml b/jh/app/views/devise/passwords/new.html.haml index d44dd02de2e6..66e1d3592786 100644 --- a/jh/app/views/devise/passwords/new.html.haml +++ b/jh/app/views/devise/passwords/new.html.haml @@ -11,4 +11,5 @@ = recaptcha_tags nonce: content_security_policy_nonce - else + - add_page_specific_style 'page_bundles/password_reset' = render_ce 'devise/passwords/new' -- GitLab