Skip to content

Commit ce715b9

Browse files
nytaminnytamin
authored
Merge pull request #1433 from bbc/upstream/fix-header-clear-merge
fix: bad header-clear merge
2 parents 87135fc + fbdecca commit ce715b9

File tree

5 files changed

+65
-58
lines changed

5 files changed

+65
-58
lines changed

‎packages/webui/src/client/ui/App.tsx‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ import { DocumentTitleProvider } from '../lib/DocumentTitleProvider.js'
3939
import { catchError, firstIfArray, isRunningInPWA } from '../lib/lib.js'
4040
import { protectString } from '@sofie-automation/shared-lib/dist/lib/protectedString'
4141
import { useUserPermissions, UserPermissionsContext } from './UserPermissions.js'
42-
import Container from 'react-bootstrap/Container'
4342
import { relativeToSiteRootUrl, ROOT_URL_PATH_PREFIX } from '../url.js'
4443

4544
const NullComponent = () => null
@@ -150,9 +149,7 @@ export const App: React.FC = function App() {
150149
return (
151150
<UserPermissionsContext.Provider value={roles}>
152151
<Router getUserConfirmation={onNavigationUserConfirmation} basename={ROOT_URL_PATH_PREFIX}>
153-
<Container
154-
fluid
155-
className="header-clear"
152+
<div
156153
style={{
157154
// @ts-expect-error custom variable
158155
'--sofie-logo-url': `url(${relativeToSiteRootUrl('/images/sofie-logo.svg')})`,
@@ -240,7 +237,7 @@ export const App: React.FC = function App() {
240237
<ErrorBoundary>
241238
<ModalDialogGlobalContainer />
242239
</ErrorBoundary>
243-
</Container>
240+
</div>
244241
</Router>
245242
</UserPermissionsContext.Provider>
246243
)

‎packages/webui/src/client/ui/RundownList.tsx‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import { useTranslation } from 'react-i18next'
2020
import { CorelibPubSub } from '@sofie-automation/corelib/dist/pubsub'
2121
import { CreateAdlibTestingRundownPanel } from './RundownList/CreateAdlibTestingRundownPanel.js'
2222
import { UserPermissionsContext } from './UserPermissions.js'
23+
import Container from 'react-bootstrap/esm/Container'
2324

2425
export enum ToolTipStep {
2526
TOOLTIP_START_HERE = 'TOOLTIP_START_HERE',
@@ -138,7 +139,7 @@ export function RundownList(): JSX.Element {
138139
}
139140

140141
return (
141-
<>
142+
<Container fluid className="header-clear">
142143
{coreSystem ? <RegisterHelp step={step} /> : null}
143144

144145
{showGettingStarted === true ? <GettingStarted step={step} /> : null}
@@ -187,6 +188,6 @@ export function RundownList(): JSX.Element {
187188
{userPermissions.studio && <CreateAdlibTestingRundownPanel />}
188189

189190
<RundownListFooter />
190-
</>
191+
</Container>
191192
)
192193
}

‎packages/webui/src/client/ui/Settings.tsx‎

Lines changed: 34 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import { MigrationView } from './Settings/Migration.js'
1515
import { SettingsMenu } from './Settings/SettingsMenu.js'
1616
import { protectString } from '@sofie-automation/corelib/dist/protectedString'
1717
import { CorelibPubSub } from '@sofie-automation/corelib/dist/pubsub'
18+
import Container from 'react-bootstrap/esm/Container'
1819

1920
export function Settings(): JSX.Element | null {
2021
useSubscription(CorelibPubSub.peripheralDevices, null)
@@ -24,35 +25,39 @@ export function Settings(): JSX.Element | null {
2425
useSubscription(CorelibPubSub.blueprints, null)
2526

2627
return (
27-
<div className="mx-5 mt-5 has-statusbar">
28-
<Row>
29-
<Col xs={12} sm={5} md={4} lg={3} className="settings-menu mb-4">
30-
<ErrorBoundary>
31-
<SettingsMenu />
32-
</ErrorBoundary>
33-
</Col>
34-
<Col xs={12} sm={7} md={8} lg={9} className="settings-dialog">
35-
<ErrorBoundary>
36-
<Switch>
37-
<Route path="/settings" exact component={WelcomeToSettings} />
38-
<Route path="/settings/studio/:studioId" component={StudioSettings} />
39-
<Route path="/settings/showStyleBase/:showStyleBaseId" component={ShowStyleSettings} />
40-
<Route path="/settings/peripheralDevice/:deviceId" component={DeviceSettings} />
41-
<Route
42-
path="/settings/blueprint/:blueprintId"
43-
render={(props) => (
44-
<BlueprintSettings blueprintId={protectString(decodeURIComponent(props.match.params.blueprintId))} />
45-
)}
46-
/>
47-
<Route path="/settings/tools/snapshots" component={SnapshotsView} />
48-
<Route path="/settings/tools/migration" component={MigrationView} />
49-
<Route path="/settings/tools/system" component={SystemManagement} />
50-
<Redirect to="/settings" />
51-
</Switch>
52-
</ErrorBoundary>
53-
</Col>
54-
</Row>
55-
</div>
28+
<Container fluid className="header-clear">
29+
<div className="mx-5 mt-5 has-statusbar">
30+
<Row>
31+
<Col xs={12} sm={5} md={4} lg={3} className="settings-menu mb-4">
32+
<ErrorBoundary>
33+
<SettingsMenu />
34+
</ErrorBoundary>
35+
</Col>
36+
<Col xs={12} sm={7} md={8} lg={9} className="settings-dialog">
37+
<ErrorBoundary>
38+
<Switch>
39+
<Route path="/settings" exact component={WelcomeToSettings} />
40+
<Route path="/settings/studio/:studioId" component={StudioSettings} />
41+
<Route path="/settings/showStyleBase/:showStyleBaseId" component={ShowStyleSettings} />
42+
<Route path="/settings/peripheralDevice/:deviceId" component={DeviceSettings} />
43+
<Route
44+
path="/settings/blueprint/:blueprintId"
45+
render={(props) => (
46+
<BlueprintSettings
47+
blueprintId={protectString(decodeURIComponent(props.match.params.blueprintId))}
48+
/>
49+
)}
50+
/>
51+
<Route path="/settings/tools/snapshots" component={SnapshotsView} />
52+
<Route path="/settings/tools/migration" component={MigrationView} />
53+
<Route path="/settings/tools/system" component={SystemManagement} />
54+
<Redirect to="/settings" />
55+
</Switch>
56+
</ErrorBoundary>
57+
</Col>
58+
</Row>
59+
</div>
60+
</Container>
5661
)
5762
}
5863

‎packages/webui/src/client/ui/Status.tsx‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import { MediaStatus } from './Status/media-status/index.js'
1212
import { CorelibPubSub } from '@sofie-automation/corelib/dist/pubsub'
1313
import Row from 'react-bootstrap/Row'
1414
import Col from 'react-bootstrap/Col'
15+
import Container from 'react-bootstrap/esm/Container'
1516

1617
function StatusMenu(): JSX.Element {
1718
const { t } = useTranslation()
@@ -71,7 +72,7 @@ export default function Status(): JSX.Element {
7172
useSubscription(CorelibPubSub.showStyleVariants, null, null)
7273

7374
return (
74-
<>
75+
<Container fluid className="header-clear">
7576
<div className="mt-5 mx-5 has-statusbar">
7677
<Row>
7778
<Col xs={12} sm={4} md={3} lg={2}>
@@ -92,6 +93,6 @@ export default function Status(): JSX.Element {
9293
</Col>
9394
</Row>
9495
</div>
95-
</>
96+
</Container>
9697
)
9798
}

‎packages/webui/src/client/ui/TestTools/index.tsx‎

Lines changed: 23 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import { DeviceTriggersDeviceSelect, DeviceTriggersView } from './DeviceTriggers
99
import { CorelibPubSub } from '@sofie-automation/corelib/dist/pubsub'
1010
import Row from 'react-bootstrap/Row'
1111
import Col from 'react-bootstrap/Col'
12+
import Container from 'react-bootstrap/esm/Container'
1213

1314
function StatusMenu() {
1415
const { t } = useTranslation()
@@ -54,25 +55,27 @@ export default function Status(): JSX.Element {
5455
useSubscription(CorelibPubSub.showStyleVariants, null, null)
5556

5657
return (
57-
<div className="mt-5 mx-5 has-statusbar">
58-
<Row>
59-
<Col xs={12} sm={4} md={3} lg={2}>
60-
<StatusMenu />
61-
</Col>
62-
<Col xs={12} sm={8} md={9} lg={10}>
63-
<Switch>
64-
<Route path="/testTools/timeline/:studioId" component={TimelineView} />
65-
<Route path="/testTools/timeline" component={TimelineStudioSelect} />
66-
<Route path="/testTools/mappings/:studioId" component={MappingsView} />
67-
<Route path="/testTools/mappings" component={MappingsStudioSelect} />
68-
<Route path="/testTools/timelinedatastore/:studioId" component={TimelineDatastoreView} />
69-
<Route path="/testTools/timelinedatastore" component={TimelineDatastoreStudioSelect} />
70-
<Route path="/testTools/devicetriggers/:peripheralDeviceId" component={DeviceTriggersView} />
71-
<Route path="/testTools/devicetriggers" component={DeviceTriggersDeviceSelect} />{' '}
72-
<Redirect to="/testTools/timeline" />
73-
</Switch>
74-
</Col>
75-
</Row>
76-
</div>
58+
<Container fluid className="header-clear">
59+
<div className="mt-5 mx-5 has-statusbar">
60+
<Row>
61+
<Col xs={12} sm={4} md={3} lg={2}>
62+
<StatusMenu />
63+
</Col>
64+
<Col xs={12} sm={8} md={9} lg={10}>
65+
<Switch>
66+
<Route path="/testTools/timeline/:studioId" component={TimelineView} />
67+
<Route path="/testTools/timeline" component={TimelineStudioSelect} />
68+
<Route path="/testTools/mappings/:studioId" component={MappingsView} />
69+
<Route path="/testTools/mappings" component={MappingsStudioSelect} />
70+
<Route path="/testTools/timelinedatastore/:studioId" component={TimelineDatastoreView} />
71+
<Route path="/testTools/timelinedatastore" component={TimelineDatastoreStudioSelect} />
72+
<Route path="/testTools/devicetriggers/:peripheralDeviceId" component={DeviceTriggersView} />
73+
<Route path="/testTools/devicetriggers" component={DeviceTriggersDeviceSelect} />{' '}
74+
<Redirect to="/testTools/timeline" />
75+
</Switch>
76+
</Col>
77+
</Row>
78+
</div>
79+
</Container>
7780
)
7881
}

0 commit comments

Comments
 (0)