fix merge conflicts

Author: lokesh-coder

.gitignore

@@ -26,4 +26,7 @@ Desktop.ini
 coverage/
 docs
 tmp
-test
+test
+
+# Logs
+.log

.stylelintrc

@@ -1,3 +1,4 @@
 {
-  "extends": "stylelint-config-recommended-scss" 
+  "extends": "stylelint-config-recommended-scss",
+  "rules":{}
 }

.travis.yml

@@ -14,7 +14,7 @@ before_script:
   - 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
+  - git remote add origin https://${GH_TOKEN}@github.com/lokesh-coder/pretty-checkbox.git
   - 'if [ ${TRAVIS_PULL_REQUEST} = "false" ]; then
     git fetch && git checkout master;
     git config push.default current;

Gulpfile.js

@@ -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')
@@ -15,7 +15,6 @@ var reload = browserSync.reload;
 module.exports = gulp;
 
 /* BROWSER SYNC */
-
 gulp.task('browser-sync', function () {
   browserSync({
     port: 3040,
@@ -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
@@ -63,7 +63,6 @@ gulp.task('compile:scss', function () {
 });
 
 /* FORMAT CSS */
-
 gulp.task('format:css', function () {
   return gulp.src('dist/*.css')
     .pipe(stylefmt())
@@ -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 %>
@@ -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']);
 });

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2017 Lokesh Rajendran
+Copyright (c) 2017 Lokesh Rajendran ( lokesh.aero@gmail.com )
 
 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:
 

README.md

@@ -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!* )

dist/pretty-checkbox.css

@@ -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);
@@ -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;
 }
 
@@ -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);
 }
 
@@ -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;
@@ -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%;
 }
 
@@ -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%;
 }
 
@@ -955,5 +961,3 @@
     print-color-adjust: exact;
   }
 }
-
-/*# sourceMappingURL=maps/pretty-checkbox.css.map */

dist/pretty-checkbox.min.css

@@ -51,7 +51,10 @@
     "toggle",
     "sass",
     "css3",
-    "animation"
+    "animation",
+    "pretty",
+    "check",
+    "colors"
   ],
   "author": "Lokesh Rajendran",
   "license": "MIT",

package.json

@@ -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;