diff --git a/fabfile.py b/fabfile.py index f793696..b468c7e 100644 --- a/fabfile.py +++ b/fabfile.py @@ -6,7 +6,6 @@ import fabric.operations as op env.hosts = ["wes@mgoal.ca:444"] - @task def installDeps(): local("npm install --save-dev rollup rollup-plugin-riot") @@ -46,8 +45,10 @@ def serveUp(): sudo("rm -fr /srv/http/build") sudo("rm -fr /srv/http/goal/scripts/") sudo("mkdir -p /srv/http/goal/scripts") + sudo("mkdir -p /srv/http/goal/styles") sudo("cp -r /home/wes/tbookbuild /srv/http/build") sudo("cp -r /home/wes/tbookbuild/scripts/*js /srv/http/goal/scripts/") + sudo("cp -r /home/wes/tbookbuild/styles/*css /srv/http/goal/styles/") sudo("cp /home/wes/tbookbuild/search.service /etc/systemd/system/search.service") sudo("systemctl daemon-reload") sudo("systemctl enable search.service") @@ -60,6 +61,7 @@ def serveUpLocal(): local("sudo mkdir -p /srv/http/goal/scripts") local("sudo cp -r /home/wes/TextbookEngine/build/ /srv/http/build") local("sudo cp -r /home/wes/TextbookEngine/build/scripts/*js /srv/http/goal/scripts/") + local("sudo cp -r /home/wes/TextbookEngine/build/styles/*css /srv/http/goal/styles/") local("sudo cp /home/wes/TextbookEngine/build/search.service /etc/systemd/system/search.service") local("sudo systemctl daemon-reload") local("sudo systemctl enable search.service") @@ -97,5 +99,5 @@ def buildLocal(): buildTags() uglify() sass() - #buildLocalVenv() + buildLocalVenv() serveUpLocal() diff --git a/package.json b/package.json index 732218f..dfcc8d6 100644 --- a/package.json +++ b/package.json @@ -7,10 +7,7 @@ "test": "echo \"Error: no test specified\" && exit 1", "build": "rollup src/scripts/search.js" }, - "repository": { - "type": "git", - "url": "git+https://github.com/nisstyre56/TextbookEngine.git" - }, + "repository": "git+https://github.com/nisstyre56/TextbookEngine.git", "author": "Wesley Kerfoot", "license": "AGPL-3.0", "bugs": { @@ -27,6 +24,7 @@ "whatwg-fetch": "^2.0.2" }, "dependencies": { + "spectre.css": "^0.2.9", "whatwg-fetch": "^2.0.2" } } diff --git a/src/scripts/book.tag b/src/scripts/book.tag index 019dd6d..d8143bb 100644 --- a/src/scripts/book.tag +++ b/src/scripts/book.tag @@ -1,24 +1,20 @@ -
+
+