Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Start playing with SASS for overwriting bootstrap's files

Roland Geider957c336abec7
diff --git a/package.json b/package.json
index 20efcef1b..10a8d53cd 100644
--- a/package.json
+++ b/package.json
@@ -16,9 +16,9 @@
},
"homepage": "https://github.com/wger-project/wger",
"dependencies": {
- "yarn": "^1.22.4",
"Sortable": "RubaXa/Sortable#1.4.x",
"bootstrap": "twbs/bootstrap#4.x",
+ "bootstrap-scss": "4.5.0",
"components-font-awesome": "components/font-awesome#5.13.x",
"d3": "mbostock-bower/d3-bower#>=4",
"datatables": "DataTables/DataTables#1.10.x",
@@ -26,7 +26,8 @@
"jquery": "jquery/jquery-dist#2.x",
"metrics-graphics": "mozilla/metrics-graphics#2.15.x",
"shariff": "heiseonline/shariff#1.24.1",
- "tinymce": "tinymce/tinymce-dist#4.5.x"
+ "tinymce": "tinymce/tinymce-dist#4.5.x",
+ "yarn": "^1.22.4"
},
"engines": {
"yarn": ">= 1.0.0"
diff --git a/wger/core/templates/template.html b/wger/core/templates/template.html
index 0a74fa560..f00495b52 100644
--- a/wger/core/templates/template.html
+++ b/wger/core/templates/template.html
@@ -49,7 +49,7 @@
{% compress css %}
<link rel="stylesheet" type="text/css" href="{% static 'css/workout-manager.css' %}">
<link rel="stylesheet" type="text/css" href="{% static 'css/workout-manager-common.css' %}">
- <link rel="stylesheet" type="text/css" href="{% static 'yarn/bootstrap/dist/css/bootstrap.min.css' %}">
+ <link rel="stylesheet" type="text/css" href="{% static 'yarn/bootstrap-scss/bootstrap.css' %}">
<link rel="stylesheet" type="text/css" href="{% static 'yarn/components-font-awesome/css/all.css' %}">
<link rel="stylesheet" type="text/css" href="{% static 'css/bootstrap-custom.css' %}">
<link rel="stylesheet" type="text/css" href="{% static 'yarn/shariff/build/shariff.min.css' %}">
diff --git a/yarn.lock b/yarn.lock
index 1ee1ebcce..a4908b102 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6,9 +6,15 @@ Sortable@RubaXa/Sortable#1.4.x:
version "1.4.2"
resolved "https://codeload.github.com/RubaXa/Sortable/tar.gz/51337f72792525e438680695e223b327b1648e0a"
-bootstrap@twbs/bootstrap#4.x:
version "4.5.0"
- resolved "https://codeload.github.com/twbs/bootstrap/tar.gz/7a6da5e3e7ad7c749dde806546a35d4d4259d965"
+ resolved "https://registry.yarnpkg.com/bootstrap-scss/-/bootstrap-scss-4.5.0.tgz#c1e48d4050dec7885cc9acfc61d3df7827a134ca"
+ integrity sha512-6vCW3JBfOW7v9EQwyV0kWdEyvk2hf7U8TIojRgz19/nJoJGe8BQa1L/Tk7B0wmKEqHR/lA93Lhp+dLRphZt3vg==
+
+bootstrap@bootstrap-scss#4.x:
+ version "4.5.2"
+ resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.5.2.tgz#a85c4eda59155f0d71186b6e6ad9b875813779ab"
+ integrity sha512-vlGn0bcySYl/iV+BGA544JkkZP5LB3jsmkeKLFQakCOwCM3AOk7VkldBz4jrzSe+Z0Ezn99NVXa1o45cQY4R6A==
commander@2:
version "2.20.3"