Merge branch 'master' of github.com:NervJS/taro

NervJS · Dec 29, 2018 · 8974e97 · 8974e97
2 parents 90901cc + abd265d
commit 8974e97
Show file tree

Hide file tree

Showing 6 changed files with 70 additions and 56 deletions.
diff --git a/docs/composition.md b/docs/composition.md
@@ -10,7 +10,7 @@ title: Taro 组成
 | [`@tarojs/taro-weapp`](https://www.npmjs.com/package/@tarojs/taro-weapp) |  taro 微信小程序运行时框架  |
 | [`@tarojs/redux`](https://www.npmjs.com/package/@tarojs/redux) |  taro Redux 支持  |
 | [`@tarojs/router`](https://www.npmjs.com/package/@tarojs/router) |  taro h5 路由  |
-| [`@tarojs/async-await`](https://www.npmjs.com/package/@tarojs/async-await)      |  支持使用 asyn/await 语法  |
+| [`@tarojs/async-await`](https://www.npmjs.com/package/@tarojs/async-await)      |  支持使用 async/await 语法  |
 | [`@tarojs/cli`](https://www.npmjs.com/package/@tarojs/cli) | taro 开发工具   |
 | [`@tarojs/taro-rn-runner`](https://www.npmjs.com/package/@tarojs/rn-runner) |  taro ReactNative 打包编译工具  |
 | [`@tarojs/webpack-runner`](https://www.npmjs.com/package/@tarojs/webpack-runner) |  taro h5 端 webpack 打包编译工具  |

diff --git a/packages/taro-cli/templates/default/pkg b/packages/taro-cli/templates/default/pkg
@@ -20,36 +20,36 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@tarojs/components": "^<%= version %>",
-    "@tarojs/router": "^<%= version %>",
-    "@tarojs/taro": "^<%= version %>",
-    "@tarojs/taro-alipay": "^<%= version %>",
-    "@tarojs/taro-h5": "^<%= version %>",
-    "@tarojs/taro-swan": "^<%= version %>",
-    "@tarojs/taro-tt": "^<%= version %>",
-    "@tarojs/taro-weapp": "^<%= version %>",
+    "@tarojs/components": "<%= version %>",
+    "@tarojs/router": "<%= version %>",
+    "@tarojs/taro": "<%= version %>",
+    "@tarojs/taro-alipay": "<%= version %>",
+    "@tarojs/taro-h5": "<%= version %>",
+    "@tarojs/taro-swan": "<%= version %>",
+    "@tarojs/taro-tt": "<%= version %>",
+    "@tarojs/taro-weapp": "<%= version %>",
     "nervjs": "^1.3.9",
     "nerv-devtools": "^1.3.9"
   },
   "devDependencies": {
     "@types/react": "^16.4.6",
     "@types/webpack-env": "^1.13.6",
-    "@tarojs/plugin-babel": "^<%= version %>",
-    "@tarojs/plugin-csso": "^<%= version %>",<% if (css !== 'none') {%>
-    "@tarojs/plugin-<%= css %>": "^<%= version %>",<%}%>
-    "@tarojs/plugin-uglifyjs": "^<%= version %>",
-    "@tarojs/webpack-runner": "^<%= version %>",
+    "@tarojs/plugin-babel": "<%= version %>",
+    "@tarojs/plugin-csso": "<%= version %>",<% if (css !== 'none') {%>
+    "@tarojs/plugin-<%= css %>": "<%= version %>",<%}%>
+    "@tarojs/plugin-uglifyjs": "<%= version %>",
+    "@tarojs/webpack-runner": "<%= version %>",
     "babel-plugin-transform-class-properties": "^6.24.1",
     "babel-plugin-transform-decorators-legacy": "^1.3.4",
     "babel-plugin-transform-jsx-stylesheet": "^0.6.5",
     "babel-plugin-transform-object-rest-spread": "^6.26.0",
     "babel-preset-env": "^1.6.1",
     "babel-eslint": "^8.2.3",
     "eslint": "^4.19.1",
-    "eslint-config-taro": "^<%= version %>",
+    "eslint-config-taro": "<%= version %>",
     "eslint-plugin-react": "^7.8.2",
     "eslint-plugin-import": "^2.12.0",
-    "eslint-plugin-taro": "^<%= version %>"<% if (typescript) {%>,
+    "eslint-plugin-taro": "<%= version %>"<% if (typescript) {%>,
     "eslint-plugin-typescript": "^0.12.0",
     "typescript": "^3.0.1"<%}%>
   }

diff --git a/packages/taro-cli/templates/mobx/pkg b/packages/taro-cli/templates/mobx/pkg
@@ -21,41 +21,41 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@tarojs/components": "^<%= version %>",
-    "@tarojs/router": "^<%= version %>",
-    "@tarojs/taro": "^<%= version %>",
-    "@tarojs/taro-alipay": "^<%= version %>",
-    "@tarojs/taro-h5": "^<%= version %>",
-    "@tarojs/taro-swan": "^<%= version %>",
-    "@tarojs/taro-tt": "^<%= version %>",
-    "@tarojs/taro-weapp": "^<%= version %>",
-    "@tarojs/rn-runner": "^<%= version %>",
-    "@tarojs/mobx": "^<%= version %>",
-    "@tarojs/mobx-h5": "^<%= version %>",
-    "@tarojs/mobx-rn": "^<%= version %>",
+    "@tarojs/components": "<%= version %>",
+    "@tarojs/router": "<%= version %>",
+    "@tarojs/taro": "<%= version %>",
+    "@tarojs/taro-alipay": "<%= version %>",
+    "@tarojs/taro-h5": "<%= version %>",
+    "@tarojs/taro-swan": "<%= version %>",
+    "@tarojs/taro-tt": "<%= version %>",
+    "@tarojs/taro-weapp": "<%= version %>",
+    "@tarojs/rn-runner": "<%= version %>",
+    "@tarojs/mobx": "<%= version %>",
+    "@tarojs/mobx-h5": "<%= version %>",
+    "@tarojs/mobx-rn": "<%= version %>",
     "mobx": "4.8.0",
     "nervjs": "^1.3.9",
     "nerv-devtools": "^1.3.9"
   },
   "devDependencies": {
     "@types/react": "16.3.14",
     "@types/webpack-env": "^1.13.6",
-    "@tarojs/plugin-babel": "^<%= version %>",
-    "@tarojs/plugin-csso": "^<%= version %>",<% if (css !== 'none') {%>
-    "@tarojs/plugin-<%= css %>": "^<%= version %>",<%}%>
-    "@tarojs/plugin-uglifyjs": "^<%= version %>",
-    "@tarojs/webpack-runner": "^<%= version %>",
+    "@tarojs/plugin-babel": "<%= version %>",
+    "@tarojs/plugin-csso": "<%= version %>",<% if (css !== 'none') {%>
+    "@tarojs/plugin-<%= css %>": "<%= version %>",<%}%>
+    "@tarojs/plugin-uglifyjs": "<%= version %>",
+    "@tarojs/webpack-runner": "<%= version %>",
     "babel-plugin-transform-class-properties": "^6.24.1",
     "babel-plugin-transform-decorators-legacy": "^1.3.4",
     "babel-plugin-transform-jsx-stylesheet": "^0.6.5",
     "babel-plugin-transform-object-rest-spread": "^6.26.0",
     "babel-preset-env": "^1.6.1",
     "babel-eslint": "^8.2.3",
     "eslint": "^4.19.1",
-    "eslint-config-taro": "^<%= version %>",
+    "eslint-config-taro": "<%= version %>",
     "eslint-plugin-react": "^7.8.2",
     "eslint-plugin-import": "^2.12.0",
-    "eslint-plugin-taro": "^<%= version %>"<% if (typescript) {%>,
+    "eslint-plugin-taro": "<%= version %>"<% if (typescript) {%>,
     "typescript": "^3.0.1"<%}%>
   }
 }
diff --git a/packages/taro-cli/templates/redux/pkg b/packages/taro-cli/templates/redux/pkg
@@ -20,17 +20,17 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@tarojs/async-await": "^<%= version %>",
-    "@tarojs/components": "^<%= version %>",
-    "@tarojs/redux": "^<%= version %>",
-    "@tarojs/redux-h5": "^<%= version %>",
-    "@tarojs/router": "^<%= version %>",
-    "@tarojs/taro": "^<%= version %>",
-    "@tarojs/taro-alipay": "^<%= version %>",
-    "@tarojs/taro-h5": "^<%= version %>",
-    "@tarojs/taro-swan": "^<%= version %>",
-    "@tarojs/taro-tt": "^<%= version %>",
-    "@tarojs/taro-weapp": "^<%= version %>",
+    "@tarojs/async-await": "<%= version %>",
+    "@tarojs/components": "<%= version %>",
+    "@tarojs/redux": "<%= version %>",
+    "@tarojs/redux-h5": "<%= version %>",
+    "@tarojs/router": "<%= version %>",
+    "@tarojs/taro": "<%= version %>",
+    "@tarojs/taro-alipay": "<%= version %>",
+    "@tarojs/taro-h5": "<%= version %>",
+    "@tarojs/taro-swan": "<%= version %>",
+    "@tarojs/taro-tt": "<%= version %>",
+    "@tarojs/taro-weapp": "<%= version %>",
     "nervjs": "^1.3.9",
     "nerv-devtools": "^1.3.9",
     "redux": "^4.0.0",
@@ -40,22 +40,22 @@
   "devDependencies": {
     "@types/react": "^16.4.8",
     "@types/webpack-env": "^1.13.6",
-    "@tarojs/plugin-babel": "^<%= version %>",
-    "@tarojs/plugin-csso": "^<%= version %>",<% if (css !== 'none') {%>
-    "@tarojs/plugin-<%= css %>": "^<%= version %>",<%}%>
-    "@tarojs/plugin-uglifyjs": "^<%= version %>",
-    "@tarojs/webpack-runner": "^<%= version %>",
+    "@tarojs/plugin-babel": "<%= version %>",
+    "@tarojs/plugin-csso": "<%= version %>",<% if (css !== 'none') {%>
+    "@tarojs/plugin-<%= css %>": "<%= version %>",<%}%>
+    "@tarojs/plugin-uglifyjs": "<%= version %>",
+    "@tarojs/webpack-runner": "<%= version %>",
     "babel-plugin-transform-class-properties": "^6.24.1",
     "babel-plugin-transform-decorators-legacy": "^1.3.4",
     "babel-plugin-transform-jsx-stylesheet": "^0.6.5",
     "babel-plugin-transform-object-rest-spread": "^6.26.0",
     "babel-preset-env": "^1.6.1",
     "babel-eslint": "^8.2.3",
     "eslint": "^4.19.1",
-    "eslint-config-taro": "^<%= version %>",
+    "eslint-config-taro": "<%= version %>",
     "eslint-plugin-react": "^7.8.2",
     "eslint-plugin-import": "^2.12.0",
-    "eslint-plugin-taro": "^<%= version %>"<% if (typescript) {%>,
+    "eslint-plugin-taro": "<%= version %>"<% if (typescript) {%>,
     "eslint-plugin-typescript": "^0.12.0",
     "typescript": "^3.0.1"<%}%>
   }

diff --git a/packages/taro-components/src/components/textarea/index.js b/packages/taro-components/src/components/textarea/index.js
@@ -25,7 +25,7 @@ class Textarea extends Nerv.Component {
       className = '',
       placeholder = '',
       disabled,
-      maxLength = 140,
+      maxlength = 140,
       onChange,
       onFocus,
       onBlur,
@@ -46,7 +46,7 @@ class Textarea extends Nerv.Component {
         className={className}
         placeholder={placeholder}
         disabled={disabled}
-        maxlength={maxLength}
+        maxlength={maxlength}
         autofocus={autoFocus}
         onChange={onChange}
         onFocus={onFocus}

diff --git a/website/static/css/custom.css b/website/static/css/custom.css
@@ -26,7 +26,21 @@
 .col {
   flex: 1;
 }
-
+.fixedHeaderContainer header .logo {
+  width: 30px;
+  height: auto;
+}
+.home_container {
+  background: rgb(40, 43, 46);
+}
+.projectTitle {
+  color: #fff;
+  height: 300px;
+}
+.homeSplashFade .projectTitle small {
+  line-height: 1.5em;
+  margin-top: 3em;
+}
 .home_container .button {
   border-color: #fff;
   color: #fff;