Skip to content

Commit 5dee015

Browse files
author
Donovan Hutchinson
committed
Removing the need for Ruby sass
1 parent d5db7af commit 5dee015

File tree

4 files changed

+28
-65
lines changed

4 files changed

+28
-65
lines changed

gulpfile.js

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
var gulp = require('gulp'),
2-
sass = require('gulp-ruby-sass'),
2+
sass = require('gulp-sass'),
33
autoprefixer = require('gulp-autoprefixer'),
44
minifycss = require('gulp-minify-css'),
55
jshint = require('gulp-jshint'),
@@ -14,8 +14,10 @@ var gulp = require('gulp'),
1414
cssshrink = require('gulp-cssshrink'),
1515
cp = require('child_process');
1616

17+
1718
gulp.task('styles', function() {
18-
return sass(['src/sass/screen.scss'], { style: 'expanded' })
19+
gulp.src('./src/sass/**/*.scss')
20+
.pipe(sass().on('error', sass.logError))
1921
.pipe(autoprefixer('last 2 version', 'safari 5', 'ie 8', 'ie 9', 'opera 12.1', 'ios 6', 'android 4'))
2022
.pipe(gulp.dest('public/stylesheets'))
2123
.pipe(rename({suffix: '.min'}))
@@ -25,13 +27,6 @@ gulp.task('styles', function() {
2527
.pipe(browserSync.reload({stream:true}));
2628
});
2729

28-
/*
29-
gulp.task('sass', function() {
30-
return sass('path/to/scss', { style: 'expanded' })
31-
.pipe(gulp.dest('path/to/css'));
32-
});
33-
*/
34-
3530
gulp.task('scripts', function() {
3631
return gulp.src(['./src/javascripts/**/*.js'])
3732
//.pipe(jshint('.jshintrc'))
@@ -45,13 +40,6 @@ gulp.task('scripts', function() {
4540
.pipe(browserSync.reload({stream:true}));
4641
});
4742

48-
gulp.task('clean', function(cb) {
49-
del([
50-
'stylesheets',
51-
'javascripts'
52-
], cb);
53-
});
54-
5543
gulp.task('browser-sync', ['styles', 'scripts'], function() {
5644
browserSync({
5745
server: {
@@ -70,6 +58,6 @@ gulp.task('watch', function() {
7058
gulp.watch('src/javascripts/*.js', ['scripts', browserSync.reload]);
7159
});
7260

73-
gulp.task('default', ['clean'], function() {
61+
gulp.task('default', function() {
7462
gulp.start('styles', 'scripts', 'browser-sync', 'watch');
7563
});

package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@
2323
"gulp-notify": "^1.8.0",
2424
"gulp-plumber": "^0.6.4",
2525
"gulp-rename": "^1.2.0",
26-
"gulp-ruby-sass": "^1.0.1",
27-
"gulp-sass": "^1.3.3",
26+
"gulp-sass": "^2.0.1",
2827
"gulp-uglify": "^0.3.2"
2928
}
3029
}

public/stylesheets/screen.css

Lines changed: 11 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
/* Your styles (and Sass) start here */
22
/*** Example styles ***/
33
body {
4-
background: #36a1d9;
5-
}
4+
background: #36a1d9; }
65

76
h1 {
87
-webkit-transition: all 3s ease-out;
@@ -22,57 +21,46 @@ h1 {
2221
color: white;
2322
color: rgba(255, 255, 255, 0.8);
2423
text-align: center;
25-
text-transform: uppercase;
26-
}
24+
text-transform: uppercase; }
2725

2826
h1:hover {
29-
color: #5cefaf;
30-
}
27+
color: #5cefaf; }
3128

3229
/*** Keyframes - used with the "animation" property in the h1 ***/
3330
@-webkit-keyframes pulsate {
3431
0%, 20% {
3532
-webkit-transform: translate(-50%, -50%) scale(1);
3633
transform: translate(-50%, -50%) scale(1);
3734
-webkit-filter: blur(5px);
38-
filter: blur(5px);
39-
}
35+
filter: blur(5px); }
4036
50%, 70% {
4137
-webkit-transform: translate(-50%, -50%) scale(1.5);
4238
transform: translate(-50%, -50%) scale(1.5);
4339
-webkit-filter: none;
44-
filter: none;
45-
}
40+
filter: none; }
4641
100% {
4742
-webkit-transform: translate(-50%, -50%) scale(1);
4843
transform: translate(-50%, -50%) scale(1);
4944
-webkit-filter: blur(5px);
50-
filter: blur(5px);
51-
}
52-
}
45+
filter: blur(5px); } }
5346
@keyframes pulsate {
5447
0%, 20% {
5548
-webkit-transform: translate(-50%, -50%) scale(1);
5649
transform: translate(-50%, -50%) scale(1);
5750
-webkit-filter: blur(5px);
58-
filter: blur(5px);
59-
}
51+
filter: blur(5px); }
6052
50%, 70% {
6153
-webkit-transform: translate(-50%, -50%) scale(1.5);
6254
transform: translate(-50%, -50%) scale(1.5);
6355
-webkit-filter: none;
64-
filter: none;
65-
}
56+
filter: none; }
6657
100% {
6758
-webkit-transform: translate(-50%, -50%) scale(1);
6859
transform: translate(-50%, -50%) scale(1);
6960
-webkit-filter: blur(5px);
70-
filter: blur(5px);
71-
}
72-
}
61+
filter: blur(5px); } }
62+
7363
/*** Media queries for adjusting to different screen sizes ***/
7464
@media only screen and (max-width: 600px) {
7565
h1 {
76-
font-size: 2em;
77-
}
78-
}
66+
font-size: 2em; } }

