Merge branch 'master' into master

Anooj7 · May 15, 2017 · 201884e · 201884e
2 parents 61b6e1f + 7d6e521
commit 201884e
Show file tree

Hide file tree

Showing 121 changed files with 10,197 additions and 1,266 deletions.
diff --git a/.gitignore b/.gitignore
@@ -10,10 +10,12 @@ donate/*.html
 examples/index.html
 get-started/index.html
 vue/*.html
+react/*.html
 plugins/index.html
 showcase/index.html
 icons/index.html
 tutorials/*.html
 index.html
 remote.json
 nbproject
+react-jade-temp/
diff --git a/css/main.css b/css/main.css
@@ -68,6 +68,9 @@ a {
 a:hover {
   text-decoration: underline;
 }
+ul {
+  padding-left: 30px;
+}
 li {
   margin: 5px 0;
 }

diff --git a/dist/css/framework7.ios.colors.css b/dist/css/framework7.ios.colors.css
diff --git a/dist/css/framework7.ios.colors.min.css b/dist/css/framework7.ios.colors.min.css