diff --git a/src/app/badge/Badge.scss b/src/app/badge/Badge.scss index 85fff99..66652d1 100644 --- a/src/app/badge/Badge.scss +++ b/src/app/badge/Badge.scss @@ -119,6 +119,7 @@ height: 100%; width: 100%; margin-bottom: calc(var(--nav-height) / 2); + width: 50vw; #mascot-badge-container { display: grid; diff --git a/src/app/register/Register.scss b/src/app/register/Register.scss index e22f3e6..3fd51a3 100644 --- a/src/app/register/Register.scss +++ b/src/app/register/Register.scss @@ -155,7 +155,6 @@ } p { - font-size: 0.875rem; max-width: 38ch; text-align: center; diff --git a/src/components/Register/FormComponents/FormText/FormText.scss b/src/components/Register/FormComponents/FormText/FormText.scss index 372b780..2d7df49 100644 --- a/src/components/Register/FormComponents/FormText/FormText.scss +++ b/src/components/Register/FormComponents/FormText/FormText.scss @@ -31,7 +31,7 @@ color: $dark-gray; } - &:focus { + &:focus-visible { border-bottom: 1px solid $light-green; } } diff --git a/src/components/Register/FormSteps/FormStep1/FormStep1.tsx b/src/components/Register/FormSteps/FormStep1/FormStep1.tsx index 3320f31..4b883c3 100644 --- a/src/components/Register/FormSteps/FormStep1/FormStep1.tsx +++ b/src/components/Register/FormSteps/FormStep1/FormStep1.tsx @@ -21,7 +21,7 @@ export default function FormStep1({ register={register} name="name" label="Name" - placeholder="e.g. Detective Croc" + placeholder="e.g. Detective Duck" error={errors.name} />
- {activeTab === 'Color' && ( -
    - {Object.entries(COLOR_THEMES).map(([breed, colors]) => ( -
  • - -
  • - ))} -
- )} +
    + {Object.entries(COLOR_THEMES).map(([breed, colors]) => ( +
  • + +
  • + ))} +
- {activeTab === 'Hat' && ( -
    - {Object.entries(MASCOT_HATS).map(([hatName, hatData]) => ( -
  • +
      + {Object.entries(MASCOT_HATS).map(([hatName, hatData]) => ( +
    • + +
    • + ))} +
    +
      + {Object.entries(MASCOT_ACCESSORIES).map( + ([accessory_name, accessory_data]) => ( +
    • - ))} -
    - )} - - {activeTab === 'Accessories' && ( -
      - {Object.entries(MASCOT_ACCESSORIES).map( - ([accessory_name, accessory_data]) => ( -
    • - -
    • - ) - )} -
    - )} + ) + )} +
diff --git a/src/components/Register/FormSteps/FormStep4/FormStep4.scss b/src/components/Register/FormSteps/FormStep4/FormStep4.scss index 6f71bb0..8732acb 100644 --- a/src/components/Register/FormSteps/FormStep4/FormStep4.scss +++ b/src/components/Register/FormSteps/FormStep4/FormStep4.scss @@ -38,7 +38,7 @@ } #mascot-badge-container { - padding-top: 1rem; + padding-block: 1rem; @media (min-width: $tablet-breakpoint) { display: none; } diff --git a/src/components/Register/MascotBadge/MascotBadge.tsx b/src/components/Register/MascotBadge/MascotBadge.tsx index 5b001bb..5f9d821 100644 --- a/src/components/Register/MascotBadge/MascotBadge.tsx +++ b/src/components/Register/MascotBadge/MascotBadge.tsx @@ -64,8 +64,9 @@ export default function MascotBadge({ if (!shouldScale) return; if (badgeContainerRef.current && badgeRef.current && !hasMeasured.current) { hasMeasured.current = true; - const badgeContainerHeight = - badgeContainerRef.current?.getBoundingClientRect().height; + const badgeContainerHeight = badgeContainerRef.current + ? badgeContainerRef.current.getBoundingClientRect().height - 10 + : 0; const badgeWidth = badgeRef.current?.getBoundingClientRect().width; // For Safari bug const badgeHeight = (badgeWidth * 378) / 252; diff --git a/src/components/Register/RegisterAssets/RegisterAssets.scss b/src/components/Register/RegisterAssets/RegisterAssets.scss index 0734f00..e8e1324 100644 --- a/src/components/Register/RegisterAssets/RegisterAssets.scss +++ b/src/components/Register/RegisterAssets/RegisterAssets.scss @@ -16,7 +16,7 @@ } &-stacked-papers { - top: 10%; + top: 15%; left: 0; } @@ -65,10 +65,6 @@ display: none; } - &-magnify-glass { - display: none; - } - &-polaroid { display: none; } @@ -76,10 +72,6 @@ &-bottom-left-paper { display: none; } - - &-feather { - display: none; - } } } }