This is an automated email from the ASF dual-hosted git repository.
moshen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-weex-site.git
The following commit(s) were added to refs/heads/master by this push:
new ad2c850 Update for overflow style.
ad2c850 is described below
commit ad2c8507728a89947d8a2adbceaa88d439b513e8
Author: wqyfavor <[email protected]>
AuthorDate: Fri Jun 7 10:04:23 2019 +0800
Update for overflow style.
---
docs/docs/styles/common-styles.md | 5 +++--
docs/zh/docs/styles/common-styles.md | 3 ++-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/docs/docs/styles/common-styles.md
b/docs/docs/styles/common-styles.md
index 6ab9d4f..71150b8 100644
--- a/docs/docs/styles/common-styles.md
+++ b/docs/docs/styles/common-styles.md
@@ -22,7 +22,8 @@ Weex only supports `box-sizing:border-box`, in which box size
includes `content`
:::
::: warning
-Weex only supports `overflow:hidden`.
+* On Android, Weex only supports `overflow:hidden`.
+* On iOS, before version 0.24, Weex behaves the same as browser, so overflow
is visible by default. From 0.25, overflow on iOS is hidden by default. And
`overflow` is ignored on iOS. You should use 'ios-overflow' to set overflow
value on iOS. Please refer to this
[Demo](http://editor.weex.io/vue/5033e82e4341472a4a218ca3bd8ca7f3)
:::
The following code snippets shows the basic usage of box model
@@ -92,7 +93,7 @@ The border-color shorthand CSS property sets the color of all
sides of an elemen
:::
::: danger Only for Android
-Although `overflow:hidden` is default on android, a view **will not** clip its
children according to `border-radius` unless all the following conditions meet.
+Although `overflow:hidden` is default on Android, a view **will not** clip its
children according to `border-radius` unless all the following conditions meet.
* The view type is `div`, `a`, `cell`, `refresh` or `loading`.
* OS version is Android 4.3 or higher.
* OS version is **not** Android 7.0
diff --git a/docs/zh/docs/styles/common-styles.md
b/docs/zh/docs/styles/common-styles.md
index d850d73..fe10f38 100644
--- a/docs/zh/docs/styles/common-styles.md
+++ b/docs/zh/docs/styles/common-styles.md
@@ -23,7 +23,8 @@ Weex 盒模型的 box-sizing 默认为 border-box，即盒子的宽高包含内
:::
::: warning
-Weex 只支持 `overflow:hidden`.
+* 在 Android 平台，Weex 只支持 `overflow:hidden`。
+* 在 iOS 上，0.24版本及以前，Weex 与浏览器行为一致，`overflow` 默认是 `visible`。从 0.25 版本开始，默认改为
`hidden`。同时 `overflow` 样式在 iOS 上会被忽略。你需要使用 `ios-overflow` 样式名称来指定。可参考
[样例](http://editor.weex.io/vue/5033e82e4341472a4a218ca3bd8ca7f3)
:::
下面的例子显示了盒模型的基本用法
