added bootstrap webjar

2014-03-03 11:33:44 +01:00
parent 840bc2ef7a
commit 464ac36ddb
8 changed files with 27 additions and 29 deletions
--- a/src/main/webapp/WEB-INF/wro.xml
+++ b/src/main/webapp/WEB-INF/wro.xml
@@ -10,8 +10,8 @@
 		<js>/vendor/jqueryui/*.js</js>
 		<css>/vendor/jqueryui/*.css</css>

-		<js>/vendor/bootstrap/*.js</js>
-		<css>/vendor/bootstrap/*.css</css>
+		<js>webjar:bootstrap.min.js</js>
+		<css>webjar:bootstrap.min.css</css>

 		<css>/vendor/fontawesome/css/*.css</css>

--- a/src/main/webapp/vendor/bootstrap/bootstrap-3.0.2.min.js
+++ b/src/main/webapp/vendor/bootstrap/bootstrap-3.0.2.min.js
--- a/src/main/webapp/vendor/bootstrap/bootstrap-theme.min.css
+++ b/src/main/webapp/vendor/bootstrap/bootstrap-theme.min.css
--- a/src/main/webapp/vendor/bootstrap/bootstrap.min.css
+++ b/src/main/webapp/vendor/bootstrap/bootstrap.min.css