Merge pull request #4 from zidein07/master

include less, ess change gulpfile

gulpfile.js

@@ -1,6 +1,7 @@
 var gulp = require('gulp');
 var gulpConnect = require('gulp-connect');
 var gulpLess = require('gulp-less');
+var gulpEjs = require('gulp-ejs');
 var src = 'src';
 
 var out = 'public';
@@ -13,27 +14,22 @@ gulp.task("connect", function () {
   });
 });
 
-//gulp.task('ejs', function () {
-//  return gulp.src([src + '/*.ejs'])
-//    .pipe($.ejs())
-//    .pipe(gulp.dest(out + '/'))
-//    .pipe($.connect.reload());
-//});
-//
-//gulp.task('less', function () {
-//  return gulp.src([src + '/less/*.less'])
-//    .pipe($.compass({
-//      css: out + '/css',
-//      less: src + '/less',
-//      image: out + '/images'
-//    }))
-//    .pipe($.connect.reload());
-//});
-//
-//gulp.task('watch', function () {
-//  gulp.watch([src + '/less/*.less', src + '/less/**/*.less'], ['less']);
-//  gulp.watch([src + '/*.ejs', src + '/ejs/**/*.ejs'], ['ejs']);
-//  return gulp.watch([src + '/coffee/*.coffee'], ['coffee']);
-//});
-//
-//gulp.task('default', ['connect', 'ejs', 'compass', 'watch']);
+gulp.task('ejs', function () {
+  return gulp.src([src + '/*.ejs'])
+    .pipe(gulpEjs())
+    .pipe(gulp.dest(out + '/'))
+    .pipe(gulpConnect.reload());
+});
+
+gulp.task('less', function () {
+  return gulp.src('./src/less/**/*.less')
+    .pipe(gulpLess())
+    .pipe(gulp.dest('./public/css/'));
+});
+
+gulp.task('watch', function () {
+  gulp.watch([src + '/less/*.less', src + '/less/**/*.less'], ['less']);
+  return gulp.watch([src + '/*.ejs', src + '/ejs/**/*.ejs'], ['ejs']);
+});
+
+gulp.task('default', ['connect', 'less', 'ejs', 'watch']);

public/css/main.css

@@ -1,8 +1,8 @@
-/* line 74, icons/*.png */
-.icons-sprite {
-  background: url('../images/icons-sdaf092d5c4.png') no-repeat; }
-
-/* line 6, ../../src/sass/main.sass */
-body {
-  background: #ffe250;
-  font-family: "Arial", "sans-serif"; }
+body {
+  background: #000;
+}
+body div {
+  background: #000;
+  border-bottom: 2px;
+  border: 2px solid #00d6b2;
+}

public/home.html

@@ -26,7 +26,7 @@
     </div>
 </nav>
 
-<h1>home</h1>
+<h1>homeOne</h1>
 
 <script src="vendor/jquery/jquery.min.js"></script>
 <script src="vendor/bootstrap/dist/js/bootstrap.min.js"></script>

src/home.ejs

@@ -4,6 +4,6 @@ pageTitle = "Page title!"
 <% include ejs/layout/top.ejs %>
 <% include ejs/include/header.ejs %>
 
-<h1>home</h1>
+<h1>homeOne</h1>
 
 <% include ejs/layout/bottom.ejs %>

src/less/main.less

@@ -1,3 +1,8 @@
 body {
   background: #000;
+  div {
+    background: #000;
+    border-bottom: 2px;
+    border: 2px solid #00d6b2;
+  }
 }