Skip to content

Commit

Permalink
edit gulp setting, add editorconfig
Browse files Browse the repository at this point in the history
  • Loading branch information
h2ham committed Nov 17, 2016
1 parent 5e166b8 commit 3e2eb77
Show file tree
Hide file tree
Showing 11 changed files with 318 additions and 306 deletions.
20 changes: 20 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# editorconfig.org
root = true

[*]
indent_style = tab
indent_size = 2
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true

[*.{md,markdown}]
indent_style = tab
indent_size = 2
trim_trailing_whitespace = false

[*.jade]
indent_style = tab
indent_size = 2
trim_trailing_whitespace = false
4 changes: 2 additions & 2 deletions Readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ You can easily find source code or plugins for Offcanvas-menu via Google by sear
npm

```
npm install hiraku
$ npm install hiraku
```

## Setup
Expand Down Expand Up @@ -48,7 +48,7 @@ And if you want to change the width of the Offcanvas-menu, You may want to chang
<span class="hiraku-open-btn-line"></span>
</button>
<div class="offcanvas-right">
<ul><li>hogehoge</li></ul>
<ul><li>hogehoge</li></ul>
</div>
```

Expand Down
50 changes: 24 additions & 26 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,52 +3,50 @@ var plumber = require('gulp-plumber');
var rename = require('gulp-rename');
var sass = require('gulp-sass');
var autoPrefixer = require('gulp-autoprefixer');
//if node version is lower than v.0.1.2
require('es6-promise').polyfill();
require('es6-promise').polyfill(); //if node version is lower than v.0.1.2
var cssComb = require('gulp-csscomb');
var cmq = require('gulp-merge-media-queries');
var cleanCss = require('gulp-clean-css');
var cleanCSS = require('gulp-clean-css');
var uglify = require('gulp-uglify');

gulp.task('sass',function(){
gulp.src(['scss/**/*.scss'])
.pipe(plumber({
handleError: function (err) {
console.log(err);
this.emit('end');
}
}))
.pipe(sass())
.pipe(sass().on('error', sass.logError))
.pipe(autoPrefixer({
browsers: ['last 2 versions', 'ie 9']
}))
.pipe(cssComb())
.pipe(cmq({log:true}))
.pipe(cmq({
log: true
}))
.pipe(gulp.dest('src/'))
.pipe(rename({
suffix: '.min'
}))
.pipe(cleanCss())
.pipe(cleanCSS())
.pipe(gulp.dest('src/'))
});

gulp.task('js',function(){
gulp.src(['src/hiraku.js'])
.pipe(plumber({
handleError: function (err) {
console.log(err);
this.emit('end');
}
}))
.pipe(rename({
suffix: '.min'
}))
.pipe(uglify())
.pipe(gulp.dest('src'))
gulp.src(['src/hiraku.js'])
.pipe(plumber({
errorHandler: function (err) {
console.log(err);
this.emit('end');
}
}))
.pipe(rename({
suffix: '.min'
}))
.pipe(uglify({
preserveComments: 'some'
}))
.pipe(gulp.dest('src'))
});



gulp.task('default',function(){
gulp.watch('scss/**/*.scss',['sass']);
gulp.watch('src/hiraku.js',['js']);
gulp.watch('scss/**/*.scss', ['sass']);
gulp.watch('src/hiraku.js', ['js']);
});
42 changes: 22 additions & 20 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,22 +1,24 @@
{
"name": "hiraku",
"version": "1.0.1",
"description": "Drawer Menu jQuery Plugin",
"author": "appleple",
"url": "www.appleple.com",
"license": "MIT License",
"devDependencies": {
"es6-promise": "*",
"gulp": "*",
"gulp-autoprefixer": "*",
"gulp-clean-css": "*",
"gulp-csscomb": "*",
"gulp-merge-media-queries": "*",
"gulp-plumber": "*",
"gulp-rename": "*",
"gulp-sass": "*"
},
"dependencies": {
"gulp-uglify": "^2.0.0"
}
"name": "Hiraku",
"version": "1.0.2",
"description": "Drawer Menu jQuery Plugin",
"author": "appleple",
"url": "https://www.appleple.com",
"license": "MIT License",
"devDependencies": {
"es6-promise": "*",
"gulp": "*",
"gulp-autoprefixer": "*",
"gulp-clean-css": "*",
"gulp-csscomb": "*",
"gulp-merge-media-queries": "*",
"gulp-plumber": "*",
"gulp-rename": "*",
"gulp-sass": "*",
"gulp-uglify": "^2.0.0"
},
"scripts": {
"start": "gulp",
"gulp": "gulp"
}
}
4 changes: 2 additions & 2 deletions scss/_base.scss
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,12 @@
}

.js-hiraku-offcanvas-active .js-hiraku-offcanvas-sidebar-right.active {
margin-right: 0px;
margin-right: 0;
transition: margin-right $animation;
}

.js-hiraku-offcanvas-active .js-hiraku-offcanvas-sidebar-left.active {
margin-left: 0px;
margin-left: 0;
transition: margin-left $animation;
}

Expand Down
2 changes: 1 addition & 1 deletion scss/_variables.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
$side-menu-width: 70%;
$animation: 0.3s ease-in-out;
$animation: .3s ease-in-out;
$offcanvas-overlay: rgba(0, 0, 0, 0.3);
$offcanvas-overlay-focused: rgba(0, 0, 0, 0.3);
2 changes: 1 addition & 1 deletion scss/hiraku.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Hiraku Ver.1.0.1 (https://www.appleple.com)
* Hiraku Ver.1.0.2 (https://www.appleple.com)
* Copyright appleple | MIT License
*
*/
Expand Down
2 changes: 1 addition & 1 deletion src/hiraku.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Hiraku Ver.1.0.1 (https://www.appleple.com)
* Hiraku Ver.1.0.2 (https://www.appleple.com)
* Copyright appleple | MIT License
*
*/
Expand Down
Loading

0 comments on commit 3e2eb77

Please sign in to comment.