Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Start migrating to latest bootstrap 5.2

Roland Geider5c8e2fb55ac2
diff --git a/package.json b/package.json
index b5372748a..8759133ce 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,7 @@
"homepage": "https://github.com/wger-project/wger",
"dependencies": {
"Sortable": "RubaXa/Sortable#1.15.0",
- "bootstrap": "4.6.2",
+ "bootstrap": "5.2.2",
"components-font-awesome": "5.9.0",
"d3": "^7.6.1",
"datatables": "^1.10.18",
diff --git a/wger/core/static/scss/main.scss b/wger/core/static/scss/main.scss
index dbf56b8f0..98c6fdae8 100644
--- a/wger/core/static/scss/main.scss
+++ b/wger/core/static/scss/main.scss
@@ -42,6 +42,6 @@ $enable-responsive-font-sizes: true;
/*
* Import the rest of the bootstrap files
*/
-@import "../yarn/bootstrap/scss/_functions";
-@import "../yarn/bootstrap/scss/_variables";
+@import "../yarn/bootstrap/scss/functions";
+@import "../yarn/bootstrap/scss/variables";
@import "../yarn/bootstrap/scss/bootstrap";
diff --git a/wger/core/templates/template.html b/wger/core/templates/template.html
index 1126dfde6..399e98e34 100644
--- a/wger/core/templates/template.html
+++ b/wger/core/templates/template.html
@@ -25,7 +25,6 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
- <meta name="author" content="Roland Geider">
<!-- OpenGraph -->
{% block opengraph %}
diff --git a/wger/core/templates/template_features.html b/wger/core/templates/template_features.html
index ba5b0d8af..082c8303a 100644
--- a/wger/core/templates/template_features.html
+++ b/wger/core/templates/template_features.html
@@ -22,7 +22,6 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta charset="utf-8">
- <meta name="author" content="Roland Geider">
<meta name="viewport" content="width=device-width, initial-scale=1">
diff --git a/wger/core/templates/template_no_context.html b/wger/core/templates/template_no_context.html
index 0875499e8..46d38a330 100644
--- a/wger/core/templates/template_no_context.html
+++ b/wger/core/templates/template_no_context.html
@@ -22,7 +22,6 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
- <meta name="author" content="Roland Geider">
<link rel="stylesheet" type="text/css" href="{% static 'css/workout-manager.css' %}">
<link rel="stylesheet" type="text/css" href="{% static 'yarn/bootstrap-compiled.css' %}">
diff --git a/yarn.lock b/yarn.lock
index 37bfc037c..77a78bc2e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -16,10 +16,10 @@ Sortable@RubaXa/Sortable#1.15.0:
version "1.15.0"
resolved "https://codeload.github.com/RubaXa/Sortable/tar.gz/babf6ab85fdfc5e13be1027827cecfbba2fb0d1e"
- version "4.6.2"
- resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.6.2.tgz#8e0cd61611728a5bf65a3a2b8d6ff6c77d5d7479"
- integrity sha512-51Bbp/Uxr9aTuy6ca/8FbFloBUJZLHwnhTcnjIeRn2suQWsWzcuJhGjKDB5eppVte/8oCdOL3VuwxvZDUggwGQ==
+ version "5.2.2"
+ resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.2.2.tgz#834e053eed584a65e244d8aa112a6959f56e27a0"
+ integrity sha512-dEtzMTV71n6Fhmbg4fYJzQsw1N29hJKO1js5ackCgIpDcGid2ETMGC6zwSYw09v05Y+oRdQ9loC54zB1La3hHQ==
commander@2:
version "2.20.3"