Skip to content

629 upgrade bootstrap 5 #630

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ian-noaa wants to merge 6 commits into from
Closed

629 upgrade bootstrap 5 #630

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a4e25fe
Initial attempt at migrating from bootstrap 4 to 5
ian-noaa Aug 31, 2021
3afbb2d
Update MATScommon to point to the bootstrap branch
ian-noaa Sep 1, 2021
d7942a5
Merge branch 'development' into 629-upgrade-bootstrap-5
mollybsmith-noaa Sep 30, 2021
6f5bab5
Merge from development
mollybsmith-noaa Sep 30, 2021
76a02fa
Some improvement in moving to bootstrap 5.
mollybsmith-noaa Sep 30, 2021
e780613
Moved daterangepicker import
mollybsmith-noaa Sep 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion MATScommon
Open in desktop
Submodule MATScommon updated 2 files
+8 −0 meteor_packages/mats-common/client/main.js
+9 −5 meteor_packages/mats-common/package.js
2 changes: 1 addition & 1 deletion METexpress
Open in desktop
Submodule METexpress updated 1 files
+1 −1 MATScommon
1 change: 0 additions & 1 deletion apps/aircraft/.meteor/packages
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ mobile-experience@1.1.0 # Packages for a great mobile UX
mongo@1.12.0 # The database Meteor supports right now
blaze-html-templates # Compile .html files into Meteor Blaze views
reactive-var@1.0.11 # Reactive variable for tracker
jquery@1.11.10 # Helpful client-side library
tracker@1.2.0 # Meteor's client-side reactive programming library
standard-minifier-js@2.6.1 # JS minifier run for production mode
es5-shim@4.8.0 # ECMAScript 5 compatibility for older browsers.
Expand Down
1 change: 0 additions & 1 deletion apps/aircraft/.meteor/versions
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ caching-compiler@1.2.2
caching-html-compiler@1.2.0
callback-hook@1.3.1
check@1.3.1
dangrossman:bootstrap-daterangepicker@2.1.13
ddp@1.4.0
ddp-client@2.5.0
ddp-common@1.4.0
Expand Down
109 changes: 59 additions & 50 deletions apps/aircraft/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 4 additions & 7 deletions apps/aircraft/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,16 @@
"start": "meteor run"
},
"dependencies": {
"@babel/runtime": "^7.14.6",
"bootstrap": "^4.5.2",
"chai": "^4.2.0",
"@babel/runtime": "^7.15.3",
"chai": "^4.3.4",
"downsample-lttb": "git+https://github.com/pingec/downsample-lttb.git",
"fibers": "^5.0.0",
"fs-extra": "^7.0.0",
"html2canvas": "^1.0.0-rc.7",
"jquery": "^2.2.4",
"html2canvas": "^1.3.2",
"jspdf": "^1.4.1",
"modules": "^0.4.0",
"object-hash": "^1.3.0",
"object-sizeof": "^1.2.0",
"popper.js": "^1.16.1",
"object-sizeof": "^1.6.1",
"xmlbuilder": "^10.1.1"
}
}