Use bootstrap as submodule

UWCS · Nov 8, 2023 · f0d01e8 · f0d01e8
1 parent fabb9ab
commit f0d01e8
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,4 +1,3 @@
-[submodule "themes/uwcs"]
-	path = themes/uwcs
-	url = https://github.com/UWCS/new-site-theme
-	branch = master
+[submodule "sass/bootstrap"]
+	path = sass/bootstrap
+	url = https://github.com/twbs/bootstrap
diff --git a/build.sh b/build.sh
@@ -3,7 +3,7 @@ set -e
 
 export SCRIPT_DIR=$(dirname "$(realpath $0)")
 cd $SCRIPT_DIR && echo "Running in $SCRIPT_DIR"
-if [ -z $NO_PULL ]; then git pull --recurse-submodules; fi
+if [ -z $NO_PULL ]; then git pull --force --recurse-submodules; fi
 
 # Build main
 ./zola build --base-url https://warwickspeed.run --output-dir ../build --force

diff --git a/sass/bootstrap b/sass/bootstrap
diff --git a/sass/uwcs-bootstrap.scss b/sass/uwcs-bootstrap.scss
@@ -1,6 +1,6 @@
 @import "variables";
 
-@import "bootstrap/bootstrap";
+@import "bootstrap/scss/bootstrap";
 
 @import 'custom/_general';
 @import 'custom/_navbar';