diff --git a/.gitignore b/.gitignore
index f33bd70..e0ed04d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
node_modules*
+.DS_STORE
diff --git a/docs/borders/index.html b/docs/borders/index.html
new file mode 100644
index 0000000..d1adcde
--- /dev/null
+++ b/docs/borders/index.html
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+ TACHYONS - Form follows function
+
+
+
+
+
+
+
+
+
+
+
diff --git a/gulpfile.js b/gulpfile.js
index 53b978b..f5aecc0 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -11,10 +11,19 @@ var gulp = require('gulp'),
size = require('gulp-size'),
rename = require('gulp-rename'),
csslint = require('gulp-csslint'),
+ fileinclude = require('gulp-file-include'),
browserSync = require('browser-sync'),
browserReload = browserSync.reload,
stylestats = require('gulp-stylestats');
+gulp.task('fileinclude', function() {
+ gulp.src(['test.html'])
+ .pipe(fileinclude({
+ prefix: '@@',
+ basepath: '@views'
+ }))
+ .pipe(gulp.dest('./'));
+});
// Use csslint without box-sizing or compatible vendor prefixes (these
// don't seem to be kept up to date on what to yell about)
@@ -34,11 +43,11 @@ gulp.task('pre-process', function(){
gulp.src('./sass/tachyons.scss')
.pipe(watch(function(files) {
return files.pipe(sass())
- .pipe(size({gzip: false, showFiles: true, title:'un-prefixed uncompressed css'}))
- .pipe(size({gzip: true, showFiles: true, title:'un-prefixed uncompressed css'}))
+ .pipe(size({gzip: false, showFiles: true, title:'un-prefixed css'}))
+ .pipe(size({gzip: true, showFiles: true, title:'un-prefixed gzipped css'}))
.pipe(prefix())
- .pipe(size({gzip: false, showFiles: true, title:'prefixed uncompressed css'}))
- .pipe(size({gzip: true, showFiles: true, title:'prefixed uncompressed css'}))
+ .pipe(size({gzip: false, showFiles: true, title:'prefixed css'}))
+ .pipe(size({gzip: true, showFiles: true, title:'prefixed css'}))
.pipe(gulp.dest('css'))
.pipe(browserSync.reload({stream:true}));
}));
@@ -86,7 +95,7 @@ gulp.task('bs-reload', function () {
*/
gulp.task('default', ['pre-process', 'minify-css', 'bs-reload', 'browser-sync'], function(){
- gulp.start('pre-process', 'csslint');
+ gulp.start('pre-process', 'minify-css', 'csslint');
gulp.watch('sass/*.scss', ['pre-process', 'minify-css']);
gulp.watch('css/tachyons.css', ['bs-reload']);
gulp.watch('*.html', ['bs-reload']);
diff --git a/package.json b/package.json
index ea959c7..0c4d54b 100644
--- a/package.json
+++ b/package.json
@@ -23,6 +23,7 @@
"gulp": "^3.8.2",
"gulp-autoprefixer": "0.0.7",
"gulp-csslint": "^0.1.4",
+ "gulp-file-include": "^0.5.1",
"gulp-minify-css": "^0.3.5",
"gulp-rename": "^1.2.0",
"gulp-sass": "^0.7.2",
@@ -34,6 +35,7 @@
"gulp-watch": "^0.6.8"
},
"scripts": {
- "start": "gulp"
+ "start": "gulp",
+ "test": "gulp fileinclude"
}
}
diff --git a/views/footer.html b/views/footer.html
new file mode 100644
index 0000000..6ddf5d5
--- /dev/null
+++ b/views/footer.html
@@ -0,0 +1,3 @@
+
diff --git a/views/head.html b/views/head.html
new file mode 100644
index 0000000..09a3acb
--- /dev/null
+++ b/views/head.html
@@ -0,0 +1,3 @@
+
+
+
diff --git a/views/header.html b/views/header.html
new file mode 100644
index 0000000..f581770
--- /dev/null
+++ b/views/header.html
@@ -0,0 +1,3 @@
+
diff --git a/views/index.html b/views/index.html
new file mode 100644
index 0000000..10a1151
--- /dev/null
+++ b/views/index.html
@@ -0,0 +1,8 @@
+
+
+ @@include('./head.html')
+
+ @@include('./header.html')
+ @@include('./footer.html')
+
+