Skip to content

Commit

Permalink
fix(module:steps): fix progress dot in vertical mode (#4193)
Browse files Browse the repository at this point in the history
close #4184
  • Loading branch information
hsuanxyz authored and Wendell committed Sep 20, 2019
1 parent 7d37b1c commit 50b86be
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 3 deletions.
8 changes: 8 additions & 0 deletions components/steps/demo/progress-dot.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,14 @@ import { Component } from '@angular/core';
<nz-step nzTitle="In Progress" nzDescription="This is a description."></nz-step>
<nz-step nzTitle="Waiting" nzDescription="This is a description."></nz-step>
</nz-steps>
<nz-divider></nz-divider>
<nz-steps [nzCurrent]="1" nzProgressDot nzDirection="vertical">
<nz-step nzTitle="Finished" nzDescription="This is a description. This is a description."></nz-step>
<nz-step nzTitle="Finished" nzDescription="This is a description. This is a description."></nz-step>
<nz-step nzTitle="In Progress" nzDescription="This is a description. This is a description."></nz-step>
<nz-step nzTitle="Waiting" nzDescription="This is a description."></nz-step>
<nz-step nzTitle="Waiting" nzDescription="This is a description."></nz-step>
</nz-steps>
`
})
export class NzDemoStepsProgressDotComponent {}
8 changes: 5 additions & 3 deletions components/steps/style/progress-dot.less
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
.@{steps-prefix-cls}-dot {
.@{steps-prefix-cls}-dot,
.@{steps-prefix-cls}-dot.@{steps-prefix-cls}-small {
.@{steps-prefix-cls}-item {
&-title {
line-height: @line-height-base;
Expand Down Expand Up @@ -63,7 +64,8 @@
margin-top: 8px;
margin-left: 0;
}
.@{steps-prefix-cls}-item-tail {
// https://github.com/ant-design/ant-design/issues/18354
.@{steps-prefix-cls}-item > .@{steps-prefix-cls}-item-container > .@{steps-prefix-cls}-item-tail {
top: 2px;
left: -9px;
margin: 0;
Expand All @@ -75,4 +77,4 @@
.@{steps-prefix-cls}-item-process .@{steps-prefix-cls}-icon-dot {
left: -2px;
}
}
}

0 comments on commit 50b86be

Please sign in to comment.