Commit Graph

219 Commits

Author SHA1 Message Date
HeskeyBaozi
6c42d711e8 Merge branch 'feature-3.8.0' of https://github.com/ant-design/ant-design into feature/svg-icon 2018-07-31 15:36:23 +08:00
Ilan Hasanov
8ee70e84b6 💬 update layout copyrights year and fix typos 2018-07-29 01:15:02 +08:00
HeskeyBaozi
768af40c4c Merge branch 'feature-3.8.0' of https://github.com/ant-design/ant-design into feature/svg-icon
# Conflicts:
#	components/drawer/__tests__/__snapshots__/Drawer.test.js.snap
#	components/drawer/__tests__/__snapshots__/DrawerEvent.test.js.snap
#	components/drawer/index.tsx
2018-07-25 12:03:00 +08:00
HeskeyBaozi
bab50e6bed Merge branch 'feature-3.8.0' of https://github.com/ant-design/ant-design into feature/svg-icon
# Conflicts:
#	components/locale-provider/__tests__/__snapshots__/demo.test.js.snap
#	components/locale-provider/__tests__/__snapshots__/index.test.js.snap
#	components/transfer/__tests__/__snapshots__/demo.test.js.snap
#	components/transfer/__tests__/__snapshots__/index.test.js.snap
2018-07-23 09:58:55 +08:00
jljsj33
881cef5abf update drawer 2018-07-22 11:55:46 +08:00
Fred-Shan
c045b79e62 Update index.zh-CN.md
there are two "theme" in the table
2018-07-20 17:38:33 +08:00
HeskeyBaozi
4a553a2006 upgrade test cases 2018-07-19 20:37:47 +08:00
HeskeyBaozi
8df086f022 update test cases 2018-07-18 13:39:02 +08:00
HeskeyBaozi
9338f33c1c update test cases 2018-07-18 10:33:54 +08:00
afc163
8eb8c686ce Merge branch 'master' into feature-3.7.0 2018-07-11 22:21:01 +08:00
陈帅
b3f4e5e3da bugfix: fixed #11152 silder trigger no white theme 2018-07-10 21:06:22 +08:00
Wei Zhu
435558b63e fix: Layout.Sider string width
Close #11211
2018-07-10 12:29:20 +08:00
afc163
56020cda39 Merge branch 'master' into feature-3.7.0 2018-06-27 16:14:14 +08:00
afc163
009ed08580 upgrade eslint-config-airbnb 2018-06-27 16:09:58 +08:00
Wei Zhu
b374297ca6 Merge branch 'master' into feature-3.7.0 2018-06-25 11:44:35 +08:00
Wei Zhu
aa580beb8b docs: sort api table 2018-06-24 17:09:18 +08:00
nuintun
ff24f1a978 Layout.Sider add onBreakpoint porp support (#10750)
* Layout.Sider add onBreakpoint porp support

* Add onBreakpoint zh-CN doc

* Add onBreakpoint en-US doc

* Add demo test for Layout.Sider onBreakpoint

* Add Layout.Sider onBreakpoint test cases
2018-06-03 13:03:20 +08:00
Junbin Huang
bbf5cb75c3
chore: update typescript@~2.9.1 (#10748) 2018-06-02 20:12:09 +08:00
picodoth
e25323882a Merge branch 'feature-3.6.0' 2018-06-02 13:36:05 +08:00
afc163
b5c5f0b5d4 update snapshot 2018-05-29 23:50:49 +08:00
Wu Haotian
4f91fe61bf add z-index for fixed header demo
#10693
2018-05-29 23:49:09 +08:00
Rongjian Zhang
f3869270ae Fix #10142: Add theme props to Layout.Sider (#10631)
* Fix #10142: Add `theme` props to `Layout.Sider`

* Update documentation of Layout.Sider for new theme props

* Fix snapshot tests

* Add unit test for sider theme
2018-05-23 23:46:28 +08:00
Oleg Kuzava
71abb96de7 Allow to use any CSS units for layout width (#10479)
* Allow to use any CSS units for layout width

* Fix ts issues

* Fix parseFloat type check

* add tests for width in Sider

* clean up
2018-05-12 02:30:33 +08:00
afc163
b5a52d26f2 fix snapshot 2018-05-02 14:28:16 +08:00
Junbin Huang
3a3d550b54 chore: upgrade menu (#10305)
* chore: upgrade menu and select

* Add test case for coverage percent
2018-04-29 23:01:58 +08:00
afc163
2078354bc5 Fix collapsedWidth string bug, close #10140 2018-04-22 13:56:23 +08:00
Zach Guo
280f907297 Fix Layout.Sider typos (#9885) 2018-04-01 01:15:42 +08:00
Scott Sturgeon
f2e60209c9 Changed zero-width layout trigger color to use layout-trigger-color var (#9851) 2018-03-29 10:50:58 +08:00
Angga
43e4622ef8 Fixed typo on Visualization rules (#9575)
Style of a navigation should conform to the its level.

should be

Style of a navigation should conform to its level.
2018-03-08 19:14:41 +08:00
Wei Zhu
518c424ca4 Improve Grid and Layout type definition 2018-03-06 15:51:06 +08:00
byuanama
98f938798d Update index.en-US.md (#9479) 2018-03-02 13:18:06 +08:00
MinJeong Kim
feaf238dfa fix: set -has-trigger class in sider when -trigger div exists (#9399)
* fix: set `-has-trigger` class in sider when `-trigger` div exists

* fix: fix template expr lint error
2018-02-24 10:35:04 +08:00
afc163
3a98fce47c Merge branch 'master' into feature-3.2 2018-01-19 15:06:09 +08:00
Reed Sun
a2b6d0a23e docs: 修改 Layout 组件文档中 breakpoint width 与代码不一致的问题 (#8995) 2018-01-17 21:54:54 +08:00
afc163
7aa665cc14 Add hasSider to avoid flickering in ssr
close #8937
2018-01-12 20:44:35 +08:00
afc163
bce66d6b3b fix code style 2017-12-19 16:32:20 +08:00
afc163
754d330bae Hide menu when collapsedWidth is 0, close #8587 2017-12-15 15:15:30 +08:00
afc163
7521348606 breakpoints of Layout.Sider should be same as Grid
close #8620
2017-12-15 14:37:36 +08:00
Wei Zhu
dc322a6a9c Fix implicit any error for Layout 2017-11-21 20:38:30 +08:00
Wei Zhu
b6c6ee8f3e Fix implicit any error for Modal and Menu 2017-11-21 17:38:51 +08:00
Wei Zhu
479a5cb743
Remove allowSyntheticDefaultImports (#8218) 2017-11-17 14:38:54 +08:00
afc163
a4faaad810 Merge branch 'master' into antd-3.0 2017-11-13 10:24:58 +08:00
afc163
cad769af91 No more __ANT_LAYOUT_SIDER in favor of #8077 2017-11-12 15:22:02 +08:00
Wei Zhu
55c85f77a1
Update dependendies (#8150)
* deps: upgrade rc-menu, and close: #2837

* test: update snapshots

* Update rc-calendar

* Update rc-cascader

* Update rc-dialog

* Update dropdown

* Update rc-select@7.1.0

* Update rc-slider

* Update rc-time-picker

* Update rc-tooltip

* Update rc-tree-select

* Mock rc-trigger and Portal

* Fix animation warning when inlineCollapsed changes

* fix: should use SubMenu[popupClassName]

* Fix typescript error

* Fix lint

* fix: style for menu

* Mock rc-trigger for React 15

* Remvoe allow_failures
2017-11-11 00:07:03 +08:00
afc163
b53e76cbd5 Merge branch 'master' into antd-3.0 2017-11-09 20:37:30 +08:00
afc163
ea185fe288 Fix code style 2017-11-09 20:14:51 +08:00
afc163
0eca38ba2f Add has sider test case, ref #8077 2017-11-09 20:13:59 +08:00
Yasin Uslu
b3e1192482 Detect Sider even if it's not first child of layout (#8077)
* Fix typo in layout

* Detect Sider even if it's not first child of layout
2017-11-09 20:04:34 +08:00
Wei Zhu
bbb1a3a828 Merge branch 'master' into antd-3.0 2017-10-25 10:27:38 +08:00
Wei Zhu
36227a10db docs: sort api table 2017-10-25 10:25:44 +08:00