diff --git a/components/character/CharacterGrid/index.module.scss b/components/character/CharacterGrid/index.module.scss index f379266b..947baece 100644 --- a/components/character/CharacterGrid/index.module.scss +++ b/components/character/CharacterGrid/index.module.scss @@ -1,4 +1,4 @@ -#CharacterGrid { +.grid { display: flex; flex-direction: column; justify-content: center; @@ -8,32 +8,32 @@ @include breakpoint(tablet) { align-items: center; } -} -#Characters { - display: grid; - grid-template-columns: repeat(5, minmax(0, 1fr)); - gap: $unit-3x; - margin: 0; - padding: 0; - max-width: $grid-width; - isolation: isolate; - - @include breakpoint(tablet) { - gap: $unit-2x; - justify-content: space-between; - width: 100%; - } - - // prettier-ignore - @media only screen - and (max-width: 500px) - and (max-height: 920px) - and (-webkit-min-device-pixel-ratio: 2) { - gap: $unit; - } - - & > li:last-child { + .characters { + display: grid; + grid-template-columns: repeat(5, minmax(0, 1fr)); + gap: $unit-3x; margin: 0; + padding: 0; + max-width: $grid-width; + isolation: isolate; + + @include breakpoint(tablet) { + gap: $unit-2x; + justify-content: space-between; + width: 100%; + } + + // prettier-ignore + @media only screen + and (max-width: 500px) + and (max-height: 920px) + and (-webkit-min-device-pixel-ratio: 2) { + gap: $unit; + } + + & > li:last-child { + margin: 0; + } } } diff --git a/components/character/CharacterGrid/index.tsx b/components/character/CharacterGrid/index.tsx index 53656f81..deb914f0 100644 --- a/components/character/CharacterGrid/index.tsx +++ b/components/character/CharacterGrid/index.tsx @@ -515,7 +515,7 @@ const CharacterGrid = (props: Props) => { cancelAction={cancelAlert} cancelActionText={'Got it'} /> -
+
{ resolveConflict={resolveConflict} resetConflict={resetConflict} /> -
    +
      {Array.from(Array(numCharacters)).map((x, i) => { return (
    • diff --git a/components/summon/SummonGrid/index.module.scss b/components/summon/SummonGrid/index.module.scss index 5f575ff9..afeb650e 100644 --- a/components/summon/SummonGrid/index.module.scss +++ b/components/summon/SummonGrid/index.module.scss @@ -1,4 +1,4 @@ -#SummonGrid { +.grid { display: grid; grid-template-columns: 1.17fr 2fr 1.17fr; gap: $unit-3x; @@ -14,7 +14,7 @@ gap: $unit; } - & .Label { + & .label { color: $grey-55; font-size: $font-tiny; font-weight: $medium; @@ -25,13 +25,13 @@ overflow: hidden; @include breakpoint(phone) { - &.Friend { + &.friend { max-width: 78px; } } } - #Summons { + .summons { display: grid; grid-template-columns: repeat(2, minmax(0, 1fr)); grid-template-rows: repeat(2, minmax(0, 1fr)); diff --git a/components/summon/SummonGrid/index.tsx b/components/summon/SummonGrid/index.tsx index 08a2a8da..82677ec3 100644 --- a/components/summon/SummonGrid/index.tsx +++ b/components/summon/SummonGrid/index.tsx @@ -16,6 +16,7 @@ import { appState } from '~utils/appState' import type { DetailsObject, SearchableObject } from '~types' import styles from './index.module.scss' +import classNames from 'classnames' // Props interface Props { @@ -379,7 +380,7 @@ const SummonGrid = (props: Props) => { const mainSummonElement = (
      -
      {t('summons.main')}
      +
      {t('summons.main')}
      { const friendSummonElement = (
      -
      {t('summons.friend')}
      +
      + {t('summons.friend')} +
      { ) const summonGridElement = ( -
      -
      {t('summons.summons')}
      -
        +
        +
        {t('summons.summons')}
        +
          {Array.from(Array(numSummons)).map((x, i) => { return (
        • @@ -432,7 +440,7 @@ const SummonGrid = (props: Props) => { ) })}
        -
      + ) const subAuraSummonElement = ( @@ -449,8 +457,8 @@ const SummonGrid = (props: Props) => { ) return ( -
      -
      +
      +
      {mainSummonElement} {summonGridElement} {friendSummonElement} diff --git a/components/weapon/WeaponGrid/index.module.scss b/components/weapon/WeaponGrid/index.module.scss index 92324d01..750715e1 100644 --- a/components/weapon/WeaponGrid/index.module.scss +++ b/components/weapon/WeaponGrid/index.module.scss @@ -1,4 +1,4 @@ -#WeaponGrid { +.wrapper { align-items: center; display: flex; flex-direction: column; @@ -8,7 +8,7 @@ margin: 0 2px; } - #MainGrid { + .grid { display: grid; gap: $unit-3x; grid-template-columns: 1.278fr 3fr; @@ -23,30 +23,26 @@ @include breakpoint(phone) { gap: $unit; } - } - #Weapons { - display: grid; /* make the right-images container a grid */ - grid-template-columns: repeat( - 3, - minmax(0, 1fr) - ); /* create 3 columns, each taking up 1 fraction */ - grid-template-rows: repeat( - 3, - 1fr - ); /* create 3 rows, each taking up 1 fraction */ - gap: $unit-3x; + .weapons { + display: grid; /* make the right-images container a grid */ + grid-template-columns: repeat( + 3, + minmax(0, 1fr) + ); /* create 3 columns, each taking up 1 fraction */ + grid-template-rows: repeat( + 3, + 1fr + ); /* create 3 rows, each taking up 1 fraction */ + gap: $unit-3x; - @include breakpoint(tablet) { - gap: $unit-2x; + @include breakpoint(tablet) { + gap: $unit-2x; + } + + @include breakpoint(phone) { + gap: $unit; + } } - - @include breakpoint(phone) { - gap: $unit; - } - } - - li:not(.Empty) { - // aspect-ratio: 1 / 1.035; } } diff --git a/components/weapon/WeaponGrid/index.tsx b/components/weapon/WeaponGrid/index.tsx index fb933a5c..124c14f1 100644 --- a/components/weapon/WeaponGrid/index.tsx +++ b/components/weapon/WeaponGrid/index.tsx @@ -443,13 +443,13 @@ const WeaponGrid = (props: Props) => { } return ( -
      +
      {conflicts ? conflictModal() : ''} {incompatibleAlert()} {errorAlert()} -
      +
      {mainhandElement} -
        {weaponGridElement}
      +
        {weaponGridElement}
      {displayExtraContainer ? extraElement() : ''}