Merge branch '2.x' into dev

2020-11-08 17:02:26 +08:00
parent 1022969ae4 85e1548fc5
commit f85ebfb222
12 changed files with 137 additions and 54 deletions
@@ -64,6 +64,7 @@ export default {
 | fixed | Whether to fixed top | _boolean_ | `false` |
 | placeholder `v2.5.9` | Whether to generage a placeholder element when fixed | _boolean_ | `false` |
 | z-index | Z-index | _number \| string_ | `1` |
+| safe-area-inset-top `v2.10.13` | Whether to enable top safe area adaptation | _boolean_ | `false` |

 ### Slots