Commit67bc805

committed

Upgrade getbase

1 parent67ecee0 commit67bc805Copy full SHA for 67bc805

File tree

+32

-12

lines changed

+32

-12

lines changed

Lines changed: 0 additions & 4 deletions

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,8 @@ var gulp = require('gulp'),`
`4`	`4`	`cleanCSS=require('gulp-clean-css'),`
`5`	`5`	`concat=require('gulp-concat'),`
`6`	`6`	`spawn=require('child_process').spawn,`
`7`		`-sass=require('gulp-sass');`
	`7`	`+sass=require('gulp-sass')`
	`8`	`+tildeImporter=require('node-sass-tilde-importer');`
`8`	`9`
`9`	`10`	`vardo_minify=true;`
`10`	`11`
`@@ -35,13 +36,13 @@ gulp.task('serve', function() {`
`35`	`36`	`// Compile and copy scss styles`
`36`	`37`	`gulp.task('scss',function(){`
`37`	`38`	`gulp.src(paths.scss_coder)`
`38`		`-.pipe(sass().on('error',sass.logError))`
	`39`	`+.pipe(sass({importer:tildeImporter}).on('error',sass.logError))`
`39`	`40`	`.pipe(cleanCSS())`
`40`	`41`	`.pipe(concat('coder.css'))`
`41`	`42`	`.pipe(gulp.dest(paths.compiled));`
`42`	`43`
`43`	`44`	`returngulp.src(paths.scss_main)`
`44`		`-.pipe(sass().on('error',sass.logError))`
	`45`	`+.pipe(sass({importer:tildeImporter}).on('error',sass.logError))`
`45`	`46`	`.pipe(cleanCSS())`
`46`	`47`	`.pipe(concat('style.css'))`
`47`	`48`	`.pipe(gulp.dest(paths.compiled));`

Lines changed: 12 additions & 3 deletions

Lines changed: 1 addition & 0 deletions

Lines changed: 15 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,20 @@ $base-heading-font-family: Arial Black;`
`4`	`4`	`$base-link-color:#0000ee;`
`5`	`5`	`$base-link-hover-color:#0000ff;`
`6`	`6`
`7`		`-@import'getbase/styles';`
	`7`	`+// Import Base & Modules`
	`8`	`+@import"~@getbase/base/scss/index";`
	`9`	`+@import"~@getbase/buttons/scss/index";`
	`10`	`+@import"~@getbase/containers/scss/index";`
	`11`	`+@import"~@getbase/forms/scss/index";`
	`12`	`+@import"~@getbase/grid/scss/index";`
	`13`	`+@import"~@getbase/tables/scss/index";`
	`14`	`+@import"~@getbase/typography/scss/index";`
	`15`	`+`
	`16`	`+// Base Typography and Layout Helpers`
	`17`	`+@import"~@getbase/typography-helpers/scss/index";`
	`18`	`+@import"~@getbase/layout-helpers/scss/index";`
	`19`	`+@import"~@getbase/layout-spacers/scss/index";`
	`20`	`+`
`8`	`21`	`@import'palette';`
`9`	`22`	`@import'blockquote';`
`10`	`23`
`@@ -35,7 +48,7 @@ img {`
`35`	`48`	`margin:0auto;`
`36`	`49`	`}`
`37`	`50`	`.box-searchinput,.box-searchbutton {`
`38`		`-font-size:2rem;`
	`51`	`+font-size:1.8rem;`
`39`	`52`	`min-height:4rem;`
`40`	`53`	`}`
`41`	`54`	`.box-searchbutton {`

Comments

(0)