Skip to content

Commit d089ecf

Browse files
build(deps): bump bootstrap from 3.4.1 to 5.3.3 (#1409)
* build(deps): bump bootstrap from 3.4.1 to 5.3.3 Bumps [bootstrap](https://github.com/twbs/bootstrap) from 3.4.1 to 5.3.3. - [Release notes](https://github.com/twbs/bootstrap/releases) - [Commits](twbs/bootstrap@v3.4.1...v5.3.3) --- updated-dependencies: - dependency-name: bootstrap dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> * Some updates for bootstrap v5 --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: david-yz-liu <[email protected]>
1 parent ad69688 commit d089ecf

11 files changed

+36
-35
lines changed

.pnp.cjs

+18-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Binary file not shown.
Binary file not shown.

jest.config.js

+3-1
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,9 @@ const config = {
192192
},
193193

194194
// An array of regexp pattern strings that are matched against all source file paths, matched files will skip transformation
195-
transformIgnorePatterns: ["/node_modules/(?!(@?react-leaflet|node-fetch|data-uri-to-buffer|fetch-blob|formdata-polyfill).*)"],
195+
transformIgnorePatterns: [
196+
"/node_modules/(?!(@?react-leaflet|node-fetch|data-uri-to-buffer|fetch-blob|formdata-polyfill).*)",
197+
],
196198

197199
// An array of regexp pattern strings that are matched against all modules before the module loader will automatically return a mock for them
198200
// unmockedModulePathPatterns: undefined,

js/components/common/react_modal.js.jsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -916,7 +916,7 @@ class CampusMap extends React.Component {
916916
}
917917

918918
return (
919-
<div id="campus-map" className="col-md-8 col-xs-6">
919+
<div id="campus-map" className="col-md-8 col-6">
920920
<MapContainer
921921
center={center}
922922
zoom={16}

js/components/grid/calendar.js.jsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ export class Row extends React.Component {
3838
storeColSpans(springSession, springColSpans)
3939
// Generate a container for each of the Fall and Spring timetables individually
4040
return (
41-
<div className="col-md-9 col-xs-12" id="grid-body">
41+
<>
4242
<TimetableContainer
4343
session="F"
4444
lecturesByTime={fallSession}
@@ -51,7 +51,7 @@ export class Row extends React.Component {
5151
headColSpans={springColSpans}
5252
lectures={springLectures}
5353
/>
54-
</div>
54+
</>
5555
)
5656
}
5757
}
@@ -63,7 +63,7 @@ export class Row extends React.Component {
6363
class TimetableContainer extends React.Component {
6464
render() {
6565
return (
66-
<div className="col-md-6 col-xs-12 timetable-container">
66+
<div className="col-md-5 col-12 timetable-container">
6767
<Timetable
6868
session={this.props.session}
6969
lecturesByTime={this.props.lecturesByTime}

js/components/grid/course_panel.js.jsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ export class CoursePanel extends React.Component {
5151
))
5252

5353
return (
54-
<div id="search-layout" className="col-md-3 col-xs-6">
54+
<div id="search-layout" className="col-md-2 col-12">
5555
<div id="filter-container">
5656
<form onSubmit={() => false}>
5757
<input

js/components/grid/grid.js.jsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ class Grid extends React.Component {
178178
? this.state.selectedLectures.concat(this.state.hoveredLecture)
179179
: this.state.selectedLectures
180180
return (
181-
<div>
181+
<>
182182
<Disclaimer />
183183
<CoursePanel
184184
selectedCourses={this.state.selectedCourses}
@@ -192,7 +192,7 @@ class Grid extends React.Component {
192192
/>
193193
<Row lectureSections={updatedList} />
194194
<ExportModal context="grid" session="fall" ref={this.setExportRef} />
195-
</div>
195+
</>
196196
)
197197
}
198198
}

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"@babel/runtime": "^7.24.4",
2525
"ag-grid-community": "^32.1.0",
2626
"ag-grid-react": "^32.1.0",
27-
"bootstrap": "^3.1.1",
27+
"bootstrap": "^5.3.3",
2828
"core-js": "^3.30.1",
2929
"handlebars": "^4.7.8",
3030
"jquery": "^3.7.1",

style/app.scss

-16
Original file line numberDiff line numberDiff line change
@@ -1308,22 +1308,6 @@ path.missing {
13081308
border-top-style: none;
13091309
}
13101310

1311-
.col-md-2 {
1312-
width: 14%;
1313-
}
1314-
1315-
.col-md-8 {
1316-
width: 72%;
1317-
}
1318-
1319-
.col-md-pull-2 {
1320-
right: 14%;
1321-
}
1322-
1323-
.col-md-push-8 {
1324-
left: 72%;
1325-
}
1326-
13271311
#course-select-wrapper {
13281312
background-color: #7a6a96;
13291313
color: #fff;

yarn.lock

+7-5
Original file line numberDiff line numberDiff line change
@@ -3618,10 +3618,12 @@ __metadata:
36183618
languageName: node
36193619
linkType: hard
36203620

3621-
"bootstrap@npm:^3.1.1":
3622-
version: 3.4.1
3623-
resolution: "bootstrap@npm:3.4.1"
3624-
checksum: 5742035e8c541cd525780542771e7d56f63e5d4b2d902427bf182d3383e74a17c9074b6809f50d7f3de0585377e673339628b97cfdcde597ad69ecb1d2b562a6
3621+
"bootstrap@npm:^5.3.3":
3622+
version: 5.3.3
3623+
resolution: "bootstrap@npm:5.3.3"
3624+
peerDependencies:
3625+
"@popperjs/core": ^2.11.8
3626+
checksum: 537b68db30150075614310e9ebdf1be9b4affdf89ca226d59f4352e82a368b203af13ed0ce5ccfa4e06f141ecd233f7432ca3817e9c1a39863a05fbe13c73c4b
36253627
languageName: node
36263628
linkType: hard
36273629

@@ -4237,7 +4239,7 @@ __metadata:
42374239
ag-grid-react: ^32.1.0
42384240
babel-jest: ^29.5.0
42394241
babel-loader: ^9.1.2
4240-
bootstrap: ^3.1.1
4242+
bootstrap: ^5.3.3
42414243
core-js: ^3.30.1
42424244
css-loader: ^6.7.3
42434245
cypress: 13.7.3

0 commit comments

Comments
 (0)