Skip to content

Commit fcfbeab

Browse files
committed
Merge branch 'staging'
2 parents 81bb8c5 + c1c2633 commit fcfbeab

File tree

11 files changed

+43
-44
lines changed

11 files changed

+43
-44
lines changed

.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,7 @@ Desktop.ini
2626
coverage/
2727
docs
2828
tmp
29-
test
29+
test
30+
31+
# Logs
32+
.log

.stylelintrc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
{
2-
"extends": "stylelint-config-recommended-scss"
2+
"extends": "stylelint-config-recommended-scss",
3+
"rules":{}
34
}

.travis.yml

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,24 +9,13 @@ notifications:
99
email: false
1010
before_install:
1111
- echo "//registry.npmjs.org/:_authToken=\${NPM_TOKEN}" > .npmrc
12-
before_script:
13-
- export DISPLAY=:99.0
14-
- sh -e /etc/init.d/xvfb start
15-
- sleep 3
16-
- git remote rm origin
17-
- git remote add origin https://${GH_TOKEN}@github.com/lokesh-coder/hug.css.git
18-
- 'if [ ${TRAVIS_PULL_REQUEST} = "false" ]; then
19-
git fetch && git checkout master;
20-
git config push.default current;
21-
fi'
2212
after_success:
2313
- 'if [ ${TRAVIS_PULL_REQUEST} = "false" ]; then
2414
npm run ci;
2515
npm run release;
2616
npm publish --access=public;
2717
npm run log;
2818
fi'
29-
3019
branches:
3120
only:
3221
- staging

Gulpfile.js

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ var rename = require('gulp-rename');
55
var autoprefixer = require('gulp-autoprefixer');
66
var sourcemaps = require('gulp-sourcemaps');
77
var headerComment = require('gulp-header-comment');
8-
const gulpStylelint = require('gulp-stylelint');
8+
var gulpStylelint = require('gulp-stylelint');
99
var stylefmt = require('gulp-stylefmt');
1010
let cleanCSS = require('gulp-clean-css');
1111
var gulpSequence = require('gulp-sequence')
@@ -15,7 +15,6 @@ var reload = browserSync.reload;
1515
module.exports = gulp;
1616

