Merge pull request #3 from sellerlabs/kfbow/new-home-page

LoginPage
sellerlabs · Jan 11, 2017 · 0edc542 · 0edc542
2 parents e532aff + 56620f1
commit 0edc542
Show file tree

Hide file tree

Showing 12 changed files with 767 additions and 22 deletions.
diff --git a/.gitignore b/.gitignore
@@ -38,3 +38,7 @@ lib
 
 # CSV generated from language files by scripts/lang2csv
 lang.csv
+
+# Other
+*.DS_Store
+.DS_Store
diff --git a/config/webpack.config.prod.js b/config/webpack.config.prod.js
@@ -25,6 +25,10 @@ module.exports = {
                 loader: "eslint-loader",
                 exclude: /node_modules/,
             },
+            {
+                test: /\.(ico|jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2)(\?.*)?$/,
+                loader: "url-loader?limit=100000"
+            },
         ],
     },
     plugins: [

diff --git a/index.js b/index.js
diff --git a/index.js.map b/index.js.map
diff --git a/package.json b/package.json
@@ -24,7 +24,9 @@
     "bowser": "^1.5.0",
     "color": "^0.11.4",
     "immutable": "^3.8.1",
+    "material-ui": "^0.16.6",
     "react": "^15.4.0",
+    "react-cellblock": "^2.0.0",
     "react-dom": "^15.4.0",
     "react-redux": "^4.4.5",
     "redux": "^3.6.0"

diff --git a/src/components/LoginPage/images/menu-logo-fbg.svg b/src/components/LoginPage/images/menu-logo-fbg.svg