Added Sass preprocessor
diff --git a/applications/subscriberPortal/bs-config.js b/applications/subscriberPortal/bs-config.js
index efe3abb..c4fc07b 100644
--- a/applications/subscriberPortal/bs-config.js
+++ b/applications/subscriberPortal/bs-config.js
@@ -36,7 +36,9 @@
module.exports = {
"files": [
- './src/**/*'
+ './src/**/*.css',
+ './src/**/*.js',
+ './src/**/*.json'
],
"server": {
baseDir: './src',
diff --git a/applications/subscriberPortal/package.json b/applications/subscriberPortal/package.json
index 20c35e8..80a28e7 100644
--- a/applications/subscriberPortal/package.json
+++ b/applications/subscriberPortal/package.json
@@ -5,17 +5,19 @@
"main": "index.js",
"scripts": {
"test": "karma start",
- "prestart": "npm install && bower install && wiredep --dependencies --src src/index.html",
- "start": "browser-sync start --config bs-config.js"
+ "preserver": "npm install && bower install && wiredep --dependencies --src src/index.html",
+ "styles": "node-sass -w --include-path --source-map-embed -o ./src/style ./src/sass/*.scss",
+ "server": "browser-sync start --config bs-config.js",
+ "start": "parallelshell \"npm run server\" \"npm run styles\""
},
"author": "Matteo Scandolo",
"license": "ISC",
"devDependencies": {
"browser-sync": "^2.11.1",
"http-proxy": "^1.12.1",
+ "node-sass": "^3.4.2",
+ "parallelshell": "^2.0.0",
"wiredep": "^3.0.0"
},
- "dependencies": {
-
- }
+ "dependencies": {}
}
diff --git a/applications/subscriberPortal/src/index.html b/applications/subscriberPortal/src/index.html
index 0443f88..60e83d8 100644
--- a/applications/subscriberPortal/src/index.html
+++ b/applications/subscriberPortal/src/index.html
@@ -36,32 +36,26 @@
<script src='bower_components/bootstrap-css/js/bootstrap.min.js'></script>
<!-- endbower -->
+ <link rel="stylesheet" href="style/main.css">
+
<script src="cord.js"></script>
<script src="app/fw/services/rest.js"></script>
<script src="app/fw/services/helpers.js"></script>
- <link rel="stylesheet" href="app/view/common/common.css">
<script src="app/fw/mast/mast.js"></script>
- <link rel="stylesheet" href="app/fw/mast/mast.css">
<script src="app/fw/foot/foot.js"></script>
- <link rel="stylesheet" href="app/fw/foot/foot.css">
<script src="app/fw/nav/nav.js"></script>
- <link rel="stylesheet" href="app/fw/nav/nav.css">
<script src="app/fw/icon/icon.js"></script>
<script src="app/view/login/login.js"></script>
- <link rel="stylesheet" href="app/view/login/login.css">
<script src="app/view/home/home.js"></script>
- <link rel="stylesheet" href="app/view/home/home.css">
<script src="app/view/user/user.js"></script>
- <link rel="stylesheet" href="app/view/user/user.css">
<script src="app/view/bundle/bundle.js"></script>
- <link rel="stylesheet" href="app/view/bundle/bundle.css">
</head>
<body ng-app="cordGui">
diff --git a/applications/subscriberPortal/src/sass/main.scss b/applications/subscriberPortal/src/sass/main.scss
new file mode 100644
index 0000000..81e4080
--- /dev/null
+++ b/applications/subscriberPortal/src/sass/main.scss
@@ -0,0 +1,11 @@
+@import '../app/view/common/common.css';
+
+@import '../app/fw/mast/mast.css';
+@import '../app/fw/nav/nav.css';
+@import '../app/fw/foot/foot.css';
+
+@import '../app/view/login/login.css';
+@import '../app/view/home/home.css';
+@import '../app/view/user/user.css';
+@import '../app/view/bundle/bundle.css';
+
diff --git a/applications/subscriberPortal/src/style/main.css b/applications/subscriberPortal/src/style/main.css
new file mode 100644
index 0000000..c7fa790
--- /dev/null
+++ b/applications/subscriberPortal/src/style/main.css
@@ -0,0 +1,10 @@
+@import url(../app/view/common/common.css);
+@import url(../app/fw/mast/mast.css);
+@import url(../app/fw/nav/nav.css);
+@import url(../app/fw/foot/foot.css);
+@import url(../app/view/login/login.css);
+@import url(../app/view/home/home.css);
+@import url(../app/view/user/user.css);
+@import url(../app/view/bundle/bundle.css);
+
+/*# sourceMappingURL=data:application/json;base64,ewoJInZlcnNpb24iOiAzLAoJImZpbGUiOiAic3JjL3N0eWxlL21haW4uY3NzIiwKCSJzb3VyY2VzIjogWwoJCSJzcmMvc2Fzcy9tYWluLnNjc3MiCgldLAoJIm1hcHBpbmdzIjogIkFBQUEsT0FBTyxDQUFQLGtDQUFPO0FBRVAsT0FBTyxDQUFQLDRCQUFPO0FBQ1AsT0FBTyxDQUFQLDBCQUFPO0FBQ1AsT0FBTyxDQUFQLDRCQUFPO0FBRVAsT0FBTyxDQUFQLGdDQUFPO0FBQ1AsT0FBTyxDQUFQLDhCQUFPO0FBQ1AsT0FBTyxDQUFQLDhCQUFPO0FBQ1AsT0FBTyxDQUFQLGtDQUFPIiwKCSJuYW1lcyI6IFtdCn0= */
\ No newline at end of file