From fc2d75ddc33e89a4e888490bfd266875dd78bf09 Mon Sep 17 00:00:00 2001
From: jgallego <jgallego>
Date: Thu, 6 Oct 2016 09:20:57 +0200
Subject: [PATCH] css con webpack

---
 @salix/vendor/src/materialdesignlite-vendor.js |  4 ++++
 @salix/vendor/src/vendor.js                    |  3 ++-
 index.html                                     |  7 +------
 package.json                                   | 13 ++++++++-----
 webpack.config.js                              |  3 +++
 5 files changed, 18 insertions(+), 12 deletions(-)
 create mode 100644 @salix/vendor/src/materialdesignlite-vendor.js
diff --git a/@salix/vendor/src/materialdesignlite-vendor.js b/@salix/vendor/src/materialdesignlite-vendor.js
new file mode 100644
index 000000000..7765281a9
--- /dev/null
+++ b/@salix/vendor/src/materialdesignlite-vendor.js
@@ -0,0 +1,4 @@
+import * as _materialdesignlite from 'material-design-lite';
+import * as css from 'material-design-lite/material.min.css';
+
+export const materialdesignlite = _materialdesignlite;
\ No newline at end of file
diff --git a/@salix/vendor/src/vendor.js b/@salix/vendor/src/vendor.js
index 343a9365a..5d9cded94 100644
--- a/@salix/vendor/src/vendor.js
+++ b/@salix/vendor/src/vendor.js
@@ -1,3 +1,4 @@
 export * from './angular-vendor';
 export * from './oclazyload-vendor';
-export * from './uirouter-vendor';
\ No newline at end of file
+export * from './uirouter-vendor';
+export * from './materialdesignlite-vendor';
\ No newline at end of file
diff --git a/index.html b/index.html
index 5f37df36e..eb9f5620e 100644
--- a/index.html
+++ b/index.html
@@ -1,11 +1,7 @@
 <!doctype html>
 <html>
-
 <head>
     <title>Salix</title>
-    <link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons">
-    <link rel="stylesheet" href="https://code.getmdl.io/1.2.1/material.indigo-pink.min.css">
-    
 </head>
 <body>
     <div id="app">
@@ -19,9 +15,8 @@
             <vn-check text="texto del text" ></vn-check><br> 
             <vn-radio text="texto del radio"></vn-radio><br> 
             <vn-textfield text="prueba" type="email"></vn-textfield><br> 
-            <vn-txt text="hola mundo"></vn-txt>
+            <vn-label text="hola mundo"></vn-label>
         </div>
     <script type="text/javascript" src="build/salix.app.js" selector="#app"></script>
-    <script defer src="https://code.getmdl.io/1.2.1/material.min.js"></script>
 </body>
 </html>
diff --git a/package.json b/package.json
index 987bb7e69..563bd1b2e 100644
--- a/package.json
+++ b/package.json
@@ -11,17 +11,20 @@
   "dependencies": {
     "angular": "^1.5.8",
     "angular-ui-router": "^1.0.0-beta.3",
+    "material-design-lite": "^1.2.1",
     "oclazyload": "^0.6.3"
   },
   "devDependencies": {
-    "webpack": "*",
-    "webpack-dev-server": "*",
     "babel-core": "*",
-    "babel-preset-es2015": "*",
     "babel-loader": "*",
-    "raw-loader": "*"
+    "babel-preset-es2015": "*",
+    "css-loader": "^0.25.0",
+    "raw-loader": "*",
+    "style-loader": "^0.13.1",
+    "webpack": "*",
+    "webpack-dev-server": "*"
   },
   "scripts": {
-    "dev": "webpack --progress --colors --watch"
+    "build": "webpack --progress --colors --watch"
   }
 }
diff --git a/webpack.config.js b/webpack.config.js
index a14c565e9..a23e95e37 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -25,6 +25,9 @@ module.exports =
 			}, {
 				test: /\.html$/,
 				loader: 'raw'
+			}, {
+				test: /\.css$/,
+				loader: 'style!css'
 			}
 		]
 	},
