diff --git a/.npmignore b/.npmignore index 23d658c..b01b71b 100644 --- a/.npmignore +++ b/.npmignore @@ -6,10 +6,9 @@ test __tests__ .prettierrc .editorconfig -bower.json -Gemfile gulpfile.js LICENSE.txt Rakefile server.js .prettierrc +.release-it.json diff --git a/.release-it.json b/.release-it.json new file mode 100644 index 0000000..378d578 --- /dev/null +++ b/.release-it.json @@ -0,0 +1,16 @@ +{ + "git": { + "requireCleanWorkingDir": false + }, + "hooks": { + "after:init": [ + "t2k" + ], + "after:bump": [ + "npm run build" + ] + }, + "github": { + "release": true + } +} diff --git a/Gemfile b/Gemfile deleted file mode 100644 index 2b5ea5a..0000000 --- a/Gemfile +++ /dev/null @@ -1,5 +0,0 @@ -source 'https://rubygems.org' - -gem 'fileutils' -gem 'sshkit' -gem 'semver' diff --git a/README.md b/README.md index addb001..d618c62 100644 --- a/README.md +++ b/README.md @@ -1,18 +1,37 @@ -# webkit-sassui-layout-fixed-header -> Fixed header bar for sassui. +# wsui-layout-fixed-header +> Fixed header bar for wsui. -## documentation -- https://afeiship.github.io/webkit-sassui-layout-fixed-header/ +[![version][version-image]][version-url] +[![license][license-image]][license-url] +[![size][size-image]][size-url] +[![download][download-image]][download-url] ## installation ```shell -npm i @feizheng/webkit-sassui-layout-fixed-header +npm i @jswork/wsui-layout-fixed-header ``` ## usage ```scss -@import '~@feizheng/webkit-sassui-layout-fixed-header'; +@import '~@jswork/wsui-layout-fixed-header'; + +// header-height: 50px; +// gap: 10px; +@include wsui-layout-fixed-header($in-height: 50px, $in-gap: 10px); ``` -## resources -- https://github.com/afeiship/generator-webkit-sassui +## license +Code released under [the MIT license](https://github.com/afeiship/wsui-layout-fixed-header/blob/master/LICENSE.txt). + +[version-image]: https://img.shields.io/npm/v/@jswork/wsui-layout-fixed-header +[version-url]: https://npmjs.org/package/@jswork/wsui-layout-fixed-header + +[license-image]: https://img.shields.io/npm/l/@jswork/wsui-layout-fixed-header +[license-url]: https://github.com/afeiship/wsui-layout-fixed-header/blob/master/LICENSE.txt + +[size-image]: https://img.shields.io/bundlephobia/minzip/@jswork/wsui-layout-fixed-header +[size-url]: https://github.com/afeiship/wsui-layout-fixed-header/blob/master/dist/wsui-layout-fixed-header.min.js + +[download-image]: https://img.shields.io/npm/dm/@jswork/wsui-layout-fixed-header +[download-url]: https://www.npmjs.com/package/@jswork/wsui-layout-fixed-header + diff --git a/Rakefile b/Rakefile deleted file mode 100644 index 178e979..0000000 --- a/Rakefile +++ /dev/null @@ -1,4 +0,0 @@ - -Dir["./node_modules/@feizheng/rake-*/index.rake"].each do |task| - load task -end diff --git a/build/docs.js b/build/docs.js index a432cd8..bab026b 100644 --- a/build/docs.js +++ b/build/docs.js @@ -1,21 +1,15 @@ -(function() { +(function () { 'use strict'; var gulp = require('gulp'); var $ = require('gulp-load-plugins')({ pattern: ['gulp-*', 'gulp.*', 'del'], }); - var { includePaths } = nx.$global; //styles - gulp.task('docs', function() { + gulp.task('docs', function () { return gulp .src('docs/style.scss') - .pipe( - $.sass({ outputStyle: 'expanded', includePaths }).on( - 'error', - $.sass.logError - ) - ) + .pipe($.sass({ outputStyle: 'expanded' }).on('error', $.sass.logError)) .pipe(gulp.dest('docs')); }); })(); diff --git a/build/styles.js b/build/styles.js index 5ca9c7b..840184b 100644 --- a/build/styles.js +++ b/build/styles.js @@ -1,21 +1,19 @@ -(function() { +(function () { 'use strict'; var gulp = require('gulp'); var autoprefixer = require('autoprefixer'); var $ = require('gulp-load-plugins')({ - pattern: ['gulp-*', 'gulp.*', 'del', '@feizheng/gulp-*'], + pattern: ['gulp-*', 'gulp.*', 'del', '@jswork/gulp-*'], }); - var { includePaths } = nx.$global; - //styles - gulp.task('styles', function() { + gulp.task('styles', function () { return gulp .src('src/*.scss') - .pipe($.feizheng.pkgHeader()) + .pipe($.jswork.pkgHeader()) .pipe(gulp.dest('dist')) - .pipe($.sass({ includePaths })) + .pipe($.sass()) .pipe($.postcss([autoprefixer()])) .pipe(gulp.dest('dist')); }); diff --git a/dist/index.css b/dist/index.css index 16dad38..345a9d3 100644 --- a/dist/index.css +++ b/dist/index.css @@ -1,10 +1,10 @@ /*! - * name: @feizheng/webkit-sassui-layout-fixed-header - * description: Fixed header bar for sassui. - * url: https://github.com/afeiship/webkit-sassui-layout-fixed-header + * name: @jswork/wsui-layout-fixed-header + * description: Fixed header bar for wsui. + * homepage: https://github.com/afeiship/wsui-layout-fixed-header * version: 1.0.0 - * date: 2020-02-25 12:34:49 + * date: 2020-12-18 21:40:57 * license: MIT */ -/*webkit-sassui-layout-fixed-header Start*/ -/*webkit-sassui-layout-fixed-header End*/ +/*wsui-layout-fixed-header Start*/ +/*wsui-layout-fixed-header End*/ diff --git a/dist/index.scss b/dist/index.scss index e491ee0..9174687 100644 --- a/dist/index.scss +++ b/dist/index.scss @@ -1,19 +1,24 @@ /*! - * name: @feizheng/webkit-sassui-layout-fixed-header - * description: Fixed header bar for sassui. - * url: https://github.com/afeiship/webkit-sassui-layout-fixed-header + * name: @jswork/wsui-layout-fixed-header + * description: Fixed header bar for wsui. + * homepage: https://github.com/afeiship/wsui-layout-fixed-header * version: 1.0.0 - * date: 2020-02-25 12:34:49 + * date: 2020-12-18 21:40:57 * license: MIT */ -/*webkit-sassui-layout-fixed-header Start*/ -@mixin webkit-sassui-layout-fixed-header($inHeight: 50px, $inGap: 10px) { - $padding-top: $inHeight + $inGap; +/*wsui-layout-fixed-header Start*/ +$wsui-layout-fixed-header-options: ( + color: #f00, +) !default; + +@mixin wsui-layout-fixed-header($in-height: 50px, $in-gap: 10px) { + $padding-top: $in-height + $in-gap; &[data-hasbar="true"] { padding-top: $padding-top; } + &[data-hasbar="false"] { padding-top: 0; > .is-header { @@ -23,11 +28,11 @@ > .is-header { position: fixed; - height: $inHeight; + height: $in-height; top: 0; left: 0; right: 0; z-index: 2; } } -/*webkit-sassui-layout-fixed-header End*/ +/*wsui-layout-fixed-header End*/ diff --git a/docs/index.html b/docs/index.html index 91483b8..8f6d5aa 100644 --- a/docs/index.html +++ b/docs/index.html @@ -1,44 +1,40 @@ - - webkit-sassui-layout-fixed-footer + wsui-layout-fixed-header - - -
-
- My header - -
- -
-
-
-
-
-
-
-
-
- - +
+
+ My header +
- - +
+
+
+
+
+
+
+
+
+ + +
+ + diff --git a/docs/style.css b/docs/style.css index 672a2f0..3fda1b0 100644 --- a/docs/style.css +++ b/docs/style.css @@ -1,13 +1,13 @@ /*! - * name: @feizheng/webkit-sassui-layout-fixed-header - * description: Fixed header bar for sassui. - * url: https://github.com/afeiship/webkit-sassui-layout-fixed-header + * name: @jswork/wsui-layout-fixed-header + * description: Fixed header bar for wsui. + * homepage: https://github.com/afeiship/wsui-layout-fixed-header * version: 1.0.0 - * date: 2020-02-25 12:34:49 + * date: 2020-12-18 21:40:57 * license: MIT */ -/*webkit-sassui-layout-fixed-header Start*/ -/*webkit-sassui-layout-fixed-header End*/ +/*wsui-layout-fixed-header Start*/ +/*wsui-layout-fixed-header End*/ * { margin: 0; padding: 0; @@ -15,13 +15,13 @@ -webkit-margin-after: 0; } -.test-webkit-sassui-layout-fixed-footer > .is-header { +.test-wsui-layout-fixed-footer > .is-header { background: #eee; line-height: 50px; text-align: center; } -.test-webkit-sassui-layout-fixed-footer > .is-header button { +.test-wsui-layout-fixed-footer > .is-header button { background: #4cd964; color: #fff; border: none; @@ -30,19 +30,19 @@ padding: 10px 20px; } -.test-webkit-sassui-layout-fixed-footer[data-hasbar="true"] { +.test-wsui-layout-fixed-footer[data-hasbar="true"] { padding-top: 60px; } -.test-webkit-sassui-layout-fixed-footer[data-hasbar="false"] { +.test-wsui-layout-fixed-footer[data-hasbar="false"] { padding-top: 0; } -.test-webkit-sassui-layout-fixed-footer[data-hasbar="false"] > .is-header { +.test-wsui-layout-fixed-footer[data-hasbar="false"] > .is-header { display: none; } -.test-webkit-sassui-layout-fixed-footer > .is-header { +.test-wsui-layout-fixed-footer > .is-header { position: fixed; height: 50px; top: 0; diff --git a/docs/style.scss b/docs/style.scss index 7cd403a..50a3b57 100644 --- a/docs/style.scss +++ b/docs/style.scss @@ -7,7 +7,7 @@ -webkit-margin-after: 0; } -.test-webkit-sassui-layout-fixed-footer { +.test-wsui-layout-fixed-footer { > .is-header { background: #eee; line-height: 50px; @@ -23,5 +23,5 @@ } } - @include webkit-sassui-layout-fixed-header(); + @include wsui-layout-fixed-header(); } diff --git a/gulpfile.js b/gulpfile.js index cc4df00..a6afc0d 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -4,12 +4,6 @@ var gulp = require('gulp'); var path = require('path'); var fs = require('fs'); - var includePaths = [path.join(__dirname, '/node_modules/')]; - - // save globals - require('@feizheng/next-global'); - nx.global(null); - nx.$global = { includePaths }; //import fs.readdirSync('./build').map(function(file) { diff --git a/package.json b/package.json index 24d1197..5d11d5d 100644 --- a/package.json +++ b/package.json @@ -1,33 +1,34 @@ { - "name": "@feizheng/webkit-sassui-layout-fixed-header", + "name": "@jswork/wsui-layout-fixed-header", "version": "1.0.0", - "description": "Fixed header bar for sassui.", - "homepage": "https://github.com/afeiship/webkit-sassui-layout-fixed-header", + "description": "Fixed header bar for wsui.", + "homepage": "https://github.com/afeiship/wsui-layout-fixed-header", "author": { "name": "afei", "email": "1290657123@qq.com" }, "scripts": { "build": "gulp", - "start": "node server.js" + "start": "gulp docs && serve docs", + "release": "release-it" }, "main": "dist/index.scss", "license": "MIT", "devDependencies": { - "@feizheng/gulp-pkg-header": "^1.0.2", - "@feizheng/next-global": "^1.0.2", - "@feizheng/rake-git": "^1.2.1", - "autoprefixer": "^9.7.4", - "del": "^5.1.0", + "@jswork/gulp-pkg-header": "^1.0.3", + "autoprefixer": "^10.0.2", + "del": "^6.0.0", "express": "^4.17.1", "gulp": "^4.0.2", - "gulp-load-plugins": "^2.0.2", - "gulp-postcss": "^8.0.0", + "gulp-load-plugins": "^2.0.5", + "gulp-postcss": "^9.0.0", "gulp-rename": "^2.0.0", - "gulp-sass": "^4.0.2" + "gulp-sass": "^4.1.0", + "postcss": "^8.1.10", + "release-it": "^14.2.1" }, "publishConfig": { + "access": "public", "registry": "https://registry.npmjs.org/" - }, - "dependencies": {} + } } diff --git a/server.js b/server.js deleted file mode 100644 index 115f8c2..0000000 --- a/server.js +++ /dev/null @@ -1,11 +0,0 @@ -const express = require('express'); -const app = express(); -const portNumber = 3002; -const sourceDir = 'docs'; - -app.use(express.static(sourceDir)); - -app.listen(portNumber, () => { - console.log(`Express web server started: http://localhost:${portNumber}`); - console.log(`Serving content from /${sourceDir}/`); -}); diff --git a/src/index.scss b/src/index.scss index 7510fef..2788ef3 100644 --- a/src/index.scss +++ b/src/index.scss @@ -1,10 +1,11 @@ -/*webkit-sassui-layout-fixed-header Start*/ -@mixin webkit-sassui-layout-fixed-header($inHeight: 50px, $inGap: 10px) { - $padding-top: $inHeight + $inGap; +/*wsui-layout-fixed-header Start*/ +@mixin wsui-layout-fixed-header($in-height: 50px, $in-gap: 10px) { + $padding-top: $in-height + $in-gap; &[data-hasbar="true"] { padding-top: $padding-top; } + &[data-hasbar="false"] { padding-top: 0; > .is-header { @@ -14,11 +15,11 @@ > .is-header { position: fixed; - height: $inHeight; + height: $in-height; top: 0; left: 0; right: 0; z-index: 2; } } -/*webkit-sassui-layout-fixed-header End*/ +/*wsui-layout-fixed-header End*/