Skip to content

Commit 5c8e2fb

Browse files
committed
Start migrating to latest bootstrap 5.2
1 parent b7b832d commit 5c8e2fb

File tree

6 files changed

+7
-10
lines changed

6 files changed

+7
-10
lines changed

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"homepage": "https://github.com/wger-project/wger",
1818
"dependencies": {
1919
"Sortable": "RubaXa/Sortable#1.15.0",
20-
"bootstrap": "4.6.2",
20+
"bootstrap": "5.2.2",
2121
"components-font-awesome": "5.9.0",
2222
"d3": "^7.6.1",
2323
"datatables": "^1.10.18",

wger/core/static/scss/main.scss

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,6 @@ $enable-responsive-font-sizes: true;
4242
/*
4343
* Import the rest of the bootstrap files
4444
*/
45-
@import "../yarn/bootstrap/scss/_functions";
46-
@import "../yarn/bootstrap/scss/_variables";
45+
@import "../yarn/bootstrap/scss/functions";
46+
@import "../yarn/bootstrap/scss/variables";
4747
@import "../yarn/bootstrap/scss/bootstrap";

wger/core/templates/template.html

-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
2626
<meta charset="utf-8">
2727
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
28-
<meta name="author" content="Roland Geider">
2928

3029
<!-- OpenGraph -->
3130
{% block opengraph %}

wger/core/templates/template_features.html

-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
<head>
2323
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
2424
<meta charset="utf-8">
25-
<meta name="author" content="Roland Geider">
2625
<meta name="viewport" content="width=device-width, initial-scale=1">
2726

2827

wger/core/templates/template_no_context.html

-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
2323
<meta charset="utf-8">
2424
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
25-
<meta name="author" content="Roland Geider">
2625

2726
<link rel="stylesheet" type="text/css" href="{% static 'css/workout-manager.css' %}">
2827
<link rel="stylesheet" type="text/css" href="{% static 'yarn/bootstrap-compiled.css' %}">

yarn.lock

+4-4
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ Sortable@RubaXa/Sortable#1.15.0:
1616
version "1.15.0"
1717
resolved "https://codeload.github.com/RubaXa/Sortable/tar.gz/babf6ab85fdfc5e13be1027827cecfbba2fb0d1e"
1818

19-
bootstrap@4.6.2:
20-
version "4.6.2"
21-
resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.6.2.tgz#8e0cd61611728a5bf65a3a2b8d6ff6c77d5d7479"
22-
integrity sha512-51Bbp/Uxr9aTuy6ca/8FbFloBUJZLHwnhTcnjIeRn2suQWsWzcuJhGjKDB5eppVte/8oCdOL3VuwxvZDUggwGQ==
19+
bootstrap@5.2.2:
20+
version "5.2.2"
21+
resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.2.2.tgz#834e053eed584a65e244d8aa112a6959f56e27a0"
22+
integrity sha512-dEtzMTV71n6Fhmbg4fYJzQsw1N29hJKO1js5ackCgIpDcGid2ETMGC6zwSYw09v05Y+oRdQ9loC54zB1La3hHQ==
2323

2424
commander@2:
2525
version "2.20.3"

0 commit comments

Comments
 (0)