Skip to content

Commit 322d434

Browse files
committed
Remove Bourbon
1 parent 6256a4d commit 322d434

File tree

8 files changed

+18
-14
lines changed

8 files changed

+18
-14
lines changed

app/sass/_fonts.sass

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import "bourbon"
1+
@import "_mixins/font-face"
22

3-
+font-face("roboto", "../fonts/RobotoRegular/RobotoRegular", $file-formats: eot woff ttf)
4-
+font-face("roboto", "../fonts/RobotoBold/RobotoBold", bold, $file-formats: eot woff ttf)
3+
+font-face("roboto-example", "../fonts/RobotoRegular/RobotoRegular")
4+
+font-face("roboto-example", "../fonts/RobotoBold/RobotoBold", bold)

app/sass/_media.sass

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
@import "bourbon"
21
@import "vars"
32

43
/*========== Desktop First ==========*/

app/sass/_mixins/_font-face.sass

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
@mixin font-face($font-family, $file-path, $weight: normal, $style: normal, $asset-pipeline: false )
2+
@font-face
3+
font-family: $font-family
4+
font-weight: $weight
5+
font-style: $style
6+
7+
@if $asset-pipeline == true
8+
src: font-url('#{$file-path}.eot')
9+
src: font-url('#{$file-path}.eot?#iefix') format('embedded-opentype'), font-url('#{$file-path}.woff') format('woff'), font-url('#{$file-path}.ttf') format('truetype')
10+
@else
11+
src: url('#{$file-path}.eot')
12+
src: url('#{$file-path}.eot?#iefix') format('embedded-opentype'), url('#{$file-path}.woff') format('woff'), url('#{$file-path}.ttf') format('truetype')

app/sass/_vars.sass

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,2 @@
1-
@import "bourbon"
2-
3-
$default-font: "roboto", sans-serif
1+
$default-font: "roboto-example", sans-serif
42
$accent: orange

app/sass/main.sass

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
@import "bourbon"
21
@import "fonts"
32
@import "libs"
43
@import "vars"

gulpfile.js

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ var gulp = require('gulp'),
1010
imagemin = require('gulp-imagemin'),
1111
cache = require('gulp-cache'),
1212
autoprefixer = require('gulp-autoprefixer'),
13-
bourbon = require('node-bourbon'),
1413
ftp = require('vinyl-ftp'),
1514
notify = require("gulp-notify");
1615

@@ -39,9 +38,7 @@ gulp.task('browser-sync', function() {
3938

4039
gulp.task('sass', function() {
4140
return gulp.src('app/sass/**/*.sass')
42-
.pipe(sass({
43-
includePaths: bourbon.includePaths
44-
}).on("error", notify.onError()))
41+
.pipe(sass().on("error", notify.onError()))
4542
.pipe(rename({suffix: '.min', prefix : ''}))
4643
.pipe(autoprefixer(['last 15 versions']))
4744
.pipe(cleanCSS())

package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
"gulp-sass": "^3.1.0",
2323
"gulp-uglify": "^2.1.0",
2424
"gulp-util": "^3.0.8",
25-
"node-bourbon": "^4.2.8",
2625
"vinyl-ftp": "^0.6.0"
2726
}
2827
}

readme.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<p>Author: <a href="http://webdesign-master.ru" target="_blank">WebDesign Master</a> | <a href="http://webdesign-master.ru/blog/tools/2016-08-19-optimizedhtml.html" target="_blank">Manual in Russian</a></p>
88

9-
<p>OptimizedHTML is all-inclusive, optimized for Google PageSpeed start HTML5 template with Bootstrap (grid only), Gulp, Sass, Browsersync, Autoprefixer, Clean-CSS, Uglify, Imagemin, Vinyl-FTP, Bower (libs path) and Bourbon support. The template contains a <strong>.htaccess</strong> file with caching rules for web server.</p>
9+
<p>OptimizedHTML is all-inclusive, optimized for Google PageSpeed start HTML5 template with Bootstrap (grid only), Gulp, Sass, Browsersync, Autoprefixer, Clean-CSS, Uglify, Imagemin, Vinyl-FTP and Bower (libs path) support. The template contains a <strong>.htaccess</strong> file with caching rules for web server.</p>
1010

1111
<p>OptimizedHTML Start Template uses the best practices of web development and optimized for Google PageSpeed.</p>
1212

0 commit comments

Comments
 (0)