From 69d616cddfe0112e4902e00de724538c7a4facb1 Mon Sep 17 00:00:00 2001 From: Thomas Cazade Date: Sat, 9 Dec 2017 19:14:15 +0100 Subject: [PATCH] Added normalize.css in reset.less and updated gulpfile --- gulpfile.js | 6 +- src/reset.less | 190 ++++++++++++++++++++++++++++++++++++++++++++++++ src/styles.less | 1 + 3 files changed, 193 insertions(+), 4 deletions(-) create mode 100644 src/reset.less diff --git a/gulpfile.js b/gulpfile.js index dbe50d8..abaaa44 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -2,8 +2,7 @@ const gulp = require('gulp'), connect = require('gulp-connect'), less = require('gulp-less'), cleanCSS = require('gulp-clean-css'), - rename = require('gulp-rename'), - concat = require('gulp-concat'); + rename = require('gulp-rename'); gulp.task('webserver', function() { connect.server({ @@ -12,8 +11,7 @@ gulp.task('webserver', function() { }); gulp.task('less', function() { - gulp.src(['node_modules/normalize.less/normalize.less', 'src/styles.less']) - .pipe(concat('papercss.less')) + gulp.src('src/styles.less') .pipe(less()) .pipe(cleanCSS({format: 'beautify'})) .pipe(rename('paper.css')) diff --git a/src/reset.less b/src/reset.less new file mode 100644 index 0000000..a7334ce --- /dev/null +++ b/src/reset.less @@ -0,0 +1,190 @@ +/*! normalize.css v7.0.0 | MIT License | github.com/necolas/normalize.css */ +html { + line-height: 1.15; + -ms-text-size-adjust: 100%; + -webkit-text-size-adjust: 100% +} +body { + margin: 0 +} +article, +aside, +footer, +header, +nav, +section { + display: block +} +h1 { + font-size: 2em; + margin: .67em 0 +} +figcaption, +figure, +main { + display: block +} +figure { + margin: 1em 40px +} +hr { + box-sizing: content-box; + height: 0; + overflow: visible +} +pre { + font-family: monospace,monospace; + font-size: 1em +} +a { + background-color: transparent; + -webkit-text-decoration-skip: objects +} +abbr[title] { + border-bottom: none; + text-decoration: underline; + text-decoration: underline dotted +} +b, +strong { + font-weight: inherit +} +b, +strong { + font-weight: bolder +} +code, +kbd, +samp { + font-family: monospace,monospace; + font-size: 1em +} +dfn { + font-style: italic +} +mark { + background-color: #ff0; + color: #000 +} +small { + font-size: 80% +} +sub, +sup { + font-size: 75%; + line-height: 0; + position: relative; + vertical-align: baseline +} +sub { + bottom: -.25em +} +sup { + top: -.5em +} +audio, +video { + display: inline-block +} +audio:not([controls]) { + display: none; + height: 0 +} +img { + border-style: none +} +svg:not(:root) { + overflow: hidden +} +button, +input, +optgroup, +select, +textarea { + font-family: sans-serif; + font-size: 100%; + line-height: 1.15; + margin: 0 +} +button, +input { + overflow: visible +} +button, +select { + text-transform: none +} +[type=reset], +[type=submit], +button, +html [type=button] { + -webkit-appearance: button +} +[type=button]::-moz-focus-inner, +[type=reset]::-moz-focus-inner, +[type=submit]::-moz-focus-inner, +button::-moz-focus-inner { + border-style: none; + padding: 0 +} +[type=button]:-moz-focusring, +[type=reset]:-moz-focusring, +[type=submit]:-moz-focusring, +button:-moz-focusring { + outline: 1px dotted ButtonText +} +fieldset { + padding: .35em .75em .625em +} +legend { + box-sizing: border-box; + color: inherit; + display: table; + max-width: 100%; + padding: 0; + white-space: normal +} +progress { + display: inline-block; + vertical-align: baseline +} +textarea { + overflow: auto +} +[type=checkbox], +[type=radio] { + box-sizing: border-box; + padding: 0 +} +[type=number]::-webkit-inner-spin-button, +[type=number]::-webkit-outer-spin-button { + height: auto +} +[type=search] { + -webkit-appearance: textfield; + outline-offset: -2px +} +[type=search]::-webkit-search-cancel-button, +[type=search]::-webkit-search-decoration { + -webkit-appearance: none +} +::-webkit-file-upload-button { + -webkit-appearance: button; + font: inherit +} +details, +menu { + display: block +} +summary { + display: list-item +} +canvas { + display: inline-block +} +template { + display: none +} +[hidden] { + display: none +} diff --git a/src/styles.less b/src/styles.less index 812fa3f..0a30879 100644 --- a/src/styles.less +++ b/src/styles.less @@ -1,3 +1,4 @@ +@import (less) "./reset.less"; @import (less) "./boxreset.less"; @import (less) "./colors.less"; @import (less) "./fonts.less";