From be3d52991760011785169c631e4166569abc86c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BF=B0=E6=96=87?= Date: Tue, 21 Jul 2015 20:53:36 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20collapse=E6=A0=B7=E5=BC=8F=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/collapse/demo/accordion.md | 2 +- components/collapse/demo/mix.md | 2 +- package.json | 2 +- style/components/collapse.less | 14 +++++++------- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/components/collapse/demo/accordion.md b/components/collapse/demo/accordion.md index 1aa15540e4..c81e13bcb2 100644 --- a/components/collapse/demo/accordion.md +++ b/components/collapse/demo/accordion.md @@ -2,7 +2,7 @@ - order: 1 -手风琴,每次只打开一个tab。默认打开第一个 +手风琴,每次只打开一个tab。默认打开第一个。 --- diff --git a/components/collapse/demo/mix.md b/components/collapse/demo/mix.md index 45054ebb16..f51568dfc9 100644 --- a/components/collapse/demo/mix.md +++ b/components/collapse/demo/mix.md @@ -2,7 +2,7 @@ - order: 2 -手风琴嵌套折叠面板 +手风琴嵌套折叠面板。 --- diff --git a/package.json b/package.json index 02b3d14fe2..d460ab57c3 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,7 @@ "object-assign": "~3.0.0", "rc-calendar": "~3.11.0", "rc-checkbox": "~1.0.6", - "rc-collapse": "~1.2.2", + "rc-collapse": "~1.2.3", "rc-dialog": "~4.4.0", "rc-dropdown": "~1.1.1", "rc-input-number": "~2.0.1", diff --git a/style/components/collapse.less b/style/components/collapse.less index fd10c4c4d3..922c85baa5 100644 --- a/style/components/collapse.less +++ b/style/components/collapse.less @@ -1,5 +1,5 @@ @prefixCls: ant-collapse; -@borderStyle: 1px solid #e9e9e9; +@borderStyle: 1px solid #d9d9d9; #arrow { .common(){ @@ -24,17 +24,19 @@ .@{prefixCls} { background-color: #f4f4f4; border-radius: 3px; - border-top: @borderStyle; - border-left: @borderStyle; - border-right: @borderStyle; + border: @borderStyle; & > &-item { + border-top: @borderStyle; + &:first-child { + border-top: none; + } + > .@{prefixCls}-header { height: 38px; line-height: 38px; text-indent: 16px; color: #666; - border-bottom: @borderStyle; &:before { display: inline-block; content: '\20'; @@ -68,12 +70,10 @@ } &-content-active { - border-bottom: @borderStyle; } & > &-item-active { > .@{prefixCls}-header { - border-bottom: none; &:before { #arrow > .bottom(3px, 4px, #666); -- GitLab