Skip to content

Commit 73b953d

Browse files
authored
Merge pull request #199 from ant-design/fix-grid-line-style
fix grid line style
2 parents 60f990c + bac7df3 commit 73b953d

File tree

2 files changed

+11
-0
lines changed

2 files changed

+11
-0
lines changed

components/grid/index.web.tsx

+2
Original file line numberDiff line numberDiff line change
@@ -101,13 +101,15 @@ export default class Grid extends React.Component<GridProps, any> {
101101
}
102102
if (k * 2 + 1 < gridContentLength) {
103103
carouselContent.push(<div
104+
className={`${prefixCls}-carousel-page`}
104105
key={`carouselitem-${k * 2 + 1}`}
105106
>
106107
{gridContent[k * 2]}
107108
{gridContent[k * 2 + 1]}
108109
</div>);
109110
} else {
110111
carouselContent.push(<div
112+
className={`${prefixCls}-carousel-page`}
111113
key={`carouselitem-${k * 2}`}
112114
>
113115
{gridContent[k * 2]}

components/grid/style/index.less

+9
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@
3434
.@{flexPrefixCls} {
3535
position: relative;
3636
.hairline-bottom(@border-color-base);
37+
&:last-child {
38+
.hairline-remove-right-bottom();
39+
}
3740
.@{flexPrefixCls}-item {
3841
position: relative;
3942
.hairline-right(@border-color-base);
@@ -42,6 +45,12 @@
4245
}
4346
}
4447
}
48+
.@{gridPrefixCls}-carousel-page {
49+
border-right: @border-width-sm solid @border-color-base;
50+
&:first-child {
51+
border-left: @border-width-sm solid @border-color-base;
52+
}
53+
}
4554
}
4655

4756
}

0 commit comments

Comments
 (0)