From 64601779f0303283fa6df876bc1cf32d3d7ca5e0 Mon Sep 17 00:00:00 2001 From: Jordan Vidrine <30537603+jordanvidrine@users.noreply.github.com> Date: Wed, 28 Sep 2022 12:31:56 -0500 Subject: [PATCH] UX: Style changes to match updates (#18397) --- app/assets/stylesheets/common/base/login.scss | 31 +++++++++++++++++-- app/assets/stylesheets/wizard.scss | 23 ++------------ public/images/branded-background-mobile.svg | 8 +++++ public/images/branded-background.svg | 8 +++++ 4 files changed, 46 insertions(+), 24 deletions(-) create mode 100644 public/images/branded-background-mobile.svg create mode 100644 public/images/branded-background.svg diff --git a/app/assets/stylesheets/common/base/login.scss b/app/assets/stylesheets/common/base/login.scss index b6e379faade..fc04c5bc53c 100644 --- a/app/assets/stylesheets/common/base/login.scss +++ b/app/assets/stylesheets/common/base/login.scss @@ -1,3 +1,6 @@ +$invite-bg: absolute-image-url("/branded-background.svg"); +$invite-mobile-bg: absolute-image-url("/branded-background-mobile.svg"); + .caps-lock-warning { color: var(--danger); font-size: $font-down-1; @@ -31,10 +34,30 @@ } } +body.invite-page { + background-image: $invite-bg; + background-size: 110vw 110vh; // crops better than cover at various viewport sizes + background-repeat: no-repeat; + background-position: bottom; + background-color: var(--secondary); + font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, + Oxygen-Sans, Ubuntu, Cantarell, Arial, sans-serif; + @include breakpoint("mobile-extra-large") { + background: $invite-mobile-bg; + background-size: cover; + background-repeat: no-repeat; + background-position: bottom; + } + .d-header { + display: none; + } +} + // Create Account + Login .d-modal.create-account, .d-modal.login-modal, -.invites-show { +.invites-show, +.admin-invite-page { .modal-inner-container { position: relative; } @@ -310,12 +333,14 @@ border-radius: 10px; margin-top: 25px; border-top: 6px solid var(--tertiary); + background-color: var(--secondary); } .invite-form { margin-bottom: 50px; - max-width: 33em; - border-top: 6px solid var(--tertiary); + box-shadow: 0 4px 19px 6px rgba(0, 0, 0, 0.05); + padding: 1em 3em; + max-width: calc(33em - 6em); .tip { display: block; } diff --git a/app/assets/stylesheets/wizard.scss b/app/assets/stylesheets/wizard.scss index 2e2e59ca161..847d5c7979f 100644 --- a/app/assets/stylesheets/wizard.scss +++ b/app/assets/stylesheets/wizard.scss @@ -1,24 +1,5 @@ -$wizard-bg: svg-uri( - ' - - - - - - - ' -); - -$wizard-mobile-bg: svg-uri( - ' - - - - - - - ' -); +$wizard-bg: absolute-image-url("/branded-background.svg"); +$wizard-mobile-bg: absolute-image-url("/branded-background-mobile.svg"); @keyframes bump { 0% { diff --git a/public/images/branded-background-mobile.svg b/public/images/branded-background-mobile.svg new file mode 100644 index 00000000000..4962535d595 --- /dev/null +++ b/public/images/branded-background-mobile.svg @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/public/images/branded-background.svg b/public/images/branded-background.svg new file mode 100644 index 00000000000..16e04279f69 --- /dev/null +++ b/public/images/branded-background.svg @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file