From 0a319269c27b200739b4a99751a4824cef7c1135 Mon Sep 17 00:00:00 2001 From: Sebastien L Date: Fri, 6 Oct 2023 14:05:49 -0400 Subject: [PATCH] resolve bootswatch contrast issue [skip actions] This will solve https://github.com/sle118/squeezelite-esp32/issues/319 --- .gitmodules | 3 +++ components/wifi-manager/webapp/package.json | 5 +++-- components/wifi-manager/webapp/src/bootswatch | 1 + 3 files changed, 7 insertions(+), 2 deletions(-) create mode 160000 components/wifi-manager/webapp/src/bootswatch diff --git a/.gitmodules b/.gitmodules index 6c6f3eb9..b5d2358c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -8,3 +8,6 @@ [submodule "components/wifi-manager/UML-State-Machine-in-C"] path = components/wifi-manager/UML-State-Machine-in-C url = https://github.com/kiishor/UML-State-Machine-in-C +[submodule "components/wifi-manager/webapp/src/bootswatch"] + path = components/wifi-manager/webapp/src/bootswatch + url = https://github.com/thomaspark/bootswatch.git diff --git a/components/wifi-manager/webapp/package.json b/components/wifi-manager/webapp/package.json index d1bbcdbc..1d5ac53e 100644 --- a/components/wifi-manager/webapp/package.json +++ b/components/wifi-manager/webapp/package.json @@ -22,7 +22,7 @@ "babel": "^6.23.0", "babel-loader": "^8.2.3", "babel-runtime": "^6.26.0", - "bootswatch": "^5.1.3", + "bootswatch": "file:src/bootswatch", "clean-webpack-plugin": "^4.0.0", "commander": "^8.3.0", "compression-webpack-plugin": "^9.2.0", @@ -68,7 +68,7 @@ "typescript": "^4.5.5", "webpack": "^5.67.0", "webpack-bundle-analyzer": "^4.8.0", - "webpack-cli": "^4.9.2", + "webpack-cli": "^5.1.4", "webpack-dev-server": "^4.7.3" }, "dependencies": { @@ -76,6 +76,7 @@ "async-mutex": "^0.3.2", "bootstrap": "^5.1.3", "jquery": "^3.6.0", + "npm": "^10.1.0", "popper.js": "^1.16.1", "webpack-visualizer-plugin": "^0.1.11", "webpack-visualizer-plugin2": "^1.0.0" diff --git a/components/wifi-manager/webapp/src/bootswatch b/components/wifi-manager/webapp/src/bootswatch new file mode 160000 index 00000000..3038872b --- /dev/null +++ b/components/wifi-manager/webapp/src/bootswatch @@ -0,0 +1 @@ +Subproject commit 3038872b8389763b64857bac00e102a71251a331