Commit Graph

537 Commits

Author SHA1 Message Date
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
afc163
3f57d5f56d Merge branch 'master' into antd-3.0 2017-10-23 10:41:51 +08:00
afc163
7286e6d0d0 Fix extra margin in sider Layout
which is a margin collaspe problem

close #7967

ref: https://stackoverflow.com/a/33132624/3040605
2017-10-21 15:12:56 +08:00
afc163
00bfa49031 Merge branch 'master' into antd-3.0 2017-10-16 20:45:25 +08:00
afc163
2a34866e83 update layout demo 2017-10-16 20:39:53 +08:00
Wei Zhu
c5487ad1eb React 16 + Enzyme 3 2017-10-09 19:18:04 +08:00
afc163
4eb9d5ef56 Merge branch 'master' into antd-3.0 2017-10-09 13:33:59 +08:00
afc163
475e4ff23d upgrade eslint-config-airbnb 2017-10-09 13:27:35 +08:00
afc163
054444f619 Merge branch 'master' into antd-3.0 2017-10-07 15:34:19 +08:00
Graeme Yeates
2e2acb5be9 Support customizing layout footer background (#7818) 2017-10-06 16:09:33 +08:00
nikogu
09addde73c Merge branch 'master' into antd-3.0 2017-09-28 17:56:36 +08:00
ddcat1115
3b6dc3f3c4 revert wrong code removing fd40643c2d 2017-09-28 17:28:49 +08:00
偏右
2bced36f0c New component styles (#7731)
* Tweak button padding

* upgrade input and button size

* update form controls size

* update components size

* Add lemon color and update rate color

* Add new icons

* update layout style

* breadcrumb and dropdown

* update menu arrow width

* update layout and menu

* update steps

* fix var name

* update cascasder style

* Update DatePicker

* update InputNumber and Mention

* radio and switch

* select and transfer

* TimePicker & Upload

* more components

* calendar and list

* Tree Timeline Popover Tag

* divider modal popover

* update search input

* update card style

* update switch disabled opacity

* update shoadow and mask

* Add v2-compatible-reset.less

* Fix undefined className

* update snahshotssssssssssssssssss 👻
2017-09-27 22:32:49 +08:00
ChaXinyu
14e2a56b75 export components interface (#7654)
* export components interface

* export specific props

* fix formItem missed import
2017-09-25 22:14:49 +08:00
afc163
fd40643c2d Remove unused code 2017-09-25 11:12:59 +08:00
afc163
3eb4937fd4 Remove unused code 2017-09-25 11:12:38 +08:00
afc163
6507aefd8e Merge branch 'master' into antd-3.0 2017-09-25 10:54:49 +08:00
Zheeeng
d8c1bdb3ab Fix: setting 'heigh: 100%' on Sider and the wrapped element can't take the desired effects (#7716) 2017-09-23 18:33:26 +08:00
偏右
759b0bb821 seperate reset styles (#7682)
* seperate reset styles

* not reset ul/ol/p/heading

* revert reset.less idea

* move label style into ant-form-item, #5851

* revert reset.less idea

* update base.less

* Better typography from bootstrap@4

use reboot replace normalize

ref:
b4d84b9cdf/scss/_reboot.scss

close #6162
2017-09-22 18:33:29 +08:00
Wei Zhu
250c7a9c68 Revert "Mock rc-trigger"
This reverts commit 9d2c91598b.
2017-09-15 16:42:25 +08:00
Wei Zhu
9d2c91598b Mock rc-trigger
Ref #5522
2017-09-15 16:14:26 +08:00
jiang
2570ba8fe6 Menu anim (#7567)
* update menu icon animate

* add padding !important, restore menu retraction animate

* update dropdown arrow
2017-09-12 16:46:33 +08:00
afc163
696b4252a8 tweak collpse animation easing 2017-09-06 13:46:45 +08:00
Khalifa Lame
112aaed5fb docs: update Layout English doc (#7461)
Fixed typos.
2017-09-05 16:48:23 +08:00
afc163
882ae31199 Fix menu inlineCollapsed under uncontrolled Sider, close #7409 2017-09-01 10:38:53 +08:00
afc163
9547fe5bc4 fix demo sanpshot 2017-08-30 14:21:20 +08:00
afc163
56b6fc38d7 fix sider layout min height 2017-08-29 23:58:27 +08:00
afc163
ea92bbf371 fix snap 2017-08-16 22:04:16 +08:00
afc163
f61f811432 Fix sider width transition in IE11
close #6349
2017-08-16 21:46:09 +08:00
afc163
70e10dee59 Fix transition width of sider trigger 2017-08-16 21:46:09 +08:00
afc163
f689ede0fa The collapse trigger of Sider should be fixed and upon menus
close #7161
2017-08-11 16:10:17 +08:00
afc163
500b222556 Fix stretched layout by content
523b4360d2 (commitcomment-23527573)
2017-08-08 13:38:10 +08:00
afc163
b3979885e4 fix demo snapshot 2017-08-04 21:29:30 +08:00
afc163
6a17efcbf1 upgrade some devDeps and fix stylelint 2017-08-04 18:01:40 +08:00
jiang
f1110f2bc5 sync menu and layout-sider animate time (#7047) 2017-08-01 17:36:53 +08:00
Bryan Berger
91400d54fa add less variables for layout-trigger background, color 2017-07-21 14:21:31 -04:00
Benjy Cui
6bdb84a011 docs: update docs, ref: 639e60a 2017-07-19 09:48:07 +08:00
Geoff Holden
639e60af45 docs: added reverseArrow documentation. (#6888) 2017-07-19 09:45:42 +08:00
afc163
f9193952ff Add breakpoint width documentation 2017-07-14 15:47:07 +08:00
afc163
91707b89d8 test: update snapshot 2017-07-13 15:24:53 +08:00
afc163
22e14970ec Improve fixed sider layout implementation, fix #6817 2017-07-13 15:23:34 +08:00
偏右
b653a2c055 Merge branch 'master' into feature-2.12 2017-07-07 19:41:37 +08:00
afc163
883f82172e Fix shadowed name ts errors 2017-07-06 15:37:28 +08:00
afc163
7d3bc4ebd4 update snapshots 2017-06-30 22:02:19 +08:00
afc163
89a37da77f Menu will get collapsed status from Layout.Sider 2017-06-30 21:36:23 +08:00
afc163
dd6d643519 update doc 2017-06-17 14:14:30 +08:00
afc163
a5cc8b33e3 fix menu border in demo 2017-06-15 15:39:55 +08:00
afc163
e62fa2a403 remove overflow:auto in Content 2017-06-15 15:37:24 +08:00
Panjie Setiawan Wicaksono
cc71ab957e better typings for layout components 2017-05-28 02:20:05 +07:00
Benjy Cui
0e5431d21b deps: upgrade antd-tools and code style 2017-05-25 16:54:15 +08:00
Benjy Cui
67c38fa3b4 fix: should hide collapsed children, close: #6131 2017-05-24 10:25:43 +08:00
ddcat1115
b236d73348 fix firefox Layout.Sider can't collapse to zero width (#5833) 2017-04-22 10:38:44 +08:00
乐仪
686cff965c undate 2017-04-10 14:02:00 +08:00
乐仪
69f7cf0c55 add fixed sider 2017-04-10 14:02:00 +08:00
ddcat1115
b24f9cf1e0 fix Layout.Content scrolling style issue (#5480) 2017-03-24 20:07:59 +08:00
偏右
674255bd14 [WIP] upgrade deps (#5455)
* upgrade deps

* autofix some tslint problems

* Fix tslint problems manually
2017-03-23 21:15:49 +08:00
afc163
c361165352 Improve Layout fixed demo 2017-03-18 14:52:23 +08:00
偏右
84e3aa2a37 New design docs (#5370)
* refactor design documentations

* update color document

* Add icon

* Fix images in documentation

* fix some documentation style

* Finish icon doc

* Add copywriting doc

* Add layout.md and navigation.md

* Add more docs

* Fix error color

* improve markdown doc width

* update some details

* fix doc detail

* Add motion.md
2017-03-17 18:56:37 +08:00
Wei Zhu
f6b1e942e3 Jest 19 (#5361)
* Upgeade to jest 19

* Use jest.spyOn
2017-03-17 18:56:30 +08:00
Wei Zhu
67bbae9ea8 Merge branch 'feature-2.8' 2017-03-05 21:34:57 +08:00
ddcat1115
29fa65fcc9 Layout.Sider support responsive display (#4931)
* save

* Layout.Sider support responsive display

* improve

* fix wrong spelling
2017-03-05 21:10:34 +08:00
ddcat1115
00aa253a26 add fixed-header demo for Layout (#5119) 2017-03-05 20:02:53 +08:00
Benjy Cui
758559f718 test: update snapshots 2017-02-28 16:14:53 +08:00
afc163
6a5576d65f Add another layout demo of top-side 2017-02-27 23:46:09 +08:00
afc163
376806dab8 Merge from "master" 2017-02-26 18:45:16 +08:00
ddcat1115
d0db3ce426 fix menu icon not centered in Layout.Sidere (#5039) 2017-02-24 18:04:16 +08:00
afc163
c163232deb fix snap 2017-02-24 17:43:40 +08:00
乐仪
70ec413537 fix Layout demo, update documentation. 2017-02-24 16:34:10 +08:00
ddcat1115
e33bb82e62 change detect type of Layout.Sider (#5036)
* save

* change detect type of Layout.Sider
2017-02-24 16:06:15 +08:00
afc163
0f46eed370 fix lint 2017-02-23 11:45:48 +08:00
ddcat1115
7d3cbfd9d9 fix: menu[mode='vertical'] can not show submenu in Layout.Sider (#4904)
* fix menu[mode='vertical'] can not show submenu in Layout.Sider
close #4890

improve Layout demo

* del useless css
2017-02-17 11:12:52 +08:00
Benjy Cui
200b88246f docs: update docs format 2017-02-13 10:55:53 +08:00
ddcat1115
d71252ea12 improve Layout.Sider's animation effect (#4812) 2017-02-09 15:20:06 +08:00
Valentin Vichnal
6c0dba60e7 Create reverseArrow prop for Sider (#4611)
Create reverseArrow prop for Sider
2017-01-26 12:30:37 +08:00
Wei Zhu
77b78a9389 docs: Unify type naming (#4636)
* Unify name of ReactNode type in document

* Lowser all string type name

* Lowercase all number type name

* Lowercase all boolean type name

* Unify array type

* Lowercase all object type name

* Unify mutilple types
2017-01-20 20:10:50 +08:00
ddcat1115
d2c00fae4b fix Layout demo (#4661)
* fix Layout demo

* update snapshot
2017-01-20 20:09:59 +08:00
Benjy Cui
3e17551b7e site: improve build speed 2017-01-19 15:22:53 +08:00
afc163
e0999eaec3 fix code indent 2017-01-11 11:32:17 +08:00
ddcat1115
6495ef3592 fix Layout style (#4506)
* fix #4459

* improve
2017-01-08 17:03:47 +08:00
afc163
c285f5f651 fix snapshot 2016-12-30 22:36:10 +08:00
afc163
237d6ab62b fix layout demo 2016-12-30 21:44:10 +08:00
偏右
0062867274 Feature 2.6 (#4429)
* new Layout Component (#4087)

* change Anchor type

* new Layout

* Component update && add snap

* Revert "new Layout Component" (#4131)

* add Layout (#4169)

* add Layout

* update

* fix snapshot

* Improve layout component

1. update demo code
2. drop `position` of Sider
3. improve demo style
2016-12-30 21:41:28 +08:00
ddcat1115
0baef0627e docs: 调整组件导航结构 (#3758)
- Layout 更名为 Grid
2016-11-09 14:43:32 +08:00
afc163
d4e13e7616 update layout 2016-11-05 15:46:50 +08:00
Benjy Cui
4878258f6c refactor: ref: #3490 2016-10-24 12:04:26 +08:00
afc163
193cc3fa17 fix demo style 2016-10-10 20:56:17 +08:00
afc163
36e50ed794 Improve Layout demo style
learn from https://www.iviewui.com/components/layout
2016-09-30 14:24:41 +08:00
Benjy Cui
bd7e9f00c0 style: update code style 2016-09-21 11:54:53 +08:00
Benjy Cui
3f67fd3f9f docs: update docs details 2016-09-21 11:28:38 +08:00
feng zhi hao
2cf5dc0046 chore: improve declaration (#3078) 2016-09-19 17:35:17 +08:00
feng zhi hao
cad2d19be2 fix: complete loss declaration (#3068)
* complete loss declaration

* fix error in ts-lint

* fix Icon name error
2016-09-19 10:17:07 +08:00
马斯特
a25ec29fb8 refactor: 保证所有的tsx和less都正确使用prefix (#3024)
* refactor: extract prefix cls as less variable

* refactor: apply ant icon prefix cls in less files

* refactor: all components support prefixCls props
2016-09-14 16:18:33 +08:00
Benjy Cui
8db2b79505 chore: fix compile errors 2016-09-13 15:31:29 +08:00
afc163
363f610d8b Fix tsc errors beside DatePicker 2016-08-24 16:09:55 +08:00
Benjy Cui
5dcce12c2c fix: some tsc errors (#2804) 2016-08-22 17:26:14 +08:00
Benjy Cui
e6280a7ea6 Merge branch '1.x-stable' 2016-08-22 17:05:37 +08:00
afc163
47a3b04eb1 change layout chinese name 2016-08-22 14:51:24 +08:00
Benjy Cui
3411765ce9 Refactor ts (#2760)
* refactor: add interface form Calendar

* refactor: add interface for layout

* refactor: add interface for DatePicker

* refactor: add interface for Icon

* refactor: add interface for InputNumber

* refactor: add interface for Input
2016-08-19 17:11:06 +08:00
afc163
b200f8a2d8 Merge 1.x-stable 2016-08-08 14:12:02 +08:00
Benjy Cui
ca5fe46611 docs: fix demo 2016-08-08 10:57:11 +08:00
The Rock
dc0fc80709 docs(translation): translation for layout (#2635) 2016-08-08 10:40:02 +08:00
afc163
0ad3492fc9 fix markdown 2016-08-06 09:23:12 +08:00
afc163
a93a72e3b0 update layout doc for missing APIs, close #2629 2016-08-06 09:05:17 +08:00
afc163
bb68245b7f Merge 1.x-stable 2016-08-04 14:06:09 +08:00
afc163
32a587ba71 fix empty children inside Row, close #2603 2016-08-03 20:30:17 +08:00
偏右
de359d2cf7 fix tslint problems (#2360) 2016-07-13 11:14:24 +08:00
yiminghe
94706f1d2c fix ts 2016-07-07 20:25:03 +08:00
afc163
d280cba481 Merge 1.x-stable 2016-07-04 15:19:35 +08:00
afc163
09d00f1f30 Fix props warning, close #2253
https://fb.me/react-unknown-prop
2016-07-04 12:13:05 +08:00
yiminghe
9a0d751f94 refactor to typescript 2016-06-22 13:19:48 +08:00
ddcat1115
4af2731f0c fix #1672 (#1936) 2016-06-06 11:40:54 +08:00
afc163
b06cdd08c3 Fix row-flex-space-around, close #1781 2016-05-22 01:52:26 +08:00
afc163
e524f16361 improve Row children render (#1746) 2016-05-20 13:55:00 +08:00
Benjy Cui
8842d9342a site: update components' type 2016-05-16 15:41:55 +08:00
Benjy Cui
ecaa6c56c3 style: enable comma-dangle 2016-05-11 09:32:33 +08:00
afc163
c66a226004 Fix lesshint problems 2016-04-29 17:03:28 +08:00
afc163
0ca6a1c24a css modularize (#1448)
* css modularize

* Add alert style

* Move more component style

* Move iconfont to common style

* Move layout style

* Move more component style

* Move all components

* Fix lots of mixin deps

* remove css-prefix from less

* fix a button icon style bug

* restructure

* fix index

* add dist

* fix jest

* fix some components style

* clean webpack config

* check more components style

* update tabs

* update scripts

* update scripts

* fix form style

* fix more style

* Fix select width

* Fix form and tabs style
2016-04-27 20:44:36 +08:00
afc163
91e690282d update site markdown style 2016-04-18 13:43:33 +08:00
Benjy Cui
047bfc2574 style: enable react/prefer-stateless-function 2016-04-13 17:38:53 +08:00
afc163
3b1f95c346 Fix site style 2016-04-11 11:55:44 +08:00
afc163
299a30d4e7 fix layout demo style 2016-04-10 15:39:24 +08:00
Benjy Cui
bcba08a124 docs: update docs format 2016-04-07 15:36:55 +08:00
Benjy Cui
e76030e0c9 site: style should be placed in less files 2016-04-07 15:36:55 +08:00
Benjy Cui
df3ba36720 docs: remove useless newline in documentation 2016-04-01 10:08:19 +08:00
Benjy Cui
d5a6932c15 docs: update documentation format 2016-03-31 14:17:09 +08:00
Benjy Cui
03d09b66e8 docs: update demo format 2016-03-31 09:40:55 +08:00
Bruce Mitchener
ba965dc746 Convert several React.createClass usages to classes. 2016-03-29 11:13:04 +07:00
Benjy Cui
f67548d60f feat: col-*-0 means display: none 2016-03-24 14:39:41 +08:00
Benjy Cui
2fd2f82986 css: update layout demos' style 2016-03-10 10:50:40 +08:00
Benjy Cui
380deaf54c fix: Row's children could be null 2016-03-10 10:50:40 +08:00
Benjy Cui
203627f4c7 feat: support cols equals '1' 2016-03-10 10:50:36 +08:00
afc163
0f95fdfa0f update layout reponsive demo 2016-03-09 17:50:33 +08:00
afc163
bf25bfe488 reponsive layout 2016-03-07 21:03:17 +08:00
afc163
d9ff420531 Fix Row in form demo 2016-03-07 17:25:59 +08:00
afc163
54db7ec32b Remove layout-fixed 2016-03-07 17:25:59 +08:00
afc163
b4d4fb4d4a update layout demo style 2016-03-07 17:25:58 +08:00
afc163
38f98fa1ee update layout demo doc 2016-03-07 17:25:58 +08:00
afc163
ff2cb6142a Add gutter for Row 2016-03-07 17:25:58 +08:00
Benjy Cui
29825f20c8 style: update code style to please lint 2016-02-17 18:04:42 +08:00
afc163
a16903009e merge from master 2016-01-13 22:22:33 +08:00
Benjy Cui
b72d18fd44 style: update code style to please the fucking lint 2016-01-11 09:49:30 +08:00
afc163
ca2edd2b1d Add pictures 2016-01-10 19:19:14 +08:00
afc163
91bd7f22c0 use mountNode replace the long getElementById 2015-12-29 12:08:58 +08:00
afc163
d6122ab872 typo 2015-12-25 18:14:31 +08:00
afc163
16abf46071 Fix markdown eslint errors, update .eslintrc 2015-11-25 18:10:34 +08:00
afc163
ce76ebfe9b replace rcUtil.classSet by classnames, ref react-component/util#1 2015-11-24 20:03:57 +08:00
afc163
753c01ae18 ES6 syntax for demo code
fix antd.notification
2015-10-28 20:55:49 +08:00
pizn
90c8d17bbe feat: 重构下 className 的写法,支持原有的 className 2015-10-28 18:04:56 +08:00
pizn
68a952fb62 update: 修改 flex demo 2015-10-28 17:24:35 +08:00
pizn
d1e60798af udpate... 2015-10-28 00:02:31 +08:00
pizn
69aaa6c296 Add layout componet for antd 2015-10-27 23:52:17 +08:00
Yuwei Ba
60987b0112 Update offset.md
Typo
2015-10-15 00:10:01 +08:00
afc163
fdf19520d6 Add component type 2015-08-22 20:16:24 +08:00
afc163
ded87acbb3 improve layout demo display 2015-07-30 18:44:39 +08:00
afc163
9acba5d4ae change category 2015-07-29 16:30:26 +08:00
afc163
46ce040efd update layout demo style 2015-07-05 18:59:02 +08:00
pizn
d36e011bbb docs: 修改文案 2015-06-18 15:26:29 +08:00
pizn
72d4f3c369 docs: 更新文档 2015-06-15 17:46:42 +08:00
展新
b430179785 update: 更新文档 2015-06-10 16:28:10 +08:00
afc163
4b5ee40139 文案位置调整 2015-06-10 13:49:15 +08:00
展新
2a3185bbd7 Merge branch 'master' of github.com:ant-design/ant-design 2015-06-10 12:22:23 +08:00
展新
45f8ad1099 change: 删除没用的代码 2015-06-10 12:22:10 +08:00
afc163
8c7bd7aeb7 Add some text 2015-06-10 12:19:16 +08:00
展新
c3a8b5c39f changed: 修改flex的class书写方式 2015-06-10 10:39:26 +08:00
展新
428dae25ef feat: 增加 flex 布局的支持 2015-06-09 22:19:35 +08:00
展新
a5cb458b46 feat: 增加layout的Demo及文档 2015-06-09 21:20:15 +08:00
展新
a4fd19b0a2 feat: update layout 2015-06-09 18:29:43 +08:00
展新
8127182595 new: 增加 layout 样式 2015-06-09 18:22:52 +08:00
afc163
5651c402a5 update layout 2015-06-02 12:11:49 +08:00
afc163
43ef2dccd3 挖坑 2015-05-27 15:43:29 +08:00