From b0d92a4177b768bc7fc51e16ff8f06c799f8b502 Mon Sep 17 00:00:00 2001 From: Steven Walker Date: Wed, 30 Mar 2016 10:59:09 -0400 Subject: [PATCH 1/9] adding gulp to dev dependencies --- front/package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/front/package.json b/front/package.json index 3e72cba..4665c02 100644 --- a/front/package.json +++ b/front/package.json @@ -23,6 +23,7 @@ }, "devDependencies": { "concurrently": "^2.0.0", + "gulp": "^3.9.1", "lite-server": "^2.1.0", "typescript": "^1.8.7", "typings": "^0.7.5" -- GitLab From ea4f61d9eea2acad17887e52f2efedc2116d2a37 Mon Sep 17 00:00:00 2001 From: Steven Walker Date: Wed, 30 Mar 2016 11:00:33 -0400 Subject: [PATCH 2/9] creating gulpfile.js file --- front/gulpfile.js | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 front/gulpfile.js diff --git a/front/gulpfile.js b/front/gulpfile.js new file mode 100644 index 0000000..ca32ecf --- /dev/null +++ b/front/gulpfile.js @@ -0,0 +1,6 @@ + +var gulp = require('gulp'); + +gulp.task('default', function() { + // place code for your default task here +}); -- GitLab From e3a70e0393f90c14ce3ae2010c7575009c4cf2ca Mon Sep 17 00:00:00 2001 From: Steven Walker Date: Wed, 30 Mar 2016 11:29:46 -0400 Subject: [PATCH 3/9] install sass via gulp and compiling base css --- front/current/styles/main.css | 3 +++ front/current/styles/main.scss | 4 ++++ front/gulpfile.js | 17 ++++++++++++++--- front/package.json | 1 + 4 files changed, 22 insertions(+), 3 deletions(-) create mode 100644 front/current/styles/main.css create mode 100644 front/current/styles/main.scss diff --git a/front/current/styles/main.css b/front/current/styles/main.css new file mode 100644 index 0000000..d30da15 --- /dev/null +++ b/front/current/styles/main.css @@ -0,0 +1,3 @@ +body { + background: #ccc; + color: #fff; } diff --git a/front/current/styles/main.scss b/front/current/styles/main.scss new file mode 100644 index 0000000..ea12732 --- /dev/null +++ b/front/current/styles/main.scss @@ -0,0 +1,4 @@ +body { + background: #ccc; + color: #fff; +} \ No newline at end of file diff --git a/front/gulpfile.js b/front/gulpfile.js index ca32ecf..727baf5 100644 --- a/front/gulpfile.js +++ b/front/gulpfile.js @@ -1,6 +1,17 @@ -var gulp = require('gulp'); +var gulp = require('gulp'), + sass = require('gulp-sass'); -gulp.task('default', function() { - // place code for your default task here + +// 'use strict'; + +gulp.task('styles', function () { + return gulp.src('./current/styles/**/*.scss') + .pipe(sass().on('error', sass.logError)) + .pipe(gulp.dest('./current/styles')); +}); + +//Watch task +gulp.task('default',function() { + gulp.watch('current/styles/**/*.scss',['styles']); }); diff --git a/front/package.json b/front/package.json index 4665c02..51cccaa 100644 --- a/front/package.json +++ b/front/package.json @@ -24,6 +24,7 @@ "devDependencies": { "concurrently": "^2.0.0", "gulp": "^3.9.1", + "gulp-sass": "^2.2.0", "lite-server": "^2.1.0", "typescript": "^1.8.7", "typings": "^0.7.5" -- GitLab From 6bafda9e930799ba098b630821c764adab40919c Mon Sep 17 00:00:00 2001 From: Steven Walker Date: Wed, 30 Mar 2016 11:45:47 -0400 Subject: [PATCH 4/9] removing bootstrap --- front/index.html | 2 +- front/package.json | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/front/index.html b/front/index.html index 67c2eb5..dd35aba 100644 --- a/front/index.html +++ b/front/index.html @@ -4,7 +4,7 @@ Project Dashboard - + diff --git a/front/package.json b/front/package.json index 51cccaa..1b9678e 100644 --- a/front/package.json +++ b/front/package.json @@ -2,7 +2,7 @@ "name": "projectdashboard", "version": "1.0.0", "scripts": { - "start": "concurrently \"npm run tsc:w\" \"npm run lite\" ", + "start": "concurrently \"npm run tsc:w\" \"npm run lite\" gulp ", "tsc": "tsc", "tsc:w": "tsc -w", "lite": "lite-server", @@ -12,7 +12,6 @@ "license": "ISC", "dependencies": { "angular2": "2.0.0-beta.9", - "bootstrap": "^3.3.6", "config-json": "^1.0.0", "es6-promise": "^3.0.2", "es6-shim": "^0.33.3", -- GitLab From cefd3d1c45d6068212a54029e5293a323462d320 Mon Sep 17 00:00:00 2001 From: Steven Walker Date: Wed, 30 Mar 2016 14:02:26 -0400 Subject: [PATCH 5/9] adding tachyons and establishing styles structuring --- front/current/styles/app.css | 8 ++++++++ front/current/styles/app.scss | 3 +++ front/current/styles/main.css | 3 --- front/current/styles/main.scss | 4 ---- front/gulpfile.js | 4 +++- front/package.json | 1 + 6 files changed, 15 insertions(+), 8 deletions(-) create mode 100644 front/current/styles/app.css create mode 100644 front/current/styles/app.scss delete mode 100644 front/current/styles/main.css delete mode 100644 front/current/styles/main.scss diff --git a/front/current/styles/app.css b/front/current/styles/app.css new file mode 100644 index 0000000..0dcc5da --- /dev/null +++ b/front/current/styles/app.css @@ -0,0 +1,8 @@ +/* + + BASE + +*/ +html, +body { + height: 100%; } diff --git a/front/current/styles/app.scss b/front/current/styles/app.scss new file mode 100644 index 0000000..406a2bc --- /dev/null +++ b/front/current/styles/app.scss @@ -0,0 +1,3 @@ +@import 'tachyons-sass/scss/base'; + + diff --git a/front/current/styles/main.css b/front/current/styles/main.css deleted file mode 100644 index d30da15..0000000 --- a/front/current/styles/main.css +++ /dev/null @@ -1,3 +0,0 @@ -body { - background: #ccc; - color: #fff; } diff --git a/front/current/styles/main.scss b/front/current/styles/main.scss deleted file mode 100644 index ea12732..0000000 --- a/front/current/styles/main.scss +++ /dev/null @@ -1,4 +0,0 @@ -body { - background: #ccc; - color: #fff; -} \ No newline at end of file diff --git a/front/gulpfile.js b/front/gulpfile.js index 727baf5..649c9ea 100644 --- a/front/gulpfile.js +++ b/front/gulpfile.js @@ -7,7 +7,9 @@ var gulp = require('gulp'), gulp.task('styles', function () { return gulp.src('./current/styles/**/*.scss') - .pipe(sass().on('error', sass.logError)) + .pipe(sass({ + includePaths: ['node_modules'] + }).on('error', sass.logError)) .pipe(gulp.dest('./current/styles')); }); diff --git a/front/package.json b/front/package.json index 1b9678e..e3b4644 100644 --- a/front/package.json +++ b/front/package.json @@ -18,6 +18,7 @@ "reflect-metadata": "0.1.2", "rxjs": "5.0.0-beta.2", "systemjs": "0.19.24", + "tachyons-sass": "^4.0.0-beta.12", "zone.js": "0.5.15" }, "devDependencies": { -- GitLab From 4e1243440b79e53169296fa9dda81172d04ac3b6 Mon Sep 17 00:00:00 2001 From: Steven Walker Date: Wed, 30 Mar 2016 14:36:10 -0400 Subject: [PATCH 6/9] Setting up general structure of sass --- front/current/styles/app.scss | 1 + front/current/styles/variables/variables.scss | 2 ++ front/gulpfile.js | 13 +++++++++++-- front/package.json | 1 + 4 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 front/current/styles/variables/variables.scss diff --git a/front/current/styles/app.scss b/front/current/styles/app.scss index 406a2bc..74f7125 100644 --- a/front/current/styles/app.scss +++ b/front/current/styles/app.scss @@ -1,3 +1,4 @@ @import 'tachyons-sass/scss/base'; +@import 'variables/variables'; diff --git a/front/current/styles/variables/variables.scss b/front/current/styles/variables/variables.scss new file mode 100644 index 0000000..139597f --- /dev/null +++ b/front/current/styles/variables/variables.scss @@ -0,0 +1,2 @@ + + diff --git a/front/gulpfile.js b/front/gulpfile.js index 649c9ea..ff7c3ed 100644 --- a/front/gulpfile.js +++ b/front/gulpfile.js @@ -1,17 +1,26 @@ var gulp = require('gulp'), - sass = require('gulp-sass'); + sass = require('gulp-sass'), + cleanCSS = require('gulp-clean-css'); // 'use strict'; gulp.task('styles', function () { - return gulp.src('./current/styles/**/*.scss') + return gulp.src('./current/styles/app.scss') .pipe(sass({ includePaths: ['node_modules'] }).on('error', sass.logError)) .pipe(gulp.dest('./current/styles')); }); + +// Minify CSS + +gulp.task('minify-css', function() { + return gulp.src('./current/styles/*.css') + .pipe(cleanCSS({compatibility: 'ie8'})) + .pipe(gulp.dest('dist')); +}); //Watch task gulp.task('default',function() { diff --git a/front/package.json b/front/package.json index e3b4644..ef74776 100644 --- a/front/package.json +++ b/front/package.json @@ -24,6 +24,7 @@ "devDependencies": { "concurrently": "^2.0.0", "gulp": "^3.9.1", + "gulp-clean-css": "^2.0.4", "gulp-sass": "^2.2.0", "lite-server": "^2.1.0", "typescript": "^1.8.7", -- GitLab From a9afaec72f5ae232b82311c6a34c77bd89d4ef09 Mon Sep 17 00:00:00 2001 From: Steven Walker Date: Wed, 30 Mar 2016 14:40:38 -0400 Subject: [PATCH 7/9] changing link to css to match new naming --- front/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/front/index.html b/front/index.html index dd35aba..72e3b47 100644 --- a/front/index.html +++ b/front/index.html @@ -4,7 +4,7 @@ Project Dashboard - + -- GitLab From b5bea0e208e3cade3669ea004290b2a9694e4270 Mon Sep 17 00:00:00 2001 From: Steven Walker Date: Wed, 30 Mar 2016 17:13:47 -0400 Subject: [PATCH 8/9] generating styles.css file in /current instead of in /current/styles --- front/current/{styles/app.css => styles.css} | 0 front/current/styles/{app.scss => styles.scss} | 3 ++- 2 files changed, 2 insertions(+), 1 deletion(-) rename front/current/{styles/app.css => styles.css} (100%) rename front/current/styles/{app.scss => styles.scss} (52%) diff --git a/front/current/styles/app.css b/front/current/styles.css similarity index 100% rename from front/current/styles/app.css rename to front/current/styles.css diff --git a/front/current/styles/app.scss b/front/current/styles/styles.scss similarity index 52% rename from front/current/styles/app.scss rename to front/current/styles/styles.scss index 74f7125..9ecb8bf 100644 --- a/front/current/styles/app.scss +++ b/front/current/styles/styles.scss @@ -1,4 +1,5 @@ @import 'tachyons-sass/scss/base'; -@import 'variables/variables'; +@import 'variables/variables'; + -- GitLab From 90a7fe11041494457ab6444dcb3147ebc8a1d5be Mon Sep 17 00:00:00 2001 From: Steven Walker Date: Wed, 30 Mar 2016 17:17:50 -0400 Subject: [PATCH 9/9] generating styles.css file in /current instead of in /current/styles --- front/gulpfile.js | 4 ++-- front/index.html | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/front/gulpfile.js b/front/gulpfile.js index ff7c3ed..e8406ab 100644 --- a/front/gulpfile.js +++ b/front/gulpfile.js @@ -7,11 +7,11 @@ var gulp = require('gulp'), // 'use strict'; gulp.task('styles', function () { - return gulp.src('./current/styles/app.scss') + return gulp.src('./current/styles/styles.scss') .pipe(sass({ includePaths: ['node_modules'] }).on('error', sass.logError)) - .pipe(gulp.dest('./current/styles')); + .pipe(gulp.dest('./current/')); }); // Minify CSS diff --git a/front/index.html b/front/index.html index 72e3b47..dc3f8ec 100644 --- a/front/index.html +++ b/front/index.html @@ -3,8 +3,7 @@ Project Dashboard - - + -- GitLab