From 16f2922ea5e67ee668631fba438a7436e2922f1f Mon Sep 17 00:00:00 2001 From: Jake Howard Date: Mon, 18 Jan 2016 22:47:00 +0000 Subject: [PATCH] Add bootstrap material design --- package.json | 1 + scripts/build-js.sh | 2 ++ static/src/js/events.js | 1 + static/src/less/style.less | 1 + 4 files changed, 5 insertions(+) diff --git a/package.json b/package.json index 256291e..5cf71cb 100644 --- a/package.json +++ b/package.json @@ -22,6 +22,7 @@ "dependencies": { "animate.css": "=3.4.0", "bootstrap": "=3.3.5", + "bootstrap-material-design": "=0.5.7", "ionicons": "=2.0.1", "jquery": "=2.1.4", "react": "=0.13.3", diff --git a/scripts/build-js.sh b/scripts/build-js.sh index debc3b1..f67aeea 100755 --- a/scripts/build-js.sh +++ b/scripts/build-js.sh @@ -14,11 +14,13 @@ then echo ">> Compressing Libraries..." uglifyjs node_modules/markdown/lib/markdown.js --compress --screw-ie8 --define --stats --keep-fnames -o static/build/js/lib/markdown.js uglifyjs node_modules/bootstrap/dist/js/bootstrap.js --compress --screw-ie8 --define --stats --keep-fnames -o static/build/js/lib/bootstrap.js + uglifyjs node_modules/bootstrap-material-design/dist/js/material.min.js --compress --screw-ie8 --define --stats --keep-fnames -o static/build/js/lib/bootstrap-material.js uglifyjs static/build/js/lib/* --compress --screw-ie8 --define --stats --keep-fnames -o static/build/js/libs.js else echo ">> Building Libraries..." cp node_modules/markdown/lib/markdown.js static/build/js/lib/markdown.js cp node_modules/bootstrap/dist/js/bootstrap.js static/build/js/lib/bootstrap.js + cp node_modules/bootstrap-material-design/dist/js/material.min.js static/build/js/lib/bootstrap-material.js uglifyjs static/build/js/lib/* --screw-ie8 --stats --keep-fnames -o static/build/js/libs.js fi diff --git a/static/src/js/events.js b/static/src/js/events.js index bf45c32..e01b354 100644 --- a/static/src/js/events.js +++ b/static/src/js/events.js @@ -3,6 +3,7 @@ var is_navbar_attached = false; $(window).load(function() { $(window).trigger('scroll'); + $.material.init() }); function detach_navbar() { diff --git a/static/src/less/style.less b/static/src/less/style.less index bd9fcb4..fe5bc43 100644 --- a/static/src/less/style.less +++ b/static/src/less/style.less @@ -2,6 +2,7 @@ @import "node_modules/bootstrap/less/bootstrap"; @import "node_modules/bootstrap/less/theme"; @import "node_modules/ionicons/less/ionicons"; +@import "node_modules/bootstrap-material-design/less/bootstrap-material-design"; @import url(https://fonts.googleapis.com/css?family=Roboto:400,300,400italic,700); @import (inline) "node_modules/animate.css/animate.css"; @import 'homepage';