mirror of
https://github.com/papercss/papercss
synced 2024-06-20 14:45:01 +02:00
Merge branch 'develop' into release-1.6.1
This commit is contained in:
commit
02b5d372bc
50
gulpfile.js
50
gulpfile.js
|
@ -11,7 +11,7 @@ const gulp = require('gulp'),
|
|||
autoprefixer = require('gulp-autoprefixer');
|
||||
|
||||
gulp.task('sass', function() {
|
||||
gulp.src('src/**/*.scss')
|
||||
return gulp.src('src/**/*.scss')
|
||||
.pipe(sass.sync().on('error', sass.logError))
|
||||
.pipe(autoprefixer())
|
||||
.pipe(cleanCSS({format: 'beautify'}))
|
||||
|
@ -21,51 +21,49 @@ gulp.task('sass', function() {
|
|||
});
|
||||
|
||||
gulp.task('watch', function () {
|
||||
gulp.watch('src/**/*.scss', ['sass']);
|
||||
gulp.watch('src/**/*.scss', gulp.series('sass'));
|
||||
});
|
||||
|
||||
gulp.task('hugo-server', function (cb) {
|
||||
let hugo_process = exec(
|
||||
hugo, ['server', '--source=docs', '--disableFastRender'],
|
||||
function (err, stdout, stderr) {
|
||||
console.log(stderr);
|
||||
return err ? cb(err) : cb();
|
||||
}
|
||||
);
|
||||
const flags = ['server', '--source=docs', '--disableFastRender'];
|
||||
let hugo_process = exec(hugo, flags, function (err, stdout, stderr) {
|
||||
console.log(stderr);
|
||||
return err ? cb(err) : cb();
|
||||
});
|
||||
|
||||
hugo_process.stdout.pipe(process.stdout);
|
||||
return hugo_process;
|
||||
})
|
||||
|
||||
gulp.task('hugo-build', function (cb) {
|
||||
let hugo_process = exec(
|
||||
hugo, ['--source=docs'],
|
||||
function (err, stdout, stderr) {
|
||||
console.log(stderr);
|
||||
return err ? cb(err) : cb();
|
||||
}
|
||||
);
|
||||
const flags = ['--source=docs'];
|
||||
let hugo_process = exec(hugo, flags, function (err, stdout, stderr) {
|
||||
console.log(stderr);
|
||||
return err ? cb(err) : cb();
|
||||
});
|
||||
|
||||
hugo_process.stdout.pipe(process.stdout);
|
||||
return hugo_process;
|
||||
})
|
||||
|
||||
gulp.task('minify-css', () => {
|
||||
return gulp.src('src/**/*.scss')
|
||||
.pipe(sass({outputStyle: 'compressed'}).on('error', sass.logError))
|
||||
.pipe(autoprefixer())
|
||||
.pipe(rename('paper.min.css'))
|
||||
.pipe(gulp.dest('dist'))
|
||||
.pipe(gulp.dest('docs/static/assets'));
|
||||
.pipe(sass({outputStyle: 'compressed'}).on('error', sass.logError))
|
||||
.pipe(autoprefixer())
|
||||
.pipe(rename('paper.min.css'))
|
||||
.pipe(gulp.dest('dist'))
|
||||
.pipe(gulp.dest('docs/static/assets'));
|
||||
});
|
||||
|
||||
gulp.task('lint-css', function() {
|
||||
return gulp.src('src/**/*.scss')
|
||||
.pipe(gulpStylelint({
|
||||
reporters: [
|
||||
{formatter: 'string', console: true}
|
||||
]
|
||||
{ formatter: 'string', console: true },
|
||||
],
|
||||
}));
|
||||
})
|
||||
|
||||
gulp.task('default', ['sass','watch','hugo-server']);
|
||||
gulp.task('build', ['sass','minify-css','hugo-build']);
|
||||
gulp.task('postinstall', ['sass','minify-css']);
|
||||
gulp.task('default', gulp.series('sass', 'minify-css', 'hugo-build'));
|
||||
gulp.task('build', gulp.series('sass', 'minify-css', 'hugo-build'));
|
||||
gulp.task('postinstall', gulp.series('sass', 'minify-css'));
|
||||
|
|
16256
package-lock.json
generated
16256
package-lock.json
generated
File diff suppressed because it is too large
Load diff
18
package.json
18
package.json
|
@ -21,10 +21,10 @@
|
|||
},
|
||||
"homepage": "https://www.getpapercss.com",
|
||||
"dependencies": {
|
||||
"gulp": "3.9.1",
|
||||
"gulp": "^4.0.0",
|
||||
"gulp-autoprefixer": "^6.0.0",
|
||||
"gulp-clean-css": "3.9.0",
|
||||
"gulp-connect": "5.0.0",
|
||||
"gulp-connect": "^5.6.1",
|
||||
"gulp-plumber": "1.1.0",
|
||||
"gulp-rename": "1.2.2",
|
||||
"gulp-sass": "^3.1.0",
|
||||
|
@ -33,18 +33,18 @@
|
|||
"devDependencies": {
|
||||
"browserify": "^14.1.0",
|
||||
"chai": "^4.1.2",
|
||||
"gulp-less": "3.3.2",
|
||||
"gulp-less": "^4.0.1",
|
||||
"gulp-plumber": "1.1.0",
|
||||
"gulp-rename": "1.2.2",
|
||||
"gulp-sass": "^3.1.0",
|
||||
"gulp-stylelint": "6.0.0",
|
||||
"gulp-watch-less": "1.0.1",
|
||||
"http-server": "^0.9.0",
|
||||
"hugo-bin": "^0.17.0",
|
||||
"http-server": "^0.11.1",
|
||||
"hugo-bin": "^0.37.0",
|
||||
"install": "0.10.1",
|
||||
"jake": "^8.0.15",
|
||||
"jshint": "^2.9.4",
|
||||
"karma": "^1.7.1",
|
||||
"jshint": "^2.9.6",
|
||||
"karma": "^3.1.1",
|
||||
"karma-chai": "^0.1.0",
|
||||
"karma-commonjs": "1.0.0",
|
||||
"karma-firefox-launcher": "^1.0.0",
|
||||
|
@ -54,7 +54,7 @@
|
|||
"karma-requirejs": "^1.1.0",
|
||||
"mocha": "^4.0.1",
|
||||
"nodemon": "^1.11.0",
|
||||
"npm": "^5.3.0",
|
||||
"npm": "^6.4.1",
|
||||
"object-merge": "^2.5.1",
|
||||
"os": "^0.1.1",
|
||||
"pre-commit": "^1.2.2",
|
||||
|
@ -71,7 +71,7 @@
|
|||
"stylelint-config-standard": "18.0.0",
|
||||
"stylelint-order": "0.8.0",
|
||||
"stylelint-scss": "2.2.0",
|
||||
"webpack-dev-server": "2.7.1"
|
||||
"webpack-dev-server": "^3.1.10"
|
||||
},
|
||||
"pre-commit": [
|
||||
"stylelint"
|
||||
|
|
|
@ -23,6 +23,10 @@ textarea {
|
|||
}
|
||||
}
|
||||
|
||||
select {
|
||||
height: 2.35rem;
|
||||
}
|
||||
|
||||
.disabled {
|
||||
cursor: not-allowed;
|
||||
opacity: 0.5;
|
||||
|
@ -60,9 +64,9 @@ textarea {
|
|||
/* the basic, unchecked style */
|
||||
input {
|
||||
border: 0;
|
||||
display: none;
|
||||
height: 1px;
|
||||
margin: -1px;
|
||||
opacity: 0;
|
||||
overflow: hidden;
|
||||
padding: 0;
|
||||
position: absolute;
|
||||
|
|
Loading…
Reference in a new issue