Merge branch 'master' of https://github.com/syt123450/IOGlobe into HEAD

syt123450 · Feb 24, 2018 · 4382c21 · 4382c21
2 parents da56ca2 + 583baec
commit 4382c21
Show file tree

Hide file tree

Showing 28 changed files with 1,105 additions and 282 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,4 +2,6 @@
 node_modules/
 coverage/
 .DS_Store
-react-giojs/test/js/build/
+react-giojs/test/js/build/
+package-lock.json
+react-giojs/package-lock.json
diff --git a/.travis.yml b/.travis.yml
@@ -3,3 +3,6 @@ node_js:
   - "8"
 after_success:
   - npm run coveralls
+branches:
+  except:
+    - gh-pages
diff --git a/assets/images/document/styles/BlueInkStyle.png b/assets/images/document/styles/BlueInkStyle.png
diff --git a/assets/images/document/styles/EarlySpringStyle.png b/assets/images/document/styles/EarlySpringStyle.png
diff --git a/assets/images/document/styles/FrozenBerryStyle.png b/assets/images/document/styles/FrozenBerryStyle.png
diff --git a/assets/images/document/styles/GorgeousDreamStyle.png b/assets/images/document/styles/GorgeousDreamStyle.png
diff --git a/assets/images/document/styles/JuicyCakeStyle.png b/assets/images/document/styles/JuicyCakeStyle.png
diff --git a/assets/images/document/styles/LemonGateStyle.png b/assets/images/document/styles/LemonGateStyle.png
diff --git a/assets/images/document/styles/MagicStyle.png b/assets/images/document/styles/MagicStyle.png
diff --git a/assets/images/document/styles/MintStyle.png b/assets/images/document/styles/MintStyle.png
diff --git a/assets/images/document/styles/NearMoonStyle.png b/assets/images/document/styles/NearMoonStyle.png
diff --git a/assets/images/document/styles/OctoberPartyStyle.png b/assets/images/document/styles/OctoberPartyStyle.png
diff --git a/assets/images/document/styles/RedBlueStyle.png b/assets/images/document/styles/RedBlueStyle.png
diff --git a/assets/images/document/styles/StrawberryStyle.png b/assets/images/document/styles/StrawberryStyle.png
diff --git a/assets/images/document/styles/SunsetStyle.png b/assets/images/document/styles/SunsetStyle.png
diff --git a/build/gio.js b/build/gio.js
diff --git a/build/gio.min.js b/build/gio.min.js