public/stylesheets/screen.min.css

Lines changed: 11 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
/* Your styles (and Sass) start here */
22
/*** Example styles ***/
33
body {
4-
background: #36a1d9;
5-
}
4+
background: #36a1d9; }
65

76
h1 {
87
-webkit-transition: all 3s ease-out;
@@ -22,57 +21,46 @@ h1 {
2221
color: white;
2322
color: rgba(255, 255, 255, 0.8);
2423
text-align: center;
25-
text-transform: uppercase;
26-
}
24+
text-transform: uppercase; }
2725

2826
h1:hover {
29-
color: #5cefaf;
30-
}
27+
color: #5cefaf; }
3128

3229
/*** Keyframes - used with the "animation" property in the h1 ***/
3330
@-webkit-keyframes pulsate {
3431
0%, 20% {
3532
-webkit-transform: translate(-50%, -50%) scale(1);
3633
transform: translate(-50%, -50%) scale(1);
3734
-webkit-filter: blur(5px);
38-
filter: blur(5px);
39-
}
35+
filter: blur(5px); }
4036
50%, 70% {
4137
-webkit-transform: translate(-50%, -50%) scale(1.5);
4238
transform: translate(-50%, -50%) scale(1.5);
4339
-webkit-filter: none;
44-
filter: none;
45-
}
40+
filter: none; }
4641
100% {
4742
-webkit-transform: translate(-50%, -50%) scale(1);
4843
transform: translate(-50%, -50%) scale(1);
4944
-webkit-filter: blur(5px);
50-
filter: blur(5px);
51-
}
52-
}
45+
filter: blur(5px); } }
5346
@keyframes pulsate {
5447
0%, 20% {
5548
-webkit-transform: translate(-50%, -50%) scale(1);
5649
transform: translate(-50%, -50%) scale(1);
5750
-webkit-filter: blur(5px);
58-
filter: blur(5px);
59-
}
51+
filter: blur(5px); }
6052
50%, 70% {
6153
-webkit-transform: translate(-50%, -50%) scale(1.5);
6254
transform: translate(-50%, -50%) scale(1.5);
6355
-webkit-filter: none;
64-
filter: none;
65-
}
56+
filter: none; }
6657
100% {
6758
-webkit-transform: translate(-50%, -50%) scale(1);
6859
transform: translate(-50%, -50%) scale(1);
6960
-webkit-filter: blur(5px);
70-
filter: blur(5px);
71-
}
72-
}
61+
filter: blur(5px); } }
62+
7363
/*** Media queries for adjusting to different screen sizes ***/
7464
@media only screen and (max-width: 600px) {
7565
h1 {
76-
font-size: 2em;
77-
}
78-
}
66+
font-size: 2em; } }

0 commit comments

Comments
 (0)