1717
/* BROWSER SYNC */
18-
1918
gulp.task('browser-sync', function () {
2019
browserSync({
2120
port: 3040,
@@ -27,30 +26,31 @@ gulp.task('browser-sync', function () {
2726
});
2827
});
2928

29+
/* BROWSER SYNC RELOAD */
3030
gulp.task('browser-sync-reload', function () {
3131
browserSync.reload();
3232
});
3333

3434
/* LIST SCSS */
35-
gulp.task('lint:scss', function() {
35+
gulp.task('lint:scss', function () {
3636
return gulp
3737
.src('src/**/*.scss')
3838
.pipe(gulpStylelint({
39-
reporters: [
40-
{ formatter: 'string', console: true }
41-
]
39+
reporters: [{
40+
formatter: 'string',
41+
console: true
42+
}]
4243
}));
4344
});
4445

45-
4646
/* COMPILE SCSS */
4747
gulp.task('compile:scss', function () {
4848
return gulp.src('src/**/*.scss')
4949
.pipe(sourcemaps.init())
5050
.pipe(sass({
51-
outputStyle: 'expanded'
52-
})
53-
.on('error', sass.logError))
51+
outputStyle: 'expanded'
52+
})
53+
.on('error', sass.logError))
5454
.pipe(autoprefixer({
5555
browsers: ['> 5%', 'last 4 versions'],
5656
cascade: false
@@ -63,7 +63,6 @@ gulp.task('compile:scss', function () {
6363
});
6464

6565
/* FORMAT CSS */
66-
6766
gulp.task('format:css', function () {
6867
return gulp.src('dist/*.css')
6968
.pipe(stylefmt())
@@ -78,21 +77,22 @@ gulp.task('clean:dist', function () {
7877
/* MINIFY CSS */
7978
gulp.task('minify:css', () => {
8079
return gulp.src('dist/*.css')
81-
.pipe(cleanCSS({ compatibility: 'ie9' }))
80+
.pipe(cleanCSS({
81+
compatibility: 'ie9'
82+
}))
8283
.pipe(rename({
8384
suffix: '.min'
8485
}))
8586
.pipe(gulp.dest('dist'));
8687
});
8788

8889
/* SET HEADER */
89-
9090
gulp.task('set:header', function () {
9191
return gulp.src('dist/*.css')
9292
.pipe(headerComment(`
9393
pretty-checkbox.css
9494
95-
A pure CSS library to beautify checkbox and radio buttons.
95+
A pure CSS library to beautify checkbox and radio buttons
9696
9797
Source: <%= pkg.repository.link %>
9898
Demo: <%= pkg.homepage %>
@@ -106,7 +106,6 @@ gulp.task('build', function (cb) {
106106
gulpSequence('lint:scss', 'clean:dist', 'compile:scss', 'format:css', 'minify:css', 'set:header', cb)
107107
});
108108

109-
110109
gulp.task('default', ['compile:scss', 'browser-sync'], function () {
111110
gulp.watch("src/**/*.scss", ['compile:scss', 'browser-sync-reload']);
112111
});

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2017 Lokesh Rajendran
3+
Copyright (c) 2017 Lokesh Rajendran ( [email protected] )
44

55
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:
66

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
* Lock
4848
* State - *Focus*, *Hover*, *Indeterminate*
4949
* Supports frameworks - *Bootstrap*, *Foundation*, *Sematic UI*, *Bulma*, ...
50-
* Customize nearly everything with SCSS
50+
* SCSS customization
5151
* Supports all modern browsers, including mobile devices
5252
* Print friendly
5353
* and more... ( *I am kidding, that's all!* )

dist/pretty-checkbox.css

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,8 @@
5252
min-width: calc(1em + 2px);
5353
}
5454

55-
.pretty .state label:before, .pretty .state label:after {
55+
.pretty .state label:before,
56+
.pretty .state label:after {
5657
content: '';
5758
width: calc(1em + 2px);
5859
height: calc(1em + 2px);
@@ -71,7 +72,8 @@
7172
border-color: #bdc3c7;
7273
}
7374

74-
.pretty .state.p-is-hover, .pretty .state.p-is-indeterminate {
75+
.pretty .state.p-is-hover,
76+
.pretty .state.p-is-indeterminate {
7577
display: none;
7678
}
7779

@@ -319,7 +321,8 @@
319321
background-color: #bdc3c7 !important;
320322
}
321323

322-
.pretty.p-default.p-thick .state label:before, .pretty.p-default.p-thick .state label:after {
324+
.pretty.p-default.p-thick .state label:before,
325+
.pretty.p-default.p-thick .state label:after {
323326
border-width: calc(1em / 7);
324327
}
325328

@@ -455,7 +458,8 @@
455458
text-indent: 2.5em;
456459
}
457460

458-
.pretty.p-switch .state label:before, .pretty.p-switch .state label:after {
461+
.pretty.p-switch .state label:before,
462+
.pretty.p-switch .state label:after {
459463
transition: all 0.5s ease;
460464
border-radius: 100%;
461465
left: 0;
@@ -574,7 +578,8 @@
574578
transform: scale(1.1);
575579
}
576580

577-
.pretty.p-round .state label:before, .pretty.p-round .state label:after {
581+
.pretty.p-round .state label:before,
582+
.pretty.p-round .state label:after {
578583
border-radius: 100%;
579584
}
580585

@@ -589,7 +594,8 @@
589594
transform: scale(0.8);
590595
}
591596

592-
.pretty.p-curve .state label:before, .pretty.p-curve .state label:after {
597+
.pretty.p-curve .state label:before,
598+
.pretty.p-curve .state label:after {
593599
border-radius: 20%;
594600
}
595601

@@ -955,5 +961,3 @@
955961
print-color-adjust: exact;
956962
}
957963
}
958-
959-
/*# sourceMappingURL=maps/pretty-checkbox.css.map */

dist/pretty-checkbox.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "pretty-checkbox",
3-
"version": "3.0.0",
3+
"version": "3.0.1",
44
"description": "A pure css library to beautify checkbox and radio buttons.",
55
"main": "dist/pretty.min.css",
66
"scripts": {
@@ -9,7 +9,7 @@
99
"format": "gulp css:format",
1010
"build": "gulp build",
1111
"ci": "npm run build && git add dist -f && git commit -m \"build(release): auto build [ci skip]\"",
12-
"release": "corp-semantic-release --branch master",
12+
"release": "corp-semantic-release",
1313
"log": "conventional-github-releaser -p angular -r 0"
1414
},
1515
"dependencies": {},
@@ -51,7 +51,10 @@
5151
"toggle",
5252
"sass",
5353
"css3",
54-
"animation"
54+
"animation",
55+
"pretty",
56+
"check",
57+
"colors"
5558
],
5659
"author": "Lokesh Rajendran",
5760
"license": "MIT",

src/scss/_variables.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,4 @@ $pretty-top-offset-switch: calc((0% - (100% - 1em)) - #{$pretty-top-switch});
3636

3737
// dev
3838
$pretty--debug: false !default;
39-
$pretty--err-message: 'Invalid input type!' !default;
39+
$pretty--err-message: 'Error: Invalid input type!' !default;

src/scss/elements/switch/_general.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
.#{$pretty--class-name}.p-switch {
22
input{
3-
width:2em;
3+
min-width:2em;
44
}
55
.state {
66
position: relative;

0 commit comments

Comments
 (0)