breakpoints of Layout.Sider should be same as Grid

close ant-design#8620
lovekonakona · Dec 15, 2017 · 7521348 · 7521348
1 parent f54d736
commit 7521348
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/components/layout/Sider.tsx b/components/layout/Sider.tsx
@@ -22,10 +22,11 @@ import Icon from '../icon';
 
 const dimensionMap = {
   xs: '480px',
-  sm: '768px',
-  md: '992px',
-  lg: '1200px',
-  xl: '1600px',
+  sm: '576px',
+  md: '768px',
+  lg: '992px',
+  xl: '1200px',
+  xxl: '1600px',
 };
 
 export type CollapseType = 'clickTrigger' | 'responsive';
@@ -42,7 +43,7 @@ export interface SiderProps {
   trigger?: React.ReactNode;
   width?: number | string;
   collapsedWidth?: number | string;
-  breakpoint?: 'xs' | 'sm' | 'md' | 'lg' | 'xl';
+  breakpoint?: 'xs' | 'sm' | 'md' | 'lg' | 'xl' | 'xxl';
 }
 
 export interface SliderState {

diff --git a/components/layout/index.en-US.md b/components/layout/index.en-US.md
@@ -86,7 +86,7 @@ The sidebar.
 
 | Property | Description | Type | Default |
 | -------- | ----------- | ---- | ------- |
-| breakpoint | breakpoint of the responsive layout | Enum { 'xs', 'sm', 'md', 'lg', 'xl' } | - |
+| breakpoint | [breakpoints](/components/grid#api) of the responsive layout | Enum { 'xs', 'sm', 'md', 'lg', 'xl', 'xxl' } | - |
 | className | container className | string | - |
 | collapsed | to set the current status | boolean | - |
 | collapsedWidth | width of the collapsed sidebar, by setting to `0` a special trigger will appear | number | 64 |

diff --git a/components/layout/index.zh-CN.md b/components/layout/index.zh-CN.md
@@ -87,7 +87,7 @@ title: Layout
 
 | 参数 | 说明 | 类型 | 默认值 |
 | --- | --- | --- | --- |
-| breakpoint | 触发响应式布局的断点 | Enum { 'xs', 'sm', 'md', 'lg', 'xl' } | - |
+| breakpoint | 触发响应式布局的[断点](/components/grid#api) | Enum { 'xs', 'sm', 'md', 'lg', 'xl', 'xxl' } | - |
 | className | 容器 className | string | - |
 | collapsed | 当前收起状态 | boolean | - |
 | collapsedWidth | 收缩宽度，设置为 0 会出现特殊 trigger | number | 64 |