Skip to content

Commit da905b4

Browse files
JulusianJulusian
committed
wip: start css from scratch
1 parent 1f00f7f commit da905b4

File tree

16 files changed

+567
-316
lines changed

16 files changed

+567
-316
lines changed

‎packages/package.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
"@types/jest": "^29.5.14",
4949
"@types/node": "^22.10.10",
5050
"@types/object-path": "^0.11.4",
51+
"@types/react-router-bootstrap": "^0",
5152
"@types/underscore": "^1.13.0",
5253
"babel-jest": "^29.7.0",
5354
"copyfiles": "^2.4.1",
@@ -71,5 +72,8 @@
7172
"packageManager": "[email protected]",
7273
"resolutions": {
7374
"[email protected]": "patch:timecode@npm%3A0.0.4#./.yarn/patches/timecode-npm-0.0.4-82bde9e6fe.patch"
75+
},
76+
"dependencies": {
77+
"react-router-bootstrap": "^0.25.0"
7478
}
7579
}

‎packages/webui/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<head>
33
<title>Sofie</title>
44
<meta charset="utf-8" />
5-
<link rel="stylesheet" href="/origo-ui/dist/origo.css" />
5+
<!-- <link rel="stylesheet" href="/origo-ui/dist/origo.css" /> -->
66
<link rel="stylesheet" href="/src/client/styles/main.scss" />
77

88
<meta name="apple-mobile-web-app-title" content="Sofie" />

‎packages/webui/package.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
"@sofie-automation/sorensen": "^1.5.8",
4949
"@testing-library/user-event": "^14.6.1",
5050
"@types/sinon": "^10.0.20",
51+
"bootstrap": "^5.3.3",
5152
"classnames": "^2.5.1",
5253
"cubic-spline": "^3.0.3",
5354
"deep-extend": "0.6.0",
@@ -62,6 +63,7 @@
6263
"query-string": "^6.14.1",
6364
"rc-tooltip": "^6.4.0",
6465
"react": "^18.3.1",
66+
"react-bootstrap": "^2.10.9",
6567
"react-circular-progressbar": "^2.1.0",
6668
"react-datepicker": "^3.8.0",
6769
"react-dnd": "^14.0.5",
@@ -90,6 +92,7 @@
9092
"@testing-library/dom": "^10.4.0",
9193
"@testing-library/jest-dom": "^6.6.3",
9294
"@testing-library/react": "^16.2.0",
95+
"@types/bootstrap": "^5",
9396
"@types/classnames": "^2.3.4",
9497
"@types/deep-extend": "^0.6.2",
9598
"@types/react": "^18.3.18",

‎packages/webui/src/client/lib/viewPort.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ let HEADER_HEIGHT: number | undefined = undefined
103103

104104
export function getHeaderHeight(): number {
105105
if (HEADER_HEIGHT === undefined) {
106-
const root = document.querySelector('#render-target > .container-fluid > .rundown-view > .header')
106+
const root = document.querySelector('#render-target > .container-fluid-custom > .rundown-view > .header')
107107
if (!root) {
108108
return FALLBACK_HEADER_HEIGHT
109109
}

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

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.header {
1+
.navbar {
22
.links {
33
> a {
44
color: #fff;
@@ -9,14 +9,21 @@
99
}
1010
}
1111

12-
.badge {
12+
.badge-sofie {
1313
color: #fff;
1414
text-decoration: none;
15+
display: flex;
16+
flex-direction: row;
17+
1518
&:link,
1619
&:visited,
1720
&:active {
1821
color: #fff;
1922
}
23+
&:hover {
24+
text-decoration: underline;
25+
}
26+
2027
.sofie-logo {
2128
background: url('/images/sofie-logo.svg') center center no-repeat;
2229
background-size: contain;

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
$fullscreen-controls__button--radius: 3.125rem;
32

43
$statusbar-width: 3.6rem;

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
// Override any bootstrap css variable default values here
2+
3+
$font-family-sans-serif: 'Roboto', Helvetica Neue, Arial, sans-serif;
4+
5+
$body-tertiary-bg-dark: #343434;
6+
7+
$font-weight-base: 300; // lighter
8+
9+
$navbar-brand-font-size: 1rem;

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
// Option A: Include all of Bootstrap
2+
3+
// Include any default variable overrides here (though functions won't be available)
4+
5+
@import 'bootstrap-customise';
6+
7+
@import '~bootstrap/scss/bootstrap';
8+
9+
// Then add additional custom code here

0 commit comments

Comments
 (0)