Skip to content

Commit 04438b5

Browse files
committed
wip: finish rundown list page
1 parent da905b4 commit 04438b5

File tree

9 files changed

+54
-21
lines changed

9 files changed

+54
-21
lines changed

packages/webui/src/client/styles/bootstrap-customise.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,5 @@ $body-tertiary-bg-dark: #343434;
77
$font-weight-base: 300; // lighter
88

99
$navbar-brand-font-size: 1rem;
10+
11+
$line-height-base: 1.2;

packages/webui/src/client/styles/main.scss

Lines changed: 27 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,32 @@ input {
1010

1111
@use 'fonts';
1212

13-
// @import 'colorScheme';
14-
// @import '_variables';
15-
// @import '_colorScheme';
16-
1713
@use 'defaultColors';
1814
@use 'itemTypeColors';
1915

2016
@use 'bootstrap';
2117

18+
ul {
19+
margin: 20px;
20+
padding: 0;
21+
}
22+
23+
h1,
24+
h2,
25+
h3,
26+
h4,
27+
h5,
28+
h6 {
29+
font-weight: 300;
30+
}
31+
h1 {
32+
font-size: 3rem;
33+
}
34+
35+
@import 'colorScheme';
36+
@import '_variables';
37+
@import '_colorScheme';
38+
2239
@import '_header';
2340

2441
// @import 'afterBroadcastForm';
@@ -37,11 +54,11 @@ input {
3754
// @import 'overflowingContainer';
3855
// @import 'pieceStatusIcon';
3956
// @import 'prompter';
40-
// @import 'rundownList';
57+
@import 'rundownList';
4158
// @import 'rundownSystemStatus';
4259
// @import 'settings';
4360
// @import 'splitDropdown';
44-
// @import 'statusbar';
61+
@import 'statusbar';
4562
// @import 'statusNotification';
4663
// @import 'studioScreenSaver';
4764
// @import 'supportAndSwitchboardPanel';
@@ -149,10 +166,10 @@ input {
149166
// // position: relative;
150167
// // z-index: 500;
151168
// }
152-
// .header-clear {
153-
// padding-top: 4rem;
154-
// padding-right: $statusbar-width;
155-
// }
169+
.header-clear {
170+
padding-top: 4rem;
171+
padding-right: $statusbar-width;
172+
}
156173

157174
// #render-target {
158175
// font-weight: 300;

packages/webui/src/client/styles/rundownList.scss

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
// Root playlist/rundown list, see RundownList.tsx
32
.rundown-list {
43
--defaultSpacing: 20px;
@@ -77,6 +76,7 @@
7776
}
7877

7978
.rundown-name {
79+
font-weight: bold;
8080
> a > svg {
8181
margin-right: 0;
8282
}
@@ -375,6 +375,20 @@
375375
display: flex;
376376
}
377377
}
378+
379+
.rundown-progress-bar {
380+
height: 2px;
381+
position: relative;
382+
transition: height 0.25s;
383+
}
384+
385+
.rundown-progress-bar-indicator {
386+
position: absolute;
387+
top: 0;
388+
left: 0;
389+
height: 100%;
390+
background: linear-gradient(90deg, #1769ff, #3593ff);
391+
}
378392
}
379393

380394
.create-testing-rundown {

packages/webui/src/client/ui/Header.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ class Header extends React.Component<Translated<IPropsHeader & ITrackedPropsHead
127127
<SupportPopUpToggle onClick={this.onToggleSupportPanel} isOpen={this.state.isSupportPanelOpen} />
128128
</div>
129129
</ErrorBoundary>
130-
<Navbar data-bs-theme="dark" fixed="top" expand="lg" className="bg-body-tertiary">
130+
<Navbar data-bs-theme="dark" fixed="top" expand className="bg-body-tertiary">
131131
<Container fluid>
132132
<Navbar.Brand>
133133
<Link className="badge-sofie" to="/">

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -144,12 +144,12 @@ export function RundownList(): JSX.Element {
144144

145145
{showGettingStarted === true ? <GettingStarted step={step} /> : null}
146146

147-
<section className="mtl gutter has-statusbar">
148-
<header className="mvs">
147+
<section className="mt-5 mx-5 has-statusbar">
148+
<header className="my-2">
149149
<h1>{t('Rundowns')}</h1>
150150
</header>
151151
{subsReady ? (
152-
<section className="mod mvl rundown-list" role="treegrid">
152+
<section className="my-5 rundown-list" role="treegrid">
153153
<header className="rundown-list__header">
154154
<span className="rundown-list-item__name" role="columnheader">
155155
<Tooltip

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ export function ActiveProgressBar({
1313
const progress = Math.min(((currentTime - startedPlayback) / expectedDuration) * 100, 100)
1414

1515
return (
16-
<div className="progress-bar">
17-
<div className="pb-indicator" style={{ width: `${progress}%` }} />
16+
<div className="rundown-progress-bar">
17+
<div className="rundown-progress-bar-indicator" style={{ width: `${progress}%` }} />
1818
</div>
1919
)
2020
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ export const CreateAdlibTestingRundownPanel = memo(function CreateAdlibTestingRu
4242
if (options.length === 0) return null
4343

4444
return (
45-
<div className="mtl gutter create-testing-rundown">
45+
<div className="mt-5 mx-5 create-testing-rundown">
4646
<h2>{t('Create Adlib Testing Rundown')}</h2>
4747
<p>
4848
{options.map((option) => (

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,14 @@ export function RundownListFooter(): JSX.Element {
4444
const versionExtended = APP_VERSION_EXTENDED || version
4545

4646
return (
47-
<div className="mtl gutter version-info">
47+
<div className="mt-5 mx-5 version-info">
4848
<p>
4949
{t('Sofie Automation')} {t('version')}:&nbsp;
5050
<Tooltip overlay={versionExtended} placement="top" mouseEnterDelay={TOOLTIP_DEFAULT_DELAY}>
5151
<span>{version}</span>
5252
</Tooltip>
5353
</p>
54-
<div className="mod">
54+
<div>
5555
{systemStatus ? (
5656
<>
5757
<div>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ export default React.memo(function RundownListItemView({
9797
</Tooltip>
9898
</span>
9999
) : null}
100-
<b className="rundown-name">{rundownNameContent}</b>
100+
<span className="rundown-name">{rundownNameContent}</span>
101101
{rundown.description ? (
102102
<Tooltip overlay={rundown.description} trigger={['hover']} placement="right">
103103
<span className="rundown-list-description__icon">

0 commit comments

Comments
 (0)