Skip to content

Commit b64155a

Browse files
authored
Merge pull request #1413 from bbc/upstream/react-bootstrap
feat: replace origo with react-bootstrap
2 parents ee1ee34 + d7ca0ed commit b64155a

File tree

171 files changed

+4150
-8664
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

171 files changed

+4150
-8664
lines changed

packages/webui/index.html

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

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

packages/webui/package.json

Lines changed: 5 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",
@@ -73,6 +75,7 @@
7375
"react-intersection-observer": "^9.15.1",
7476
"react-moment": "^0.9.7",
7577
"react-popper": "^2.3.0",
78+
"react-router-bootstrap": "^0.25.0",
7679
"react-router-dom": "^5.3.4",
7780
"react-timer-hoc": "^2.3.0",
7881
"semver": "^7.6.3",
@@ -90,13 +93,15 @@
9093
"@testing-library/dom": "^10.4.0",
9194
"@testing-library/jest-dom": "^6.6.3",
9295
"@testing-library/react": "^16.2.0",
96+
"@types/bootstrap": "^5",
9397
"@types/classnames": "^2.3.4",
9498
"@types/deep-extend": "^0.6.2",
9599
"@types/react": "^18.3.18",
96100
"@types/react-circular-progressbar": "^1.1.0",
97101
"@types/react-datepicker": "^3.1.8",
98102
"@types/react-dom": "^18.3.5",
99103
"@types/react-router": "^5.1.20",
104+
"@types/react-router-bootstrap": "^0",
100105
"@types/react-router-dom": "^5.3.3",
101106
"@types/sha.js": "^2.4.4",
102107
"@types/xml2js": "^0.4.14",

0 commit comments

Comments
 (0)