Skip to content

Commit 559ed86

Browse files
committed
Update bootstrap to 5
1 parent cf7d62f commit 559ed86

File tree

10 files changed

+1188
-1127
lines changed

10 files changed

+1188
-1127
lines changed

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ gem "activerecord-postgres_enum"
3131
# Use AWS gem for s3 uploads
3232
gem "aws-sdk-s3", "~> 1.143.0"
3333

34-
gem "bootstrap", "4.6.2"
34+
gem "bootstrap", "5.3.3"
3535

3636
gem "brotli", "~> 0.5.0"
3737

Gemfile.lock

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -148,10 +148,9 @@ GEM
148148
bindex (0.8.1)
149149
binding_of_caller (1.0.1)
150150
debug_inspector (>= 1.2.0)
151-
bootstrap (4.6.2)
151+
bootstrap (5.3.3)
152152
autoprefixer-rails (>= 9.1.0)
153-
popper_js (>= 1.16.1, < 2)
154-
sassc-rails (>= 2.0.0)
153+
popper_js (>= 2.11.8, < 3)
155154
brakeman (6.1.2)
156155
racc
157156
brotli (0.5.0)
@@ -421,7 +420,7 @@ GEM
421420
racc
422421
pg (1.5.7)
423422
pkg-config (1.5.6)
424-
popper_js (1.16.1)
423+
popper_js (2.11.8)
425424
premailer (1.23.0)
426425
addressable
427426
css_parser (>= 1.12.0)
@@ -753,7 +752,7 @@ DEPENDENCIES
753752
base58
754753
better_errors
755754
binding_of_caller
756-
bootstrap (= 4.6.2)
755+
bootstrap (= 5.3.3)
757756
brakeman
758757
brotli (~> 0.5.0)
759758
bundler-audit

app/assets/stylesheets/_bootstrap-custom.scss

Lines changed: 1 addition & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -5,38 +5,4 @@
55
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
66
*/
77

8-
@import "bootstrap/functions";
9-
@import "bootstrap/variables";
10-
@import "bootstrap/mixins";
11-
@import "bootstrap/root";
12-
@import "bootstrap/reboot";
13-
@import "bootstrap/type";
14-
@import "bootstrap/images";
15-
// @import "bootstrap/code";
16-
@import "bootstrap/grid";
17-
@import "bootstrap/tables";
18-
@import "bootstrap/forms";
19-
@import "bootstrap/buttons";
20-
// @import "bootstrap/transitions";
21-
// @import "bootstrap/dropdown";
22-
// @import "bootstrap/button-group";
23-
// @import "bootstrap/input-group";
24-
// @import "bootstrap/custom-forms";
25-
@import "bootstrap/nav";
26-
@import "bootstrap/navbar";
27-
@import "bootstrap/card";
28-
// @import "bootstrap/breadcrumb";
29-
// @import "bootstrap/pagination";
30-
@import "bootstrap/badge";
31-
// @import "bootstrap/jumbotron";
32-
@import "bootstrap/alert";
33-
@import "bootstrap/progress";
34-
// @import "bootstrap/media";
35-
// @import "bootstrap/list-group";
36-
// @import "bootstrap/close";
37-
// @import "bootstrap/modal";
38-
// @import "bootstrap/tooltip";
39-
// @import "bootstrap/popover";
40-
// @import "bootstrap/carousel";
41-
@import "bootstrap/utilities";
42-
// @import "bootstrap/print";
8+
@import "bootstrap";

app/assets/stylesheets/admin/main.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
// Vendor
99
@import "font-awesome";
1010
@import "bootstrap-custom";
11+
@import "../hover";
1112

1213
// Application
1314
@import "application-config";

app/assets/stylesheets/application.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
// Vendor
77
@import "bootstrap-custom";
88

9+
@import "hover";
10+
911
// Application
1012
@import "application-config";
1113
@import "components/**/*";

app/assets/stylesheets/hover.scss

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
// Hover mixin and `$enable-hover-media-query` are deprecated.
2+
//
3+
// Originally added during our alphas and maintained during betas, this mixin was
4+
// designed to prevent `:hover` stickiness on iOS-an issue where hover styles
5+
// would persist after initial touch.
6+
//
7+
// For backward compatibility, we've kept these mixins and updated them to
8+
// always return their regular pseudo-classes instead of a shimmed media query.
9+
//
10+
// Issue: https://github.com/twbs/bootstrap/issues/25195
11+
12+
@mixin hover() {
13+
&:hover { @content; }
14+
}
15+
16+
@mixin hover-focus() {
17+
&:hover,
18+
&:focus {
19+
@content;
20+
}
21+
}
22+
23+
@mixin plain-hover-focus() {
24+
&,
25+
&:hover,
26+
&:focus {
27+
@content;
28+
}
29+
}
30+
31+
@mixin hover-focus-active() {
32+
&:hover,
33+
&:focus,
34+
&:active {
35+
@content;
36+
}
37+
}

nextjs/package-lock.json

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

nextjs/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"@fontsource/inter": "5.0.17",
2424
"@fontsource/dm-mono": "5.0.19",
2525
"@github/webauthn-json": "^2.1.1",
26-
"axios": "^1.6.8",
26+
"axios": "1.7.4",
2727
"clsx": "^2.0.0",
2828
"moment": "^2.29.4",
2929
"next": "^14.1.1",

package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
"@rails/ujs": "^7.0.6",
6666
"@solana/spl-token": "^0.3.8",
6767
"@solana/web3.js": "^1.91.4",
68-
"axios": "1.7.3",
68+
"axios": "1.7.4",
6969
"babel-loader": "9.1.3",
7070
"brave-ui": "git+https://github.com/brave/brave-ui#11019732ef5fc09a75bae371c3f3ffece651d97c",
7171
"bs58": "5.0.0",
@@ -140,7 +140,6 @@
140140
"typescript": "^5.4.5"
141141
},
142142
"resolutions": {
143-
"**/@babel/traverse": "7.24.1",
144143
"node-fetch": "3.3.2",
145144
"nth-check": "2.1.1",
146145
"postcss": "8.4.33",

0 commit comments

Comments
 (0)