Skip to content

Commit 62055fc

Browse files
committed
fix: simplify media queries
1 parent 455324a commit 62055fc

File tree

5 files changed

+13
-48
lines changed

5 files changed

+13
-48
lines changed

src/core/frame/WorkshopCanvas.tsx

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {Box, Button, Card, Code, ErrorBoundary, Flex, Heading, Spinner, Stack} from '@sanity/ui'
2-
import {createElement, memo, Suspense, useCallback, useState} from 'react'
2+
import {memo, Suspense, useCallback, useState} from 'react'
33

44
import {WorkshopStory} from '../config'
55
import {useWorkshop} from '../useWorkshop'
@@ -35,14 +35,17 @@ export const WorkshopCanvas = memo(function WorkshopCanvas(): React.ReactNode {
3535
</Card>
3636
)
3737
}
38+
const Story = story.component
3839

3940
return (
4041
<>
4142
<h1 hidden>{story.title}</h1>
4243

4344
<Suspense fallback={<LoadingScreen story={story} />}>
44-
<Card as="main" height="fill">
45-
<ErrorBoundary onCatch={catchError}>{createElement(story.component)}</ErrorBoundary>
45+
<Card as="main" height="fill" overflow="auto">
46+
<ErrorBoundary onCatch={catchError}>
47+
<Story />
48+
</ErrorBoundary>
4649
</Card>
4750
</Suspense>
4851
</>

src/core/inspector/InspectorHeader.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import {Card, Layer, Tab, TabList} from '@sanity/ui'
22
import {memo, useCallback} from 'react'
33

4-
import {inspectorHeader, inspectorHeaderCard} from '#styles'
4+
import {inspectorHeader} from '#styles'
55

66
import {InspectorTab} from './types'
77

@@ -14,7 +14,7 @@ export const InspectorHeader = memo(function InspectorHeader(props: {
1414

1515
return (
1616
<Layer className={inspectorHeader} flex="none" position="sticky">
17-
<Card className={inspectorHeaderCard} padding={2} shadow={1}>
17+
<Card padding={2} shadow={1}>
1818
<TabList gap={1}>
1919
{tabs.map((tab) => (
2020
<InspectorTabView

src/core/inspector/WorkshopInspector.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ export const WorkshopInspector = memo(function WorkshopInspector(props: {
4343
display={expanded ? ['block'] : ['none', 'none', 'block']}
4444
flex={1}
4545
overflow={['hidden', 'hidden', 'auto']}
46+
borderLeft={['none', 'none', 'solid']}
4647
>
4748
<Flex direction="column" height="fill">
4849
{showTabs && <InspectorHeader currentTabId={tabId} onTabChange={setTabId} tabs={tabs} />}

src/core/navigator/WorkshopNavigator.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ const NavigatorView = memo(function NavigatorView(props: {
103103
display={display}
104104
flex={1}
105105
overflow={['hidden', 'hidden', 'auto']}
106+
borderRight={['none', 'none', 'solid']}
106107
>
107108
<Flex direction="column" height="fill">
108109
<Layer flex="none">

src/core/styles.css.ts

Lines changed: 3 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,4 @@
1-
import {vars} from '@sanity/ui/css'
2-
import {
3-
createVar,
4-
createViewTransition,
5-
fallbackVar,
6-
globalStyle,
7-
style,
8-
} from '@vanilla-extract/css'
1+
import {createVar, createViewTransition, globalStyle, style} from '@vanilla-extract/css'
92
import {calc} from '@vanilla-extract/css-utils'
103

114
globalStyle('html', {
@@ -20,12 +13,6 @@ globalStyle('html, body', {
2013
margin: 0,
2114
})
2215

23-
globalStyle('body', {
24-
// Since `@sanity/ui-workshop` is used by `@sanity/ui` we need to fallback to a stable var that exists in dev
25-
backgroundColor: fallbackVar(vars.color.tinted.default.bg[1], 'var(--card-bg-color)'),
26-
overflow: 'auto',
27-
})
28-
2916
export const canvasViewTransition = createViewTransition('canvas')
3017
export const zoom = createVar(
3118
{
@@ -69,41 +56,14 @@ const workshopAside = style({
6956
},
7057
})
7158

72-
export const workshopInspector = style([
73-
workshopAside,
74-
{
75-
'@media': {
76-
'screen and (min-width: 600px)': {
77-
borderLeft: `1px solid ${fallbackVar(vars.color.tinted.default.border[1], 'var(--card-border-color)')}`,
78-
},
79-
},
80-
},
81-
])
59+
export const workshopInspector = style([workshopAside])
8260

83-
export const workshopNavigator = style([
84-
workshopAside,
85-
{
86-
'@media': {
87-
'screen and (min-width: 600px)': {
88-
borderRight: `1px solid ${fallbackVar(vars.color.tinted.default.border[1], 'var(--card-border-color)')}`,
89-
},
90-
},
91-
},
92-
])
61+
export const workshopNavigator = style([workshopAside])
9362

9463
export const inspectorHeader = style({
9564
top: 0,
9665
})
9766

98-
export const inspectorHeaderCard = style({
99-
'lineHeight': 0,
100-
'@media': {
101-
'screen and (max-width: 599px)': {
102-
textAlign: 'center',
103-
},
104-
},
105-
})
106-
10767
export const workshopLayout = style({
10868
selectors: {
10969
'&&': {

0 commit comments

Comments
 (0)