Merge branch 'master' into master

mysky528 · Jan 14, 2020 · 7124313 · 7124313
2 parents 77c35fe + 9c753ef
commit 7124313
Show file tree

Hide file tree

Showing 157 changed files with 4,078 additions and 3,206 deletions.
diff --git a/.browserslistrc b/.browserslistrc
@@ -0,0 +1,13 @@
+# https://github.com/browserslist/browserslist#readme
+
+>= 1%
+last 1 major version
+not dead
+Chrome >= 60
+Firefox >= 60
+Edge >= 15.15063
+Explorer 11
+iOS >= 10
+Safari >= 10
+Android >= 6
+not ExplorerMobile <= 11
diff --git a/README.md b/README.md
@@ -39,7 +39,7 @@ After installation, run `npm install` and then run `npm start` which will open u
 -   `gulp js` minifies the themes JS file
 -   `gulp vendor` copies dependencies from node_modules to the vendor directory
 
-You must have npm and Gulp installed globally on your machine in order to use these features. This theme was built using node v11.6.0 and the Gulp CLI v2.0.1. If Gulp is not running properly after running `npm install`, you may need to update node and/or the Gulp CLI locally.
+You must have npm installed globally in order to use this build environment. This theme was built using node v11.6.0 and the Gulp CLI v2.0.1. If Gulp is not running properly after running `npm install`, you may need to update node and/or the Gulp CLI locally.
 
 ## Bugs and Issues