From 9d84ede2f9cc801adefa0b176359c14d9aca47f1 Mon Sep 17 00:00:00 2001 From: JC Brand Date: Sun, 6 Jul 2014 15:56:44 +0200 Subject: [PATCH] Two website deps (jquery-easing & bootstrap) now managed by bower --- bower.json | 4 +++- index.html | 5 +---- js/init.js | 19 ------------------- js/jquery.min.js | 4 ---- js/skel.min.js | 2 -- main.js | 29 ++++++++++++++++++++++++++++- src/deps-full.js | 2 ++ 7 files changed, 34 insertions(+), 31 deletions(-) delete mode 100644 js/init.js delete mode 100644 js/jquery.min.js delete mode 100644 js/skel.min.js diff --git a/bower.json b/bower.json index d646d6f38..13cb01a22 100644 --- a/bower.json +++ b/bower.json @@ -27,7 +27,9 @@ "requirejs-text": "~2.0.12", "requirejs-tpl-jcbrand": "*", "momentjs": "~2.6.0", - "jquery.browser": "~0.0.6" + "jquery.browser": "~0.0.6", + "jquery-easing-original": "~1.3.1", + "bootstrap": "~3.2.0" }, "exportsOverride": {} } diff --git a/index.html b/index.html index a79d1ee7d..eb8f8f624 100644 --- a/index.html +++ b/index.html @@ -16,10 +16,6 @@ - - - - @@ -223,6 +219,7 @@ document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E")); +