diff --git a/src/components/ExtraSummons/index.scss b/src/components/ExtraSummons/index.scss new file mode 100644 index 00000000..40ac151b --- /dev/null +++ b/src/components/ExtraSummons/index.scss @@ -0,0 +1,32 @@ +#ExtraSummons { + background: #FFEBD9; + border-radius: 8px; + box-sizing: border-box; + display: flex; + justify-content: center; + margin: 20px auto; + max-width: 727px; + padding: 16px 16px 16px 0; + position: relative; + left: 9px; + + & > span { + color: #825B39; + display: flex; + align-items: center; + justify-content: center; + line-height: 1.2; + font-weight: 500; + margin-right: 16px; + text-align: center; + width: 387px; + } + + .SummonUnit .SummonImage { + background: #D5D3F6; + } + + .WeaponUnit .WeaponImage .icon svg { + fill: #8F8AC6; + } +} \ No newline at end of file diff --git a/src/components/ExtraSummons/index.tsx b/src/components/ExtraSummons/index.tsx new file mode 100644 index 00000000..0d44aa59 --- /dev/null +++ b/src/components/ExtraSummons/index.tsx @@ -0,0 +1,53 @@ +import React from 'react' +import SummonUnit from '~components/SummonUnit' +import './index.scss' + +// GridType +export enum GridType { + Class, + Character, + Weapon, + Summon +} + +// Props +interface Props { + grid: GridArray + editable: boolean + exists: boolean + found?: boolean + onSelect: (type: GridType, summon: Summon, position: number) => void +} + +const ExtraSummons = (props: Props) => { + const numSummons: number = 2 + + function receiveWeapon(summon: Summon, position: number) { + props.onSelect(GridType.Summon, summon, position) + } + + return ( +
+ Sub Aura Summons + +
+ ) +} + +export default ExtraSummons diff --git a/src/components/SummonGrid/index.scss b/src/components/SummonGrid/index.scss index 611749da..17161e27 100644 --- a/src/components/SummonGrid/index.scss +++ b/src/components/SummonGrid/index.scss @@ -1,27 +1,27 @@ .SummonGrid { - display: flex; + display: grid; + grid-template-columns: auto auto auto; + grid-column-gap: $unit * 2; justify-content: center; + + & .Label { + color: $grey-50; + font-size: 12px; + font-weight: $medium; + margin-bottom: $unit; + text-align: center; + } } #grid_summons { - display: flex; - flex-direction: row; - flex-wrap: wrap; - margin: 0 24px 0 0; - padding: 0; - width: 344px; -} - -#grid_summons > * { - margin-bottom: 24px; - margin-right: 24px; - -} - -#grid_summons > *:nth-child(2n+2) { - margin-right: 0; + display: grid; + grid-template-columns: auto auto; + grid-column-gap: $unit * 2; + grid-template-rows: 1fr; + grid-row-gap: $unit * 3; } #grid_summons > li { list-style: none; + min-height: 180px; } \ No newline at end of file diff --git a/src/components/SummonGrid/index.tsx b/src/components/SummonGrid/index.tsx index 236c7764..e389dc95 100644 --- a/src/components/SummonGrid/index.tsx +++ b/src/components/SummonGrid/index.tsx @@ -1,4 +1,5 @@ import React from 'react' +import ExtraSummons from '~components/ExtraSummons' import SummonUnit from '~components/SummonUnit' import './index.scss' @@ -32,41 +33,63 @@ const SummonGrid = (props: Props) => { } return ( -
- +
+
+
+
Main Summon
+ +
-
    - { - Array.from(Array(numSummons)).map((x, i) => { - return ( -
  • - -
  • - ) - }) - } -
+
+
Friend Summon
+ +
- +
Summons
+
    + { + Array.from(Array(numSummons)).map((x, i) => { + return ( +
  • + +
  • + ) + }) + } +
+
+
+ +
) diff --git a/src/components/SummonUnit/index.scss b/src/components/SummonUnit/index.scss index 9908b87b..509ab294 100644 --- a/src/components/SummonUnit/index.scss +++ b/src/components/SummonUnit/index.scss @@ -64,29 +64,24 @@ } /* Mainhand */ -.SummonUnit.main, -.SummonUnit.friend { - margin-right: 24px; - max-width: 200px; -} - .SummonUnit.friend { margin-right: 0; } .SummonUnit.main .SummonImage, .SummonUnit.friend .SummonImage { - height: 374px; - width: 180px; + height: 315px; + width: 182px; } /* Grid */ .SummonUnit.grid { - max-width: 160px; + max-width: 148px; + min-height: 141px; } .SummonUnit.grid .SummonImage { list-style-type: none; - height: 92px; - width: 160px; + height: 111px; + width: 148px; } \ No newline at end of file