Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: gesquive/slate
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: mintcanary/slate
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 3 commits
  • 9 files changed
  • 1 contributor

Commits on Aug 8, 2019

  1. Copy the full SHA
    b0af758 View commit details

Commits on Oct 2, 2019

  1. use $menu-bar-width var

    smth committed Oct 2, 2019
    Copy the full SHA
    5af75f5 View commit details
  2. hide menu bar

    smth committed Oct 2, 2019
    Copy the full SHA
    e0a00e2 View commit details
Showing with 8,232 additions and 63 deletions.
  1. +23 −22 gulpfile.js
  2. +0 −1 layouts/_default/single.html
  3. +0 −1 layouts/index.html
  4. +8,119 −0 package-lock.json
  5. +4 −4 package.json
  6. +14 −6 src/js/slate.js
  7. +69 −26 src/scss/slate.scss
  8. +1 −1 static/css/slate.css
  9. +2 −2 static/js/slate.js
45 changes: 23 additions & 22 deletions gulpfile.js
Original file line number Diff line number Diff line change
@@ -8,15 +8,18 @@ var jshint = require('gulp-jshint');
var uglify = require('gulp-uglify');
var concat = require('gulp-concat');
var rename = require('gulp-rename');
var autoprefixer = require('gulp-autoprefixer');
var runSequence = require('run-sequence');
var sass = require('gulp-sass');
var cleanCss = require('gulp-clean-css');
var hash = require('gulp-hash');
var webserver = require('gulp-webserver');
var del = require('del');
var util = require('gulp-util');
var postcss = require('gulp-postcss');
var postcssPresetEnv = require('postcss-preset-env');

var postCSSconfig = [
postcssPresetEnv({}),
require('cssnano')
];

var src = './src',
vnd = './vendor',
@@ -29,32 +32,31 @@ var src = './src',
jsDst = dst + '/js',
fontDst = dst + '/fonts';

// define the default task and add the watch task to it
gulp.task('default', ['build']);

gulp.task('build', function(callback) {
runSequence('vendor', 'pack-css', 'pack-js');
gulp.series('vendor', 'pack-css', 'pack-js');
});

gulp.task('pack-js', function () {
gulp.task('pack-js', function (done) {
return gulp.src([jsVnd + '/**/*.js', jsSrc + '/**/*.js'])
.pipe(concat('slate.js'))
.pipe(util.env.debug ? util.noop() : uglify())
.pipe(gulp.dest(jsDst));
done();
});

gulp.task('pack-css', function () {
gulp.task('pack-css', function (done) {
return gulp.src([scssVnd + '/**/*.css',
scssVnd + '/**/*.scss',
scssSrc + '/**/*.css',
scssSrc + '/**/*.scss'])
.pipe(sass({
outputStyle: 'compressed',
errLogToConsole: true
}))
.pipe(concat('slate.css'))
.pipe(cleanCss())
.pipe(postcss(postCSSconfig))
.pipe(gulp.dest(scssDst));
done();
});

gulp.task('vendor', function () {
@@ -73,18 +75,17 @@ gulp.task('vendor', function () {
});

// configure which files to watch and what tasks to use on file changes
gulp.task('watch', function() {
runSequence('pack-css', 'pack-js');
gulp.watch(scssSrc + '/**/*css', ['pack-css']);
gulp.watch(jsSrc + '/**/*.js', ['pack-js']);

gulp.task('watch:css', function() {
return gulp.watch(['src/**/*css'],
gulp.parallel('pack-css'));
});

gulp.task('serve', ['watch'], function() {
gulp.src(dst)
.pipe(webserver({
livereload: true,
directoryListing: false,
open: true,
fallback: 'index.html'
}));
gulp.task('watch:js', function() {
return gulp.watch(['src/**/*.js'],
gulp.parallel('pack-js'));
});

gulp.task('watch', gulp.parallel('watch:js', 'watch:css'));

gulp.task('default', gulp.series('build'));
1 change: 0 additions & 1 deletion layouts/_default/single.html
Original file line number Diff line number Diff line change
@@ -38,6 +38,5 @@
</div>

</body>
<link href="https://fonts.googleapis.com/css?family=Exo" rel="stylesheet">
<script src="js/slate.js"></script>
</html>
1 change: 0 additions & 1 deletion layouts/index.html
Original file line number Diff line number Diff line change
@@ -14,6 +14,5 @@
</div>

</body>
<link href="https://fonts.googleapis.com/css?family=Exo" rel="stylesheet">
<script src="js/slate.js"></script>
</html>
Loading