Skip to content

Commit

Permalink
Merge branch 'staging'
Browse files Browse the repository at this point in the history
  • Loading branch information
lokesh-coder committed Oct 22, 2017
2 parents 81bb8c5 + c1c2633 commit fcfbeab
Show file tree
Hide file tree
Showing 11 changed files with 43 additions and 44 deletions.
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,7 @@ Desktop.ini
coverage/
docs
tmp
test
test

# Logs
.log
3 changes: 2 additions & 1 deletion .stylelintrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{
"extends": "stylelint-config-recommended-scss"
"extends": "stylelint-config-recommended-scss",
"rules":{}
}
11 changes: 0 additions & 11 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,24 +9,13 @@ notifications:
email: false
before_install:
- echo "//registry.npmjs.org/:_authToken=\${NPM_TOKEN}" > .npmrc
before_script:
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start
- sleep 3
- git remote rm origin
- git remote add origin https://${GH_TOKEN}@github.com/lokesh-coder/hug.css.git
- 'if [ ${TRAVIS_PULL_REQUEST} = "false" ]; then
git fetch && git checkout master;
git config push.default current;
fi'
after_success:
- 'if [ ${TRAVIS_PULL_REQUEST} = "false" ]; then
npm run ci;
npm run release;
npm publish --access=public;
npm run log;
fi'

branches:
only:
- staging
Expand Down
29 changes: 14 additions & 15 deletions Gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ var rename = require('gulp-rename');
var autoprefixer = require('gulp-autoprefixer');
var sourcemaps = require('gulp-sourcemaps');
var headerComment = require('gulp-header-comment');
const gulpStylelint = require('gulp-stylelint');
var gulpStylelint = require('gulp-stylelint');
var stylefmt = require('gulp-stylefmt');
let cleanCSS = require('gulp-clean-css');
var gulpSequence = require('gulp-sequence')
Expand All @@ -15,7 +15,6 @@ var reload = browserSync.reload;
module.exports = gulp;

/* BROWSER SYNC */

gulp.task('browser-sync', function () {
browserSync({
port: 3040,
Expand All @@ -27,30 +26,31 @@ gulp.task('browser-sync', function () {
});
});

/* BROWSER SYNC RELOAD */
gulp.task('browser-sync-reload', function () {
browserSync.reload();
});

/* LIST SCSS */
gulp.task('lint:scss', function() {
gulp.task('lint:scss', function () {
return gulp
.src('src/**/*.scss')
.pipe(gulpStylelint({
reporters: [
{ formatter: 'string', console: true }
]
reporters: [{
formatter: 'string',
console: true
}]
}));
});


/* COMPILE SCSS */
gulp.task('compile:scss', function () {
return gulp.src('src/**/*.scss')
.pipe(sourcemaps.init())
.pipe(sass({
outputStyle: 'expanded'
})
.on('error', sass.logError))
outputStyle: 'expanded'
})
.on('error', sass.logError))
.pipe(autoprefixer({
browsers: ['> 5%', 'last 4 versions'],
cascade: false
Expand All @@ -63,7 +63,6 @@ gulp.task('compile:scss', function () {
});

/* FORMAT CSS */

gulp.task('format:css', function () {
return gulp.src('dist/*.css')
.pipe(stylefmt())
Expand All @@ -78,21 +77,22 @@ gulp.task('clean:dist', function () {
/* MINIFY CSS */
gulp.task('minify:css', () => {
return gulp.src('dist/*.css')
.pipe(cleanCSS({ compatibility: 'ie9' }))
.pipe(cleanCSS({
compatibility: 'ie9'
}))
.pipe(rename({
suffix: '.min'
}))
.pipe(gulp.dest('dist'));
});

/* SET HEADER */

gulp.task('set:header', function () {
return gulp.src('dist/*.css')
.pipe(headerComment(`
pretty-checkbox.css
A pure CSS library to beautify checkbox and radio buttons.
A pure CSS library to beautify checkbox and radio buttons
Source: <%= pkg.repository.link %>
Demo: <%= pkg.homepage %>
Expand All @@ -106,7 +106,6 @@ gulp.task('build', function (cb) {
gulpSequence('lint:scss', 'clean:dist', 'compile:scss', 'format:css', 'minify:css', 'set:header', cb)
});


gulp.task('default', ['compile:scss', 'browser-sync'], function () {
gulp.watch("src/**/*.scss", ['compile:scss', 'browser-sync-reload']);
});
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2017 Lokesh Rajendran
Copyright (c) 2017 Lokesh Rajendran ( [email protected] )

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
* Lock
* State - *Focus*, *Hover*, *Indeterminate*
* Supports frameworks - *Bootstrap*, *Foundation*, *Sematic UI*, *Bulma*, ...
* Customize nearly everything with SCSS
* SCSS customization
* Supports all modern browsers, including mobile devices
* Print friendly
* and more... ( *I am kidding, that's all!* )
Expand Down
20 changes: 12 additions & 8 deletions dist/pretty-checkbox.css
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,8 @@
min-width: calc(1em + 2px);
}

.pretty .state label:before, .pretty .state label:after {
.pretty .state label:before,
.pretty .state label:after {
content: '';
width: calc(1em + 2px);
height: calc(1em + 2px);
Expand All @@ -71,7 +72,8 @@
border-color: #bdc3c7;
}

.pretty .state.p-is-hover, .pretty .state.p-is-indeterminate {
.pretty .state.p-is-hover,
.pretty .state.p-is-indeterminate {
display: none;
}

Expand Down Expand Up @@ -319,7 +321,8 @@
background-color: #bdc3c7 !important;
}

.pretty.p-default.p-thick .state label:before, .pretty.p-default.p-thick .state label:after {
.pretty.p-default.p-thick .state label:before,
.pretty.p-default.p-thick .state label:after {
border-width: calc(1em / 7);
}

Expand Down Expand Up @@ -455,7 +458,8 @@
text-indent: 2.5em;
}

.pretty.p-switch .state label:before, .pretty.p-switch .state label:after {
.pretty.p-switch .state label:before,
.pretty.p-switch .state label:after {
transition: all 0.5s ease;
border-radius: 100%;
left: 0;
Expand Down Expand Up @@ -574,7 +578,8 @@
transform: scale(1.1);
}

.pretty.p-round .state label:before, .pretty.p-round .state label:after {
.pretty.p-round .state label:before,
.pretty.p-round .state label:after {
border-radius: 100%;
}

Expand All @@ -589,7 +594,8 @@
transform: scale(0.8);
}

.pretty.p-curve .state label:before, .pretty.p-curve .state label:after {
.pretty.p-curve .state label:before,
.pretty.p-curve .state label:after {
border-radius: 20%;
}

Expand Down Expand Up @@ -955,5 +961,3 @@
print-color-adjust: exact;
}
}

/*# sourceMappingURL=maps/pretty-checkbox.css.map */
2 changes: 1 addition & 1 deletion dist/pretty-checkbox.min.css

Large diffs are not rendered by default.

9 changes: 6 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "pretty-checkbox",
"version": "3.0.0",
"version": "3.0.1",
"description": "A pure css library to beautify checkbox and radio buttons.",
"main": "dist/pretty.min.css",
"scripts": {
Expand All @@ -9,7 +9,7 @@
"format": "gulp css:format",
"build": "gulp build",
"ci": "npm run build && git add dist -f && git commit -m \"build(release): auto build [ci skip]\"",
"release": "corp-semantic-release --branch master",
"release": "corp-semantic-release",
"log": "conventional-github-releaser -p angular -r 0"
},
"dependencies": {},
Expand Down Expand Up @@ -51,7 +51,10 @@
"toggle",
"sass",
"css3",
"animation"
"animation",
"pretty",
"check",
"colors"
],
"author": "Lokesh Rajendran",
"license": "MIT",
Expand Down
2 changes: 1 addition & 1 deletion src/scss/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,4 @@ $pretty-top-offset-switch: calc((0% - (100% - 1em)) - #{$pretty-top-switch});

// dev
$pretty--debug: false !default;
$pretty--err-message: 'Invalid input type!' !default;
$pretty--err-message: 'Error: Invalid input type!' !default;
2 changes: 1 addition & 1 deletion src/scss/elements/switch/_general.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.#{$pretty--class-name}.p-switch {
input{
width:2em;
min-width:2em;
}
.state {
position: relative;
Expand Down

0 comments on commit fcfbeab

Please sign in to comment.