diff --git a/.gitignore b/.gitignore index 3ba0e99..dbc97e3 100644 --- a/.gitignore +++ b/.gitignore @@ -162,7 +162,3 @@ jspm_packages # .nfs files are created when an open file is removed but is still being accessed .nfs* - - -### Custom ### -static/src/scss/pygment.css diff --git a/package.json b/package.json index c7454b7..18b97f9 100644 --- a/package.json +++ b/package.json @@ -19,6 +19,7 @@ "bootstrap-sass": "=3.3.7", "font-awesome": "=4.6.3", "jquery": "=3.0.0", + "pygments-css": "=1.0.0", "underscore": "=1.8.3", "wow.js": "=1.2.0" }, diff --git a/requirements.txt b/requirements.txt index dac566c..e3b4292 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,7 +7,6 @@ django-bootstrap-form==3.2.1 flake8==3.2.1 honcho==0.7.1 psycopg2==2.6.2 -pygments-style-github==0.4 safety==0.5.1 wagtail>=1.8,<1.9 wagtail-metadata==0.3.0 diff --git a/scripts/build-scss.sh b/scripts/build-scss.sh index e6c6e9b..30e2183 100755 --- a/scripts/build-scss.sh +++ b/scripts/build-scss.sh @@ -7,9 +7,6 @@ then echo ">>> WARNING: Building in Production Mode!" fi -echo ">> Generating Pygments styles..." -env/bin/pygmentize -S github -f html -a .highlight > static/src/scss/pygment.css - echo ">> Building SCSS..." node-sass static/src/scss/index.scss static/build/css/index.css --source-map-embed diff --git a/static/src/scss/index.scss b/static/src/scss/index.scss index d033795..d9a9024 100644 --- a/static/src/scss/index.scss +++ b/static/src/scss/index.scss @@ -10,6 +10,7 @@ /* @group Libraries */ @import "node_modules/bootstrap-sass/assets/stylesheets/_bootstrap"; @import "node_modules/animate.css/animate"; +@import "node_modules/pygments-css/github.css"; $fa-font-path: "../fonts"; @import "node_modules/font-awesome/scss/font-awesome"; @@ -18,7 +19,6 @@ $fa-font-path: "../fonts"; /* @group Other Imports */ @import "creative/creative"; -@import "pygment"; @import "homepage"; @import "footer"; @import "library-overrides";