diff --git a/app/assets/stylesheets/common/components/buttons.scss b/app/assets/stylesheets/common/components/buttons.scss index 933bb7ce14a..be848db0e77 100644 --- a/app/assets/stylesheets/common/components/buttons.scss +++ b/app/assets/stylesheets/common/components/buttons.scss @@ -171,6 +171,9 @@ color: #000 !important; background: #ececec !important; box-shadow: 0 0 0 2px rgba(var(--primary-rgb), 0.25); + .d-icon { + color: inherit !important; + } } &[href] { color: var(--secondary); diff --git a/app/assets/stylesheets/desktop/login.scss b/app/assets/stylesheets/desktop/login.scss index bd986cfa56c..533c2682de4 100644 --- a/app/assets/stylesheets/desktop/login.scss +++ b/app/assets/stylesheets/desktop/login.scss @@ -234,6 +234,7 @@ .login-welcome-header { grid-area: header; padding: 1em 1em 1em 1em; + height: calc(110px - 2em); .login-title { font-size: 2.75em; } @@ -279,7 +280,7 @@ ); } &:before { - top: 7.85em; + top: 110px; background-image: linear-gradient( to top, rgba(var(--secondary-rgb), 0), diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index eeb81210efc..186b021c2e1 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -1728,7 +1728,7 @@ en: security_key_not_allowed_error: "The security key authentication process either timed out or was cancelled." security_key_no_matching_credential_error: "No matching credentials could be found in the provided security key." security_key_support_missing_error: "Your current device or browser does not support the use of security keys. Please use a different method." - email_placeholder: "email / username" + email_placeholder: "Email / Username" caps_lock_warning: "Caps Lock is on" error: "Unknown error" cookies_error: "Your browser seems to have cookies disabled. You might not be able to log in without enabling them first."