better scss from angular original

kasselTrankos · Feb 3, 2016 · 7e67e59 · 7e67e59
1 parent 939ba18
commit 7e67e59
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 19 deletions.
diff --git a/bower.json b/bower.json
@@ -18,7 +18,6 @@
   "dependencies": {
     "angular": "~1.4.9",
     "angular-material": "~1.0.4",
-    "angular-material-sass-files": "~0.8.3",
     "angular-ui-router": "~0.2.17",
     "font-awesome": "~4.5.0"
   }

diff --git a/develop.js b/develop.js
@@ -8,7 +8,6 @@ config.entry.app.unshift(
   'webpack-dev-server/client?http://localhost:3000',
   'webpack/hot/dev-server'
 );
-console.log(path.resolve(__dirname, 'public'), ' === ',config.output.publicPath);
 config.plugins.push(new webpack.HotModuleReplacementPlugin());
 var compiler = webpack(config);
 var server = new webpackDevServer(compiler, {

diff --git a/proxy.js b/proxy.js
@@ -28,7 +28,7 @@ app.get('/*', function(req, res) {
 
 //# -----your-webpack-dev-server------------------
 config.entry.app.unshift(
-  'webpack-dev-server/client?http://localhost:3000',
+  'webpack-dev-server/client?http://' + host + ':' + port,
   'webpack/hot/dev-server'
 );
 config.plugins.push(new webpack.HotModuleReplacementPlugin());

diff --git a/src/app/twitter/template/form.template.html b/src/app/twitter/template/form.template.html
@@ -5,5 +5,6 @@
       <input ng-model="vm.account">
     </md-input-container>
     <md-button class="md-raised md-primary">Guardar</md-button>
+    <md-button class="md-raised">Button</md-button>
   </form>
 </div>
diff --git a/src/index.html b/src/index.html
@@ -4,14 +4,14 @@
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
     <title>Angular ES 6</title>
     <meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no, width=device-width">
-
+    <script src="http://localhost:% PORT %/webpack-dev-server.js"></script>
   </head>
   <body>
     <div id="wrapper" ng-strict-di ng-app="ats.main" ng-controller="AppController as vm" layout="column">
       <md-toolbar layout-align="center center">
         {{vm.title}}<i class="fa fa-camera-retro"></i>
       </md-toolbar>
-
+      cldxx
       <div ui-view></div>
 
     </div>

diff --git a/src/style/main.scss b/src/style/main.scss
@@ -1,19 +1,12 @@
-@import "style";
-@import "variables";
-@import "components/list";
-@import "components/input";
-@import "components/layout";
-@import "components/toolbar";
-@import "components/button";
-@import "components/typography";
+@import "angular-material.scss";
 /*@import "scss/variables.scss";
 $fa-font-path: "";
 
 @import "scss/path.scss";*/
 html, body {
   height: 100%;
   color: rgba(0, 0, 0, 0.87);
-  background: #669955;
+  background: #f0f0f0;
   position: relative;
   font-family: proxima-nova, "Helvetica Neue", Helvetica, Arial, sans-serif;
 }

diff --git a/webpack.config.js b/webpack.config.js
@@ -3,6 +3,8 @@ var webpack = require('webpack'),
   path = require('path'),
   fs = require('fs');
 
+var PORT = process.env.PORT || 3000;
+
 module.exports = {
   devtool:"source-map",
   entry: {
@@ -42,7 +44,7 @@ module.exports = {
   },
   sassLoader: {
     includePaths: [
-      path.resolve(__dirname, 'bower_components', 'angular-material-sass-files'),
+      path.resolve(__dirname, 'bower_components', 'angular-material'),
       path.resolve(__dirname, 'bower_components', 'font-awesome')
     ]
   },
@@ -54,19 +56,22 @@ module.exports = {
     ),
     function ReplaceBundleSrc() {
       //update html file
+/*
       this.plugin("done", function (stats) {
-        /*
+
         var opts = stats.compilation.options;
 
         var indexHtmlPath = path.join(opts.output.path, "index.html");
         var originalHtmlPath = opts.entry.app[0];
-        var bundleJs = opts.output.filename.replace(/\[hash]/, stats.compilation.hash);
+
+
         fs.writeFileSync(
           indexHtmlPath,
-          fs.readFileSync(originalHtmlPath, "utf8").replace(/% BUNDLE %/, bundleJs)
+          fs.readFileSync(originalHtmlPath, "utf8").replace(/% PORT %/, PORT)
         );
-        */
+
       });
+      */
     }
   ]
 };