[Android] Remote access: bump bootstrap version to 5.3.2
Nicolas Pomepuy
git at videolan.org
Thu Feb 22 13:29:25 UTC 2024
vlc-android | branch: master | Nicolas Pomepuy <nicolas at videolabs.io> | Thu Feb 8 12:53:35 2024 +0100| [a85911b9cdf6ea22e15ccf09c124994b4360576a] | committer: Nicolas Pomepuy
Remote access: bump bootstrap version to 5.3.2
> https://code.videolan.org/videolan/vlc-android/commit/a85911b9cdf6ea22e15ccf09c124994b4360576a
---
.../network-sharing-server/package-lock.json | 28 +++++++++++-----------
buildsystem/network-sharing-server/package.json | 2 +-
.../network-sharing-server/src/scss/app.scss | 11 ++++++---
3 files changed, 23 insertions(+), 18 deletions(-)
diff --git a/buildsystem/network-sharing-server/package-lock.json b/buildsystem/network-sharing-server/package-lock.json
index 5b7d2e9a77..f2fd376bea 100644
--- a/buildsystem/network-sharing-server/package-lock.json
+++ b/buildsystem/network-sharing-server/package-lock.json
@@ -12,7 +12,7 @@
"@vue/compat": "^3.2.47",
"@vueuse/core": "^10.0.0",
"axios": "^1.3.4",
- "bootstrap": "^5.2.3",
+ "bootstrap": "^5.3.2",
"core-js": "^3.8.3",
"js-sha256": "^0.10.1",
"pinia": "^2.0.33",
@@ -2039,9 +2039,9 @@
"dev": true
},
"node_modules/@popperjs/core": {
- "version": "2.11.7",
- "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.7.tgz",
- "integrity": "sha512-Cr4OjIkipTtcXKjAsm8agyleBuDHvxzeBoa1v543lbv1YaIwQjESsVcmjiWiPEbC1FIeHOG/Op9kdCmAmiS3Kw==",
+ "version": "2.11.8",
+ "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.8.tgz",
+ "integrity": "sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==",
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/popperjs"
@@ -3908,9 +3908,9 @@
"dev": true
},
"node_modules/bootstrap": {
- "version": "5.2.3",
- "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.2.3.tgz",
- "integrity": "sha512-cEKPM+fwb3cT8NzQZYEu4HilJ3anCrWqh3CHAok1p9jXqMPsPTBhU25fBckEJHJ/p+tTxTFTsFQGM+gaHpi3QQ==",
+ "version": "5.3.2",
+ "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.3.2.tgz",
+ "integrity": "sha512-D32nmNWiQHo94BKHLmOrdjlL05q1c8oxbtBphQFb9Z5to6eGRDCm0QgeaZ4zFBHzfg2++rqa2JkqCcxDy0sH0g==",
"funding": [
{
"type": "github",
@@ -3922,7 +3922,7 @@
}
],
"peerDependencies": {
- "@popperjs/core": "^2.11.6"
+ "@popperjs/core": "^2.11.8"
}
},
"node_modules/brace-expansion": {
@@ -13482,9 +13482,9 @@
"dev": true
},
"@popperjs/core": {
- "version": "2.11.7",
- "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.7.tgz",
- "integrity": "sha512-Cr4OjIkipTtcXKjAsm8agyleBuDHvxzeBoa1v543lbv1YaIwQjESsVcmjiWiPEbC1FIeHOG/Op9kdCmAmiS3Kw=="
+ "version": "2.11.8",
+ "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.8.tgz",
+ "integrity": "sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A=="
},
"@sideway/address": {
"version": "4.1.4",
@@ -14983,9 +14983,9 @@
"dev": true
},
"bootstrap": {
- "version": "5.2.3",
- "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.2.3.tgz",
- "integrity": "sha512-cEKPM+fwb3cT8NzQZYEu4HilJ3anCrWqh3CHAok1p9jXqMPsPTBhU25fBckEJHJ/p+tTxTFTsFQGM+gaHpi3QQ==",
+ "version": "5.3.2",
+ "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.3.2.tgz",
+ "integrity": "sha512-D32nmNWiQHo94BKHLmOrdjlL05q1c8oxbtBphQFb9Z5to6eGRDCm0QgeaZ4zFBHzfg2++rqa2JkqCcxDy0sH0g==",
"requires": {}
},
"brace-expansion": {
diff --git a/buildsystem/network-sharing-server/package.json b/buildsystem/network-sharing-server/package.json
index 9f74f3723a..57f4210bab 100644
--- a/buildsystem/network-sharing-server/package.json
+++ b/buildsystem/network-sharing-server/package.json
@@ -12,7 +12,7 @@
"@vue/compat": "^3.2.47",
"@vueuse/core": "^10.0.0",
"axios": "^1.3.4",
- "bootstrap": "^5.2.3",
+ "bootstrap": "^5.3.2",
"core-js": "^3.8.3",
"js-sha256": "^0.10.1",
"pinia": "^2.0.33",
diff --git a/buildsystem/network-sharing-server/src/scss/app.scss b/buildsystem/network-sharing-server/src/scss/app.scss
index d1b5ed2e75..04ef61b9dc 100644
--- a/buildsystem/network-sharing-server/src/scss/app.scss
+++ b/buildsystem/network-sharing-server/src/scss/app.scss
@@ -20,13 +20,18 @@ $card-spacer-y: 0.5rem;
$card-spacer-x: 0.5rem;
$card-bg: $lighter-grey;
+ at import "~bootstrap/scss/bootstrap.scss";
@import "~bootstrap/scss/_maps";
@import "~bootstrap/scss/utilities";
@import "~bootstrap/scss/mixins";
- at import "~bootstrap/scss/bootstrap.scss";
+
+ at import "~bootstrap/scss/root";
+ at import "~bootstrap/scss/reboot";
+
:root {
--bs-link-hover-color: #ff7700;
+ --bs-btn-hover-color: #ff610a;
}
@import "input-range";
@@ -72,8 +77,8 @@ main {
// Check out the MDC Web documentation for how to use MDC Typography Sass mixins:
// https://github.com/material-components/material-components-web/tree/master/packages/mdc-typography
body {
- background: $background;
- color: $text-color;
+ background: var(--bs-body-bg);
+ color: var(--bs-body-color);
height: 100vh;
height: calc(var(--vh, 1vh) * 100);
overflow: hidden;
More information about the Android
mailing list