Merge branch 'master' into master

peterlevel1 · Mar 31, 2017 · fcb3b33 · fcb3b33
2 parents d1eb5e3 + fad0314
commit fcb3b33
Show file tree

Hide file tree

Showing 13 changed files with 3,418 additions and 1 deletion.
diff --git a/AUTHORS.txt b/AUTHORS.txt
@@ -1,2 +1,2 @@
-Peter
+Peter <[email protected]>
 coco  <[email protected]>
diff --git a/assets/logo-20-20.png b/assets/logo-20-20.png
diff --git a/assets/snsd.jpeg b/assets/snsd.jpeg
diff --git a/package.json b/package.json
@@ -21,6 +21,7 @@
     "postcss-loader": "^1.3.3",
     "precss": "^1.4.0",
     "style-loader": "^0.16.1",
+    "url-loader": "^0.5.8",
     "webpack": "^2.3.2"
   }
 }
diff --git a/packs/css-loader/configs/webpack.config.js b/packs/css-loader/configs/webpack.config.js
@@ -0,0 +1,19 @@
+var path = require("path")
+var webpack = require("webpack")
+
+module.exports = {
+  entry: __dirname + "/src/index.js",
+  output: {
+    path: __dirname + "/dist",
+    filename: "[name].bundle.js"
+  },
+  module: {
+    rules: [
+      {
+        test: /\.css$/,
+        use: [ 'style-loader', 'css-loader' ]
+      }
+    ]
+  },
+  plugins: []
+}