fix this thing

This commit is contained in:
Tommy Parnell
2015-08-10 20:36:12 -04:00
parent f46d91da3b
commit 4b2269ea88
4 changed files with 42 additions and 25 deletions

View File

@@ -14,9 +14,8 @@
<link rel="stylesheet" href="/components/bootstrap/dist/css/bootstrap.css" /> <link rel="stylesheet" href="/components/bootstrap/dist/css/bootstrap.css" />
<link rel="stylesheet" href="/components/font-awesome/css/font-awesome.min.css" /> <link rel="stylesheet" href="/components/font-awesome/css/font-awesome.min.css" />
<link rel="stylesheet" href="/css/GithubActivity.css" />
<link rel="stylesheet" href="/css/styles.min.css" /> <link rel="stylesheet" href="/css/bundle.css" />
<link rel="stylesheet" href="/css/Site.css" />
<link rel="stylesheet" href="http://cdnjs.cloudflare.com/ajax/libs/octicons/2.0.2/octicons.min.css"> <link rel="stylesheet" href="http://cdnjs.cloudflare.com/ajax/libs/octicons/2.0.2/octicons.min.css">
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries --> <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]> <!--[if lt IE 9]>
@@ -320,13 +319,13 @@
</footer> </footer>
<script src="/components/moment/min/moment.min.js" ></script> <script src="/components/moment/min/moment.min.js" ></script>
<script src="/components/jquery/dist/jquery.min.js"></script> <script src="/components/jquery/dist/jquery.min.js"></script>
<script src="/dist/respond.js" ></script> <script src="/js/respond.js" ></script>
<script src="/components/mustache/mustache.js" ></script> <script src="/components/mustache/mustache.js" ></script>
<script src="/components/jquery-rss/dist/jquery.rss.min.js" ></script> <script src="/components/jquery-rss/dist/jquery.rss.min.js" ></script>
<script src="/components/jquery.easing/js/jquery.easing.min.js" ></script> <script src="/components/jquery.easing/js/jquery.easing.min.js" ></script>
<script src="/components/lodestoneapi.min/index.js" ></script> <script src="/components/lodestoneapi.min/index.js" ></script>
<script src="/components/bootstrap/dist/js/bootstrap.min.js" ></script> <script src="/components/bootstrap/dist/js/bootstrap.min.js" ></script>
<script src="/dist/GithubActivity.js" ></script> <script src="/js/GithubActivity.js" ></script>
<script src="/js/main.js"></script> <script src="/js/main.js"></script>
</body> </body>

View File

@@ -109,7 +109,7 @@ IF EXIST "%DEPLOYMENT_TARGET%\package.json" (
IF EXIST "%DEPLOYMENT_TARGET%\gulpfile.js" ( IF EXIST "%DEPLOYMENT_TARGET%\gulpfile.js" (
pushd "%DEPLOYMENT_TARGET%" pushd "%DEPLOYMENT_TARGET%"
call :ExecuteCmd !NPM_CMD! install gulp call :ExecuteCmd !NPM_CMD! install gulp
call .\node_modules\.bin\gulp compress call .\node_modules\.bin\gulp publish
IF !ERRORLEVEL! NEQ 0 goto error IF !ERRORLEVEL! NEQ 0 goto error
popd popd
) )

View File

@@ -2,27 +2,31 @@ var gulp = require('gulp'),
nodemon = require('gulp-nodemon'), nodemon = require('gulp-nodemon'),
plumber = require('gulp-plumber'), plumber = require('gulp-plumber'),
livereload = require('gulp-livereload'), livereload = require('gulp-livereload'),
less = require('gulp-less'),
concatCss = require('gulp-concat-css'), concatCss = require('gulp-concat-css'),
uglify = require('gulp-uglify'); uglify = require('gulp-uglify'),
cachebust = require('gulp-cache-bust'),
minifyCss = require('gulp-minify-css');
gulp.task('less', function () {
gulp.src('./public/css/*.less')
.pipe(plumber())
.pipe(less())
.pipe(gulp.dest('./public/css'))
.pipe(livereload());
});
gulp.task('combineCss', function(){
gulp.src('./public/**/*.css')
.pipe(concatCss("bundle.css"))
.pipe(gulp.dest('public/out'));
});
gulp.task('watch', function() { gulp.task('watch', function() {
gulp.watch('./public/css/*.less', ['less']); gulp.watch('./public/css/*.less', ['less']);
gulp.watch('./public/css/*.css', ['combineCss']);
});
gulp.task('combineCss', function(){
return gulp.src('./public/css/*.css')
.pipe(concatCss("bundle.css"))
.pipe(gulp.dest('public/css'));
});
gulp.task('minfiyCss', function(){
return gulp.src('public/css/*.css')
.pipe(minifyCss({compatibility: 'ie8'}))
.pipe(gulp.dest('public/css'));
}); });
gulp.task('develop', function () { gulp.task('develop', function () {
@@ -37,19 +41,31 @@ gulp.task('develop', function () {
}); });
}); });
gulp.task('compress', function() { gulp.task('minifyJs', function() {
return gulp.src('public/js/*.js') return gulp.src('public/js/*.js')
.pipe(uglify()) .pipe(uglify())
.pipe(gulp.dest('public/dist')); .pipe(gulp.dest('public/js'));
});
gulp.task('cachebust', function(){
return gulp.src('app/views/index.vash')
.pipe(cachebust({
type: 'timestamp'
}))
.pipe(gulp.dest('./app/views'));
}); });
gulp.task('publish', [ gulp.task('publish', [
'less' 'combineCss',
'minifyJs',
'cachebust',
'develop'
]); ]);
gulp.task('default', [ gulp.task('default', [
'less',
'develop', 'develop',
'compress', 'combineCss',
'watch' 'watch'
]); ]);

View File

@@ -22,9 +22,11 @@
}, },
"devDependencies": { "devDependencies": {
"gulp": "~3.8.10", "gulp": "~3.8.10",
"gulp-cache-bust": "^1.0.1",
"gulp-concat-css": "^2.2.0", "gulp-concat-css": "^2.2.0",
"gulp-less": "~3.0.1", "gulp-less": "~3.0.1",
"gulp-livereload": "~3.8.0", "gulp-livereload": "~3.8.0",
"gulp-minify-css": "^1.2.0",
"gulp-nodemon": "~2.0.2", "gulp-nodemon": "~2.0.2",
"gulp-plumber": "~1.0.0", "gulp-plumber": "~1.0.0",
"gulp-uglify": "^1.2.0" "gulp-uglify": "^1.2.0"