diff --git a/README.md b/README.md
index 099fd845..8f631ae4 100644
--- a/README.md
+++ b/README.md
@@ -58,11 +58,13 @@
* With [rbenv](https://github.com/rbenv/rbenv) (**recommended!**): `rbenv install`
* With [RVM](https://rvm.io): `rvm install "ruby-$(cat .ruby-version)"`
* [Manually](https://www.ruby-lang.org/en/downloads/)
+1. Install node.js and npm
1. Install [Bundler](https://bundler.io/) v2.2.5:
* `gem install bundler:2.2.5`
1. Install the required dependencies:
* `bundle install`
+ * `npm install`
1. Build the website (the output can be found in the `_site` directory):
- * `bundle exec jekyll build`
+ * `npm run build`
1. Serve the website locally with live reloading:
- * `bundle exec jekyll serve --incremental --livereload`
+ * `npm run serve`
diff --git a/_config.yml b/_config.yml
index 452b7cc3..6f02bcb3 100644
--- a/_config.yml
+++ b/_config.yml
@@ -22,7 +22,7 @@ description: >- # this means to ignore newlines until "baseurl:"
baseurl: "" # the subpath of your site, e.g. /blog
url: "https://www.privacyguides.org" # the base hostname & protocol for your site, e.g. http://example.com
sass:
- sass_dir: ./_sass
+ sass_dir: _sass
excerpt_separator:
collections_dir: collections
collections:
diff --git a/_includes/head.html b/_includes/head.html
index 0abb8de9..07af91d8 100644
--- a/_includes/head.html
+++ b/_includes/head.html
@@ -35,6 +35,6 @@
-
+
diff --git a/_layouts/default.html b/_layouts/default.html
index b41a365e..28b47ca3 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -8,8 +8,8 @@
{{ content }}
-
-
+
+
diff --git a/_sass/bootstrap b/_sass/bootstrap
deleted file mode 120000
index 4d9c69e9..00000000
--- a/_sass/bootstrap
+++ /dev/null
@@ -1 +0,0 @@
-../node_modules/bootstrap/scss
\ No newline at end of file
diff --git a/assets/css/app.scss b/assets/css/app.scss
index 45112758..084118f4 100644
--- a/assets/css/app.scss
+++ b/assets/css/app.scss
@@ -17,7 +17,7 @@ h1, h2, h3:not(.h5), h4 {
}
// import /_sass/bootstrap.scss
-@import "bootstrap/bootstrap";
+@import "./node_modules/bootstrap/scss/bootstrap";
@import "ptio-font";
@import "flag-icon";
diff --git a/assets/css/dark.scss b/assets/css/dark.scss
index eebb9b02..89ced2eb 100644
--- a/assets/css/dark.scss
+++ b/assets/css/dark.scss
@@ -46,7 +46,7 @@ $dropdown-link-hover-bg: lighten( $dropdown-bg, 10% );
}
// import /_sass/bootstrap.scss
-@import "bootstrap/bootstrap";
+@import "./node_modules/bootstrap/scss/bootstrap";
@import "ptio-font";
@import "flag-icon";
diff --git a/assets/fonts/fontawesome b/assets/fonts/fontawesome
deleted file mode 120000
index bfd03a73..00000000
--- a/assets/fonts/fontawesome
+++ /dev/null
@@ -1 +0,0 @@
-../../node_modules/@fortawesome/fontawesome-pro
\ No newline at end of file
diff --git a/assets/js/bootstrap.bundle.js b/assets/js/bootstrap.bundle.js
deleted file mode 120000
index 0d13873f..00000000
--- a/assets/js/bootstrap.bundle.js
+++ /dev/null
@@ -1 +0,0 @@
-../../node_modules/bootstrap/dist/js/bootstrap.bundle.js
\ No newline at end of file
diff --git a/assets/js/bootstrap.bundle.js.map b/assets/js/bootstrap.bundle.js.map
deleted file mode 120000
index af023012..00000000
--- a/assets/js/bootstrap.bundle.js.map
+++ /dev/null
@@ -1 +0,0 @@
-../../node_modules/bootstrap/dist/js/bootstrap.bundle.js.map
\ No newline at end of file
diff --git a/assets/js/bootstrap.min.js b/assets/js/bootstrap.min.js
deleted file mode 120000
index e734ff95..00000000
--- a/assets/js/bootstrap.min.js
+++ /dev/null
@@ -1 +0,0 @@
-../../node_modules/bootstrap/dist/js/bootstrap.min.js
\ No newline at end of file
diff --git a/assets/js/bootstrap.min.js.map b/assets/js/bootstrap.min.js.map
deleted file mode 120000
index 6b00217d..00000000
--- a/assets/js/bootstrap.min.js.map
+++ /dev/null
@@ -1 +0,0 @@
-../../node_modules/bootstrap/dist/js/bootstrap.min.js.map
\ No newline at end of file
diff --git a/assets/js/jquery.min.js b/assets/js/jquery.min.js
deleted file mode 120000
index 08ac9f2f..00000000
--- a/assets/js/jquery.min.js
+++ /dev/null
@@ -1 +0,0 @@
-../../node_modules/jquery/dist/jquery.min.js
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index 68671454..5242e59b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5,6 +5,7 @@
"requires": true,
"packages": {
"": {
+ "name": "privacyguides",
"version": "1.0.0",
"license": "ISC",
"dependencies": {
diff --git a/package.json b/package.json
index ae660840..a0c751a8 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,11 @@
"description": "",
"main": "index.js",
"scripts": {
- "test": "echo \"Error: no test specified\" && exit 1"
+ "assets:copy:js": "cp node_modules/bootstrap/dist/js/bootstrap.bundle.min.js assets/js/vendor/ && cp node_modules/jquery/dist/jquery.min.js assets/js/vendor/",
+ "assets:copy:icons": "mkdir -p assets/fonts/vendor/fontawesome && cp -R \"node_modules/@fortawesome/fontawesome-pro/\" assets/fonts/vendor/fontawesome",
+ "assets:install": "npm run assets:copy:js && npm run assets:copy:icons",
+ "build": "npm run assets:install && bundle exec jekyll build",
+ "serve": "npm run assets:install && bundle exec jekyll serve --incremental --livereload"
},
"repository": {
"type": "git",