Skip to content

Commit bb3ca1e

Browse files
JulusianJulusian
committed
fix: styling bugs
1 parent 15f0df0 commit bb3ca1e

14 files changed

+58
-55
lines changed

‎packages/webui/src/client/lib/ModalDialog.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ export function ModalDialog({
152152
className={className}
153153
scrollable
154154
>
155-
<Modal.Header className={warning ? 'modal-header-warn' : 'modal-header-info'}>
155+
<Modal.Header className={warning ? 'modal-header-danger' : 'modal-header-info'}>
156156
<Modal.Title className={'grid-buttons-right w-100'}>
157157
<h2>{title}</h2>
158158

@@ -198,7 +198,7 @@ export function ModalDialog({
198198
>
199199
{secondaryText && (
200200
<Button
201-
variant={discardAsPrimary ? (warning ? 'warn' : 'primary') : 'outline-secondary'}
201+
variant={discardAsPrimary ? (warning ? 'danger' : 'primary') : 'outline-secondary'}
202202
className={'discard-btn'}
203203
autoFocus={discardAsPrimary}
204204
onClick={handleSecondary}
@@ -225,7 +225,7 @@ export function ModalDialog({
225225
)
226226
})}
227227
<Button
228-
variant={!discardAsPrimary ? (warning ? 'warn' : 'primary') : 'outline-secondary'}
228+
variant={!discardAsPrimary ? (warning ? 'danger' : 'primary') : 'outline-secondary'}
229229
className={ClassNames({
230230
right: secondaryText !== undefined,
231231
})}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ $dark-2: #292e32;
2525
$dark: $dark-1;
2626
$body-bg-dark: #343434;
2727
$modal-bg-dark: #3e4041;
28+
$danger: #e62421;
2829

2930
$link-color: $primary;
3031

‎packages/webui/src/client/styles/modalDialog.scss‎

Lines changed: 25 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,25 @@
33
padding-bottom: 10em;
44

55
.modal-header {
6-
//
7-
86
&.modal-header-info {
97
background-color: var(--bs-primary);
108
color: var(--bs-light);
9+
}
10+
&.modal-header-danger {
11+
background-color: var(--bs-danger);
12+
color: var(--bs-light);
13+
}
1114

12-
.modal-title {
13-
text-transform: none;
15+
.modal-title {
16+
text-transform: none;
1417

15-
.action-btn {
16-
color: inherit;
17-
}
18+
.action-btn {
19+
color: inherit;
20+
}
1821

19-
h2 {
20-
color: inherit;
21-
margin: 0;
22-
}
22+
h2 {
23+
color: inherit;
24+
margin: 0;
2325
}
2426
}
2527
}
@@ -73,16 +75,16 @@
7375
// border-style: solid;
7476
// }
7577

76-
// .btn.btn-primary.btn-warn {
77-
// background: #e62421;
78-
// border-color: #e62421;
79-
// color: #ffffff;
80-
// border: #ffffff;
81-
// border-width: 1px;
82-
// border-style: solid;
83-
// }
78+
.btn.btn-primary.btn-warn {
79+
background: #e62421;
80+
border-color: #e62421;
81+
color: #ffffff;
82+
border: #ffffff;
83+
border-width: 1px;
84+
border-style: solid;
85+
}
8486

85-
// .btn.btn-secondary.btn-warn {
86-
// border-color: #e62421;
87-
// color: #e62421;
88-
// }
87+
.btn.btn-secondary.btn-warn {
88+
border-color: #e62421;
89+
color: #e62421;
90+
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
--statusBarWidth: 2.1rem; // the width of the floating right status bar
2121
--componentWidth: calc(100% - var(--statusBarWidth));
2222
--dragHandleWidth: calc(var(--defaultSpacing) + 1rem);
23-
--nameColumnWidth: calc(var(--componentWidth) * var(--nameColumnSize));
23+
--nameColumnWidth: calc(var(--componentWidth) * var(--nameColumnSize) - var(--dragHandleWidth));
2424
--showStyleColumnWidth: calc(var(--componentWidth) * var(--showStyleColumnSize));
2525
--airTimeColumnWidth: calc(var(--componentWidth) * var(--standardColumnSize));
2626
--durationColumnWidth: calc(var(--componentWidth) * var(--standardColumnSize));
@@ -48,6 +48,7 @@
4848
color: #fff;
4949
padding: 5px var(--defaultSpacing) 7px;
5050
vertical-align: middle;
51+
font-weight: inherit;
5152
}
5253

5354
.rundown-list-item__draghandle {

‎packages/webui/src/client/styles/rundownView.scss‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3428,9 +3428,12 @@ svg.icon {
34283428
left: 0;
34293429
right: 0;
34303430
text-align: center;
3431-
font-size: 3em;
34323431
transform: translateY(-50%);
34333432

3433+
.summary {
3434+
font-size: 3em;
3435+
}
3436+
34343437
> p {
34353438
margin: 20px auto;
34363439
max-width: 1200px;

‎packages/webui/src/client/styles/supportAndSwitchboardPanel.scss‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
> hr {
5656
margin: 10px 0;
5757
border-color: #d7d7d7;
58+
opacity: 1;
5859
}
5960
}
6061

‎packages/webui/src/client/styles/systemStatus.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@
245245
min-width: 6em;
246246
}
247247
.user-action-log__args {
248-
min-width: 30em;
248+
min-width: 25em;
249249
}
250250
td.user-action-log__args {
251251
position: relative;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ function NotFoundMessage({ message }: Readonly<{ message: string }>) {
6565
return (
6666
<div className="rundown-view rundown-view--unpublished">
6767
<div className="rundown-view__label">
68-
<p>{message}</p>
68+
<p className="summary">{message}</p>
6969
<p>
7070
<NavLink to="/rundowns" className="btn btn-primary">
7171
{t('Return to list')}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ class Header extends React.Component<Translated<IPropsHeader & ITrackedPropsHead
128128
</div>
129129
</ErrorBoundary>
130130
<Navbar data-bs-theme="dark" fixed="top" expand className="bg-body-tertiary">
131-
<Container fluid>
131+
<Container fluid className="mx-5">
132132
<Navbar.Brand>
133133
<Link className="badge-sofie" to="/">
134134
<div className="media-elem me-2 sofie-logo" />

‎packages/webui/src/client/ui/Prompter/PrompterView.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -479,7 +479,7 @@ export class PrompterViewContent extends React.Component<Translated<IProps & ITr
479479
return (
480480
<div className="rundown-view rundown-view--unpublished">
481481
<div className="rundown-view__label">
482-
<p>{message}</p>
482+
<p className="summary">{message}</p>
483483
<p>
484484
<Route
485485
render={({ history }) => (

0 commit comments

Comments
 (0)