Skip to content

draft: update showcase / optimizer / relic card dimensions, round 2 #1306

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
fribbels wants to merge 4 commits into
base: beta
Choose a base branch
from
Draft

draft: update showcase / optimizer / relic card dimensions, round 2 #1306

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1cfefc9
draft: update showcase / optimizer / relic card dimensions, round 2
fribbels Aug 1, 2025
1ad9a9f
fix: teammate width
fribbels Aug 2, 2025
3f1029c
fix: relics grid
fribbels Aug 2, 2025
59ed40b
fix: showcase
fribbels Aug 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/lib/characterPreview/BuffsAnalysisDisplay.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ function BuffTable(props: { buffs: Buff[], size: BuffDisplaySize }) {
}

export enum BuffDisplaySize {
SMALL = 390,
SMALL = 425,
LARGE = 450,
}

Expand Down
4 changes: 2 additions & 2 deletions src/lib/characterPreview/CharacterPreview.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ export function CharacterPreview(props: {
<div
style={{
height: parentH,
width: 1068,
width: 1082,
borderRadius: 8,
backgroundColor: token.colorBgLayout,
border: `1px solid ${token.colorBgContainer}`,
Expand Down Expand Up @@ -245,7 +245,7 @@ export function CharacterPreview(props: {
const finalStats = getShowcaseStats(character, displayRelics, showcaseMetadata)

return (
<Flex vertical style={{ width: 1068, minHeight: source == ShowcaseSource.BUILDS_MODAL ? 850 : 2000 }}>
<Flex vertical style={{ width: 1082, minHeight: source == ShowcaseSource.BUILDS_MODAL ? 850 : 2000 }}>
<RelicModal
selectedRelic={selectedRelic}
onOk={onRelicModalOk}
Expand Down
4 changes: 2 additions & 2 deletions src/lib/characterPreview/CharacterScoringSummary.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ export const CharacterScoringSummary = (props: {
benchmarkCombatStats[StatToKey[elementalDmgValue]] = benchmarkCombatStats[Key.ELEMENTAL_DMG]
maximumCombatStats[StatToKey[elementalDmgValue]] = maximumCombatStats[Key.ELEMENTAL_DMG]

const statPreviewWidth = 300
const statPreviewWidth = 320
const divider = (
<Flex vertical>
<Divider type='vertical' style={{ flexGrow: 1, margin: '10px 30px' }}/>
Expand Down Expand Up @@ -263,7 +263,7 @@ export const CharacterScoringSummary = (props: {
}

return (
<Flex vertical gap={15} align='center' style={{ width: 1068 }}>
<Flex vertical gap={15} align='center' style={{ width: 1082 }}>
<Flex align='center' vertical gap={15}>
<pre style={{ fontSize: 28, fontWeight: 'bold', margin: 0 }}>
<ColorizedTitleWithInfo
Expand Down
2 changes: 1 addition & 1 deletion src/lib/characterPreview/ShowcaseCustomizationSidebar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@ const ShowcaseCustomizationSidebar = forwardRef<ShowcaseCustomizationSidebarRef,
gap={16}
style={{
position: 'absolute',
marginLeft: 1076,
marginLeft: 1090,
width: 130,
}}
>
Expand Down
2 changes: 1 addition & 1 deletion src/lib/tabs/tabCharacters/FilterBar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ export function FilterBar() {
</Flex>
<Flex
// Selected to align with relics panel
style={{ width: 408 }}
style={{ width: 422 }}
>
<SegmentedFilterRow
tags={generateElementTags()}
Expand Down
2 changes: 1 addition & 1 deletion src/lib/tabs/tabOptimizer/OptimizerBuildPreview.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ export default function OptimizerBuildPreview() {

return (
<div>
<Flex gap={5} id='optimizerBuildPreviewContainer' justify='space-between' style={{ paddingLeft: 1, paddingRight: 1 }}>
<Flex gap={6} id='optimizerBuildPreviewContainer' justify='space-between' style={{}}>
<RelicPreview setEditModalOpen={setEditModalOpen} setSelectedRelic={setSelectedRelic} relic={headRelic} score={headScore} />
<RelicPreview setEditModalOpen={setEditModalOpen} setSelectedRelic={setSelectedRelic} relic={handsRelic} score={handsScore} />
<RelicPreview setEditModalOpen={setEditModalOpen} setSelectedRelic={setSelectedRelic} relic={bodyRelic} score={bodyScore} />
Expand Down
6 changes: 3 additions & 3 deletions src/lib/tabs/tabOptimizer/Sidebar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ const { useBreakpoint } = Grid

const { Text } = Typography

const SCROLLBAR_WIDTH = 5; //px
const RESERVED_SPACE = 2; //px
const SCROLLBAR_WIDTH = 5 // px
const RESERVED_SPACE = 2 // px

type GpuOption = { label: ReactElement, key: ComputeEngine }

Expand Down Expand Up @@ -290,7 +290,7 @@ function ManyPermsModal(props: { manyPermsModalOpen: boolean, setManyPermsModalO

function OptimizerSidebar(props: { isFullSize: boolean }) {
const { token } = useToken()
const totalSideOffset = SCROLLBAR_WIDTH + RESERVED_SPACE;
const totalSideOffset = SCROLLBAR_WIDTH + RESERVED_SPACE
const shadow = 'rgba(0, 0, 0, 0.25) 0px 0.0625em 0.0625em, rgba(0, 0, 0, 0.25) 0px 0.125em 0.5em, rgba(255, 255, 255, 0.15) 0px 0px 0px 1px inset'
return (
<Flex vertical style={{ overflow: 'clip' }}>
Expand Down
6 changes: 3 additions & 3 deletions src/lib/tabs/tabOptimizer/optimizerForm/components/TeammateCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,7 @@ const TeammateCard = (props: {
</Flex>

<Flex>
<Flex vertical style={{ minWidth: 258, marginLeft: 5 }}>
<Flex vertical style={{ minWidth: 273, marginLeft: 5 }}>
<CharacterConditionalsDisplay
id={teammateCharacterId}
eidolon={teammateEidolon}
Expand Down Expand Up @@ -407,7 +407,7 @@ const TeammateCard = (props: {
<AntDForm.Item name={[teammateProperty, `lightCone`]}>
<LightConeSelect
value={null}
selectStyle={{ width: 258 }}
selectStyle={{ width: 273 }}
characterId={teammateCharacterId}
externalOpen={teammateLightConeSelectOpen}
setExternalOpen={setTeammateLightConeSelectOpen}
Expand All @@ -426,7 +426,7 @@ const TeammateCard = (props: {
</Flex>

<Flex>
<Flex vertical style={{ minWidth: 258, marginLeft: 5 }}>
<Flex vertical style={{ minWidth: 273, marginLeft: 5 }}>
<LightConeConditionalDisplay
id={teammateLightConeId}
superImposition={teammateSuperimposition}
Expand Down
2 changes: 1 addition & 1 deletion src/lib/tabs/tabOptimizer/optimizerForm/grid/OptimizerGrid.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ const defaultHiddenColumns = [
]

export const GRID_DIMENSIONS = {
WIDTH: 1227,
WIDTH: 1272,
HEIGHT: 600,
MIN_HEIGHT: 300,
}
Expand Down
2 changes: 1 addition & 1 deletion src/lib/tabs/tabOptimizer/optimizerForm/grid/optimizerGridColumns.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export const DIGITS_5 = 56
export const DIGITS_6 = 62

export const optimizerTabDefaultGap = 5
export const panelWidth = 211
export const panelWidth = 220
export const defaultPadding = 11

export const optimizerGridOptions: GridOptions<OptimizerDisplayDataStatSim> = {
Expand Down
2 changes: 1 addition & 1 deletion src/lib/tabs/tabOptimizer/optimizerForm/layout/FilterContainer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export default function FilterContainer(props: { children: ReactElement | ReactE
backdropFilter: 'blur(5px)',
border: '1px solid rgba(255, 255, 255, 0.10)',
WebkitBackdropFilter: 'blur(5px)',
width: 1227,
width: 1272,
}}
>
{props.children}
Expand Down
17 changes: 6 additions & 11 deletions src/lib/tabs/tabOptimizer/optimizerForm/layout/FormCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ export const cardShadowNonInset = 'rgba(0, 0, 0, 0.25) 0px 0.0625em 0.0625em, rg
const defaultGap = 5

const smallWidth = panelWidth
const narrowWidth = 233
const mediumWidth = 373
const narrowWidth = 242
const mediumWidth = 390
const largeWidth = 1183

const dimsBySize: Record<string, number> = {
small: smallWidth,
narrow: 233,
narrow: narrowWidth,
medium: mediumWidth,
large: largeWidth,
}
Expand Down Expand Up @@ -53,17 +53,12 @@ export default function FormCard(props: {
}}
>
<Flex
vertical
gap={defaultGap}
style={{ width: width }}
justify={props.justify ?? undefined}
>
<Flex
vertical
style={{ width: width }}
gap={defaultGap}
justify={props.justify ?? undefined}
>
{props.children}
</Flex>
{props.children}
</Flex>
</Flex>
)
Expand Down
4 changes: 2 additions & 2 deletions src/lib/tabs/tabRelics/RelicPreview.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,8 @@ export function RelicPreview(props: {
hoverable={source != ShowcaseSource.SHOWCASE_TAB && source != ShowcaseSource.BUILDS_MODAL && !unhoverable}
onClick={cardClicked}
style={{
width: 200,
minWidth: 200,
width: 207,
minWidth: 207,
height: 280,
backgroundColor: showcaseTheme?.cardBackgroundColor,
borderColor: showcaseTheme?.cardBorderColor,
Expand Down
2 changes: 1 addition & 1 deletion src/lib/tabs/tabRelics/RelicsTab.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import { TooltipImage } from 'lib/ui/TooltipImage'
import { useTranslation } from 'react-i18next'
import { Relic } from 'types/relic'

export const TAB_WIDTH = 1460
export const TAB_WIDTH = 1468

export default function RelicsTab() {
const { focusCharacter, selectedRelicId, relicModalOpen, setRelicModalOpen, setSelectedRelicsIds } = useRelicsTabStore()
Expand Down
2 changes: 1 addition & 1 deletion src/lib/tabs/tabShowcase/ShowcaseTab.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ function CharacterPreviewSelection() {

return (
<Flex style={{ width: 1375 }} justify='space-around'>
<Flex vertical align='center' gap={5} style={{ marginBottom: 100, width: 1068 }}>
<Flex vertical align='center' gap={5} style={{ marginBottom: 100, width: 1082 }}>
<Flex vertical style={{ display: (availableCharacters?.length && availableCharacters.length > 0) ? 'flex' : 'none', width: '100%' }}>
<Sidebar presetClicked={presetClicked} />

Expand Down
4 changes: 2 additions & 2 deletions src/lib/utils/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,8 @@ export const Utils = {
const minDataLength = 1200000
const maxAttempts = isMobileOrSafari ? 9 : 3
const scale = 1.5
const w = 1068 * scale
const h = 856 * scale
const w = 1100 * scale
const h = 880 * scale

const options = {
pixelRatio: 1,
Expand Down