granblue.team/hensei-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix spacing on WeaponGrid

Browse source
This commit is contained in:
Justin Edmund 2023-06-18 05:36:59 -07:00
parent bd7683513b
commit 45645aa352
2 changed files with 28 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
components/weapon/WeaponGrid/index.scss
View file

@ -13,10 +13,7 @@
gap: $unit-3x;
grid-template-columns: 1.278fr 3fr;
justify-items: center;
grid-template-areas:
'mainhand grid'
'mainhand grid'
'mainhand grid';
grid-template-areas: 'mainhand grid';
max-width: $grid-width;
@include breakpoint(tablet) {

50
components/weapon/WeaponGrid/index.tsx
View file

@ -375,28 +375,32 @@ const WeaponGrid = (props: Props) => {
)
})
const extraElement = (
<ExtraContainer>
{appState.party.raid && appState.party.raid.group.extra && (
<ExtraWeaponsGrid
grid={appState.grid.weapons.allWeapons}
editable={props.editable}
offset={numWeapons}
removeWeapon={removeWeapon}
updateObject={receiveWeaponFromSearch}
updateUncap={initiateUncapUpdate}
/>
)}
{appState.party.raid && appState.party.raid.group.guidebooks && (
<GuidebooksGrid
grid={appState.party.guidebooks}
editable={props.editable}
removeGuidebook={removeGuidebook}
updateObject={receiveGuidebookFromSearch}
/>
)}
</ExtraContainer>
)
const extraElement = () => {
if (appState.party.raid && appState.party.raid.group.extra) {
return (
<ExtraContainer>
{appState.party.raid && appState.party.raid.group.extra && (
<ExtraWeaponsGrid
grid={appState.grid.weapons.allWeapons}
editable={props.editable}
offset={numWeapons}
removeWeapon={removeWeapon}
updateObject={receiveWeaponFromSearch}
updateUncap={initiateUncapUpdate}
/>
)}
{appState.party.raid && appState.party.raid.group.guidebooks && (
<GuidebooksGrid
grid={appState.party.guidebooks}
editable={props.editable}
removeGuidebook={removeGuidebook}
updateObject={receiveGuidebookFromSearch}
/>
)}
</ExtraContainer>
)
}
}
const conflictModal = () => {
return incoming && conflicts ? (
@ -448,7 +452,7 @@ const WeaponGrid = (props: Props) => {
<ul id="Weapons">{weaponGridElement}</ul>
</div>
{displayExtraContainer ? extraElement : ''}
{displayExtraContainer ? extraElement() : ''}
</div>
)
}