1
0
mirror of https://github.com/kognise/water.css.git synced 2025-08-12 08:04:13 +02:00

Merge branch 'master' into master

This commit is contained in:
Kognise
2021-08-11 13:16:03 -04:00
committed by GitHub
8 changed files with 32 additions and 8 deletions

View File

@@ -0,0 +1,5 @@
---
"water.css": patch
---
Remove sourcemap references from built files

View File

@@ -0,0 +1,5 @@
---
"water.css": patch
---
Reduce input selector specificity for display property to prevent overriding user's css. Fixes #78 and #82

View File

@@ -0,0 +1,5 @@
---
"water.css": patch
---
Added styling for Input type Reset

View File

@@ -0,0 +1,5 @@
---
"water.css": patch
---
Update main package entrypoint

View File

@@ -231,6 +231,7 @@
<label for="remember">Remember me</label> <label for="remember">Remember me</label>
<input type="submit" value="Submit" /> <input type="submit" value="Submit" />
<input type="reset" value="Reset" />
</form> </form>
<h3 id="code">Code</h3> <h3 id="code">Code</h3>

View File

@@ -58,7 +58,6 @@ const style = () => {
return ( return (
gulp gulp
.src(paths.styles.src) .src(paths.styles.src)
.pipe(sourcemaps.init())
.pipe(postcss([postcssImport(), postcssColorModFunction(), postcssInlineSvg()])) .pipe(postcss([postcssImport(), postcssColorModFunction(), postcssInlineSvg()]))
.pipe(startDiff()) .pipe(startDiff())
@@ -69,12 +68,9 @@ const style = () => {
.pipe(postcss([autoprefixer()])) .pipe(postcss([autoprefixer()]))
.pipe(endDiff('autoprefixer')) .pipe(endDiff('autoprefixer'))
.pipe(sourcemaps.write('.'))
.pipe(flatten()) // Put files in out/*, not out/builds/* .pipe(flatten()) // Put files in out/*, not out/builds/*
.pipe(gulp.dest(paths.styles.dest)) .pipe(gulp.dest(paths.styles.dest))
.pipe(filter('**/*.css')) // Remove sourcemaps from the pipeline
// <minifying> // <minifying>
.pipe(startDiff()) .pipe(startDiff())
.pipe(postcss([cssnano({ preset: ['default', { svgo: { floatPrecision: 0 } }] })])) .pipe(postcss([cssnano({ preset: ['default', { svgo: { floatPrecision: 0 } }] })]))
@@ -82,11 +78,9 @@ const style = () => {
.pipe(rename({ suffix: '.min' })) .pipe(rename({ suffix: '.min' }))
// </minifying> // </minifying>
.pipe(sourcemaps.write('.'))
.pipe(gulp.dest(paths.styles.dest)) .pipe(gulp.dest(paths.styles.dest))
.pipe(gulp.dest(paths.docs.dest + '/water.css')) .pipe(gulp.dest(paths.docs.dest + '/water.css'))
.pipe(filter('**/*.css')) // Remove sourcemaps from the pipeline
.pipe(sizereport({ gzip: true, total: false, title: 'SIZE REPORT' })) .pipe(sizereport({ gzip: true, total: false, title: 'SIZE REPORT' }))
.pipe(browserSync.stream()) .pipe(browserSync.stream())
) )

View File

@@ -2,7 +2,7 @@
"name": "water.css", "name": "water.css",
"version": "2.0.0", "version": "2.0.0",
"description": "A drop-in collection of CSS styles to make simple websites just a little nicer", "description": "A drop-in collection of CSS styles to make simple websites just a little nicer",
"main": "index.js", "main": "out/water.css",
"scripts": { "scripts": {
"build": "gulp build", "build": "gulp build",
"dev": "gulp watch", "dev": "gulp watch",

View File

@@ -1,6 +1,7 @@
button, button,
select, select,
input[type='submit'], input[type='submit'],
input[type='reset'],
input[type='button'], input[type='button'],
input[type='checkbox'], input[type='checkbox'],
input[type='range'], input[type='range'],
@@ -8,11 +9,16 @@ input[type='radio'] {
cursor: pointer; cursor: pointer;
} }
input:not([type='checkbox']):not([type='radio']), input,
select { select {
display: block; display: block;
} }
[type='checkbox'],
[type='radio'] {
display: initial;
}
input, input,
button, button,
textarea, textarea,
@@ -96,6 +102,7 @@ select[multiple] {
button, button,
input[type='submit'], input[type='submit'],
input[type='reset'],
input[type='button'] { input[type='button'] {
padding-right: 30px; padding-right: 30px;
padding-left: 30px; padding-left: 30px;
@@ -103,6 +110,7 @@ input[type='button'] {
button:hover, button:hover,
input[type='submit']:hover, input[type='submit']:hover,
input[type='reset']:hover,
input[type='button']:hover { input[type='button']:hover {
background: var(--button-hover); background: var(--button-hover);
} }
@@ -117,6 +125,7 @@ textarea:focus {
input[type='checkbox']:active, input[type='checkbox']:active,
input[type='radio']:active, input[type='radio']:active,
input[type='submit']:active, input[type='submit']:active,
input[type='reset']:active,
input[type='button']:active, input[type='button']:active,
input[type='range']:active, input[type='range']:active,
button:active { button:active {