Merge branch 'master' into canary

# Conflicts: # dist/sweetalert2.all.js # dist/sweetalert2.all.min.js # dist/sweetalert2.common.js # dist/sweetalert2.css # dist/sweetalert2.js # dist/sweetalert2.min.css # dist/sweetalert2.min.js # gulpfile.js # package.json
sweetalert2 · Jan 25, 2018 · dcf8a72 · dcf8a72
2 parents 3e74a42 + a9092da
commit dcf8a72
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 33 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,17 +7,14 @@ addons:
   firefox: latest
   google-chrome: latest
 
-before_script:
-  - gulp
-  - bundlesize -f dist/sweetalert2.all.min.js -s 15kB
-
 script:
-  # unit tests against dist/sweetalert2.js
-  - xvfb-run testem ci --reporter dot
+  # xvfb-run is needed for headless testing with Chrome and Firefox
+  - xvfb-run npm test
 
-  # unit tests against dist/sweetalert2.all.min.js
+after_script:
+  # repeat unit tests against dist/sweetalert2.all.min.js
   - sed -i 's/sweetalert2.js/sweetalert2.all.min.js/g' testem.json
-  - xvfb-run testem ci --reporter dot
+  - xvfb-run npm run check:tests
 
 deploy:
   api_key:

diff --git a/gulpfile.js b/gulpfile.js
@@ -85,9 +85,11 @@ gulp.task('ts-lint', () => {
     .pipe(tslint.report())
 })
 
-gulp.task('default', ['sass', 'ts', 'compress'])
+gulp.task('build', ['sass', 'ts', 'compress'])
 
-gulp.task('watch', () => {
+gulp.task('default', ['build'])
+
+gulp.task('watch', ['default'], () => {
   browserSync.init({
     port: 8080,
     notify: false,

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sweetalert2",
-  "version": "7.6.3",
+  "version": "7.7.0",
   "repository": "sweetalert2/sweetalert2",
   "homepage": "https://sweetalert2.github.io/",
   "description": "A beautiful, responsive, customizable and accessible (WAI-ARIA) replacement for JavaScript's popup boxes, supported fork of sweetalert",
@@ -20,6 +20,7 @@
     "gulp-clean-css": "^3.9.0",
     "gulp-rename": "latest",
     "gulp-rollup": "latest",
+    "gulp-run": "^1.7.1",
     "gulp-sass": "latest",
     "gulp-sass-lint": "latest",
     "gulp-standard": "^8.0.0",
@@ -67,9 +68,16 @@
     "node": ">=0.10.0"
   },
   "scripts": {
-    "test": "testem ci",
-    "lint-dts": "tslint sweetalert2.d.ts --format verbose",
-    "check-dts": "tsc sweetalert2.d.ts && npm run lint-dts"
+    "start": "gulp watch",
+    "fix:lint": "standard --fix",
+    "test": "npm run build && npm run check",
+    "build": "gulp build",
+    "check": "npm run check:bundlesize && npm run check:tests && npm run check:ts",
+    "check:bundlesize": "bundlesize -f dist/sweetalert2.all.min.js -s 15kB",
+    "check:tests": "testem ci",
+    "check:ts": "tsc sweetalert2.d.ts",
+    "assume-dist-unchanged": "git ls-files dist | tr '\\n' ' ' | xargs git update-index --assume-unchanged",
+    "no-assume-dist-unchanged": "git ls-files dist | tr '\\n' ' ' | xargs git update-index --no-assume-unchanged"
   },
   "bugs": "https://github.com/sweetalert2/sweetalert2/issues",
   "license": "MIT"

diff --git a/src/variables.scss b/src/variables.scss
@@ -24,32 +24,32 @@ $swal2-input-box-shadow-focus:     #c4e6f5 !default;
 $swal2-validationerror-background: #ea7d7d !default;
 $swal2-validationerror-color:      $swal2-white !default;
 
-$swal2-focus-outline: rgba(50, 100, 150, .4);
+$swal2-focus-outline: rgba(50, 100, 150, .4) !default;
 
 $swal2-confirm-button-color: #3085d6 !default;
 $swal2-cancel-button-color: #aaa !default;
 
-$swal2-font: 'Helvetica Neue', Helvetica, Arial, sans-serif;
-$swal2-font-size: 1rem;
+$swal2-font: inherit !default;
+$swal2-font-size: 1rem !default;
 
-$swal2-width: 32em;
-$swal2-toast-width: auto;
+$swal2-width: 32em !default;
+$swal2-toast-width: auto !default;
 
-$swal2-padding: 1.25em;
-$swal2-toast-padding: .625em;
+$swal2-padding: 1.25em !default;
+$swal2-toast-padding: .625em !default;
 
-$swal2-title-font-size: 1.875em;
-$swal2-content-font-size: 1.125em;
-$swal2-input-font-size: 1.125em;
-$swal2-validation-font-size: 1em;
-$swal2-buttons-font-size: 1.0625em;
+$swal2-title-font-size: 1.875em !default;
+$swal2-content-font-size: 1.125em !default;
+$swal2-input-font-size: 1.125em !default;
+$swal2-validation-font-size: 1em !default;
+$swal2-buttons-font-size: 1.0625em !default;
 
-$swal2-toast-title-font-size: 1em;
-$swal2-toast-content-font-size: .875em;
-$swal2-toast-input-font-size: 1em;
-$swal2-toast-validation-font-size: 1em;
-$swal2-toast-buttons-font-size: 1em;
+$swal2-toast-title-font-size: 1em !default;
+$swal2-toast-content-font-size: .875em !default;
+$swal2-toast-input-font-size: 1em !default;
+$swal2-toast-validation-font-size: 1em !default;
+$swal2-toast-buttons-font-size: 1em !default;
 
-$swal2-close-button-size: 2.5em;
+$swal2-close-button-size: 2.5em !default;
 
-$swal2-progress-steps-distance: 2.5em;
+$swal2-progress-steps-distance: 2.5em !default;