From 70ec4135373492f8bb07f8f64157684fbbbf51c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B9=90=E4=BB=AA?= Date: Fri, 24 Feb 2017 16:34:10 +0800 Subject: [PATCH] fix Layout demo, update documentation. --- components/layout/demo/basic.md | 4 ++-- components/layout/index.en-US.md | 10 +++++----- components/layout/index.zh-CN.md | 10 +++++----- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/components/layout/demo/basic.md b/components/layout/demo/basic.md index fc61462c76..395088a351 100644 --- a/components/layout/demo/basic.md +++ b/components/layout/demo/basic.md @@ -45,11 +45,11 @@ ReactDOM.render( Sider - +
Header
Content -
+
, mountNode); diff --git a/components/layout/index.en-US.md b/components/layout/index.en-US.md index e0d9fca314..5783471909 100644 --- a/components/layout/index.en-US.md +++ b/components/layout/index.en-US.md @@ -9,11 +9,11 @@ When you are handling the overall layout of a page, this component might be help ## Overview -- `Layout`: The layout wrapper, in which `Header` `Sider` `Content` `Footer` or `Layout` itself can be nested. -- `Header`: The top layout with default style. -- `Sider`: The sidebar with default style and basic functions. -- `Content`: The content layout with default style. -- `Footer`: The bottom layout with default style. +- `Layout`: The layout wrapper, in which `Header` `Sider` `Content` `Footer` or `Layout` itself can be nested, and can be placed in any parent container. +- `Header`: The top layout with default style, in which any element can be nested, and must be placed in `Layout`. +- `Sider`: The sidebar with default style and basic functions, in which any element can be nested, and must be placed in `Layout`. +- `Content`: The content layout with default style, in which any element can be nested, and must be placed in `Layout`. +- `Footer`: The bottom layout with default style, in which any element can be nested, and must be placed in `Layout`. > Base on `flex layout`, please pay attention to the [compatibility](http://caniuse.com/#search=flex). diff --git a/components/layout/index.zh-CN.md b/components/layout/index.zh-CN.md index 8898f48091..f12a835b99 100644 --- a/components/layout/index.zh-CN.md +++ b/components/layout/index.zh-CN.md @@ -10,11 +10,11 @@ title: Layout ## 概述 -- `Layout`:布局容器,其下可嵌套 `Header` `Sider` `Content` `Footer` 或 `Layout` 本身。 -- `Header`:顶部布局,自带默认样式。 -- `Sider`:侧边栏,自带默认样式及基本功能。 -- `Content`:内容部分,自带默认样式。 -- `Footer`:底部布局,自带默认样式。 +- `Layout`:布局容器,其下可嵌套 `Header` `Sider` `Content` `Footer` 或 `Layout` 本身,可以放在任何父容器中。 +- `Header`:顶部布局,自带默认样式,其下可嵌套任何元素,只能放在 `Layout` 中。 +- `Sider`:侧边栏,自带默认样式及基本功能,其下可嵌套任何元素,只能放在 `Layout` 中。 +- `Content`:内容部分,自带默认样式,其下可嵌套任何元素,只能放在 `Layout` 中。 +- `Footer`:底部布局,自带默认样式,其下可嵌套任何元素,只能放在 `Layout` 中。 > 注意:采用 flex 布局实现,请注意[浏览器兼容性](http://caniuse.com/#search=flex)问题。