From c0667fc14b9082b0fa6401b1a4e838f06fb471e4 Mon Sep 17 00:00:00 2001
From: Matthias Kretschmann <m@kretschmann.io>
Date: Fri, 29 May 2015 01:14:12 +0200
Subject: [PATCH] switch most dependencies to npm

---
 Gruntfile.js                        | 10 +++++-----
 _src/assets/styl/kremalicious3.styl |  4 ++--
 bower.json                          |  8 +-------
 package.json                        |  9 ++++++++-
 4 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index b47d7105..44a15ccc 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -104,16 +104,16 @@ module.exports = function(grunt){
             production: {
                 files: {
                     '<%= config.site %>/<%= config.assets.js %>/picturefill.min.js': [
-                        'bower_components/picturefill/dist/picturefill.js'
+                        'node_modules/picturefill/dist/picturefill.js'
                     ],
                     '<%= config.site %>/<%= config.assets.js %>/CustomElements.min.js': [
                         'bower_components/webcomponentsjs/CustomElements.js'
                     ],
                     '<%= config.site %>/<%= config.assets.js %>/kremalicious3.min.js': [
-                        'bower_components/jquery/dist/jquery.js',
+                        'node_modules/jquery/dist/jquery.js',
                         'bower_components/jquery-infinite-scroll/jquery.infinitescroll.js',
-                        'bower_components/masonry/dist/masonry.pkgd.js',
-                        'bower_components/imagesloaded/imagesloaded.js',
+                        'node_modules/masonry-layout/dist/masonry.pkgd.js',
+                        'node_modules/imagesloaded/imagesloaded.js',
                         'bower_components/simple-jekyll-search/dest/jekyll-search.js',
                         'bower_components/jquery.adaptive-background/index.js',
                         'bower_components/time-elements/time-elements.js',
@@ -342,4 +342,4 @@ module.exports = function(grunt){
         'rsync:deploy'
     ]);
 
-};
\ No newline at end of file
+};
diff --git a/_src/assets/styl/kremalicious3.styl b/_src/assets/styl/kremalicious3.styl
index c6e66c76..e5c80a61 100644
--- a/_src/assets/styl/kremalicious3.styl
+++ b/_src/assets/styl/kremalicious3.styl
@@ -6,8 +6,8 @@
 
 
 // Normalize all the things
-@import '../../../bower_components/normalize-css/normalize.css'
-@import '../../../bower_components/normalize-opentype.css/normalize-opentype.css'
+@import '../../../node_modules/normalize-css/normalize.css'
+@import '../../../node_modules/normalize-opentype.css/normalize-opentype.css'
 
 // Nib Nib
 @import 'nib'
diff --git a/bower.json b/bower.json
index 197f03d9..b9cd85c5 100644
--- a/bower.json
+++ b/bower.json
@@ -8,14 +8,8 @@
   "description": "Blog of Matthias Kretschmann",
   "license": "MIT",
   "dependencies": {
-    "normalize-css": ">=3.0.1",
-    "normalize-opentype.css": ">=0.1.2",
-    "jquery": ">=2.0.3",
-    "picturefill": ">=1.2.1",
-    "masonry": ">=3.1.5",
-    "imagesloaded": ">=3.1.0",
     "jquery-infinite-scroll": ">=2.0.2",
-    "simple-jekyll-search": ">=1.0.2",
+    "simple-jekyll-search": ">=2.0.0",
     "jquery.adaptive-background": "https://raw.github.com/briangonzalez/jquery.adaptive-backgrounds.js/master/src/jquery.adaptive-backgrounds.js",
     "time-elements": ">=0.4.0",
     "webcomponentsjs": ">=0.6.1"
diff --git a/package.json b/package.json
index e6ab2676..c456d517 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,14 @@
   "scripts": {
     "postinstall": "bower install && bundle install"
   },
-  "dependencies": {},
+  "dependencies": {
+    "imagesloaded": ">=3.1.8",
+    "jquery": ">=2.1.4",
+    "masonry-layout": ">=3.3.0",
+    "normalize-css": ">=2.3.1",
+    "normalize-opentype.css": ">=0.2.4",
+    "picturefill": ">=2.3.1"
+  },
   "devDependencies": {
     "grunt": ">=0.4.5",
     "grunt-combine-media-queries": ">=1.0.8",