Skip to content

Commit

Permalink
chore: sync ant-design v4.4.2 (ant-design-blazor#346)
Browse files Browse the repository at this point in the history
  • Loading branch information
ElderJames authored Jul 11, 2020
1 parent 4f29f62 commit ad8a367
Show file tree
Hide file tree
Showing 9 changed files with 35 additions and 11 deletions.
3 changes: 2 additions & 1 deletion components/alert/style/index.less
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
.reset-component;

position: relative;
max-height: 1000vh;
padding: 8px 15px 8px 37px;
word-wrap: break-word;
border-radius: @border-radius-base;
Expand Down Expand Up @@ -146,7 +147,7 @@
}

&&-closing {
height: 0 !important;
max-height: 0;
margin: 0;
padding-top: 0;
padding-bottom: 0;
Expand Down
4 changes: 3 additions & 1 deletion components/card/style/index.less
Original file line number Diff line number Diff line change
Expand Up @@ -130,10 +130,12 @@
padding-bottom: 0;
}

&-cover {
&-bordered &-cover {
margin-right: -1px;
margin-left: -1px;
}

&-cover {
> * {
display: block;
width: 100%;
Expand Down
17 changes: 17 additions & 0 deletions components/date-picker/style/index.less
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@
&-input {
position: relative;
display: inline-flex;
align-items: center;
width: 100%;

> input {
Expand Down Expand Up @@ -109,20 +110,30 @@
align-self: center;
margin-left: @padding-xs / 2;
color: @disabled-color;
line-height: 1;
pointer-events: none;

> * {
vertical-align: top;
}
}

&-clear {
position: absolute;
top: 50%;
right: 0;
color: @disabled-color;
line-height: 1;
background: @component-background;
transform: translateY(-50%);
cursor: pointer;
opacity: 0;
transition: opacity @animation-duration-slow, color @animation-duration-slow;

> * {
vertical-align: top;
}

&:hover {
color: @text-color-secondary;
}
Expand Down Expand Up @@ -187,6 +198,12 @@
padding: 0 @padding-xs;
line-height: 1;
}

&.@{picker-prefix-cls}-small {
.@{picker-prefix-cls}-clear {
right: @input-padding-horizontal-sm;
}
}
}

// ======================= Dropdown =======================
Expand Down
9 changes: 5 additions & 4 deletions components/radio/style/index.less
Original file line number Diff line number Diff line change
Expand Up @@ -182,10 +182,11 @@ span.@{radio-prefix-cls} + * {
}

> .@{radio-prefix-cls}-button {
display: block;
width: 0;
height: 0;
margin-left: 0;
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
}

.@{radio-group-prefix-cls}-large & {
Expand Down
2 changes: 1 addition & 1 deletion components/select/style/index.less
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@
}

&-selected:not(&-disabled) {
color: @text-color;
color: @select-item-selected-color;
font-weight: @select-item-selected-font-weight;
background-color: @select-item-selected-bg;

Expand Down
5 changes: 5 additions & 0 deletions components/select/style/single.less
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,10 @@
.@{select-prefix-cls}-selection-search-input {
height: @select-height-without-border;
}

&::after {
line-height: @select-height-without-border;
}
}
}

Expand Down Expand Up @@ -123,6 +127,7 @@
.@{select-prefix-cls}-selector {
height: @input-height;

&::after,
.@{select-prefix-cls}-selection-item,
.@{select-prefix-cls}-selection-placeholder {
line-height: @input-height - 2 * @border-width-base;
Expand Down
1 change: 1 addition & 0 deletions components/style/themes/default.less
Original file line number Diff line number Diff line change
Expand Up @@ -413,6 +413,7 @@
// Select
// ---
@select-border-color: @border-color-base;
@select-item-selected-color: @text-color;
@select-item-selected-font-weight: 600;
@select-dropdown-bg: @component-background;
@select-item-selected-bg: @primary-1;
Expand Down
4 changes: 0 additions & 4 deletions components/table/style/index.less
Original file line number Diff line number Diff line change
Expand Up @@ -130,10 +130,6 @@
margin: -@table-padding-vertical -@table-padding-horizontal -@table-padding-vertical (@table-padding-horizontal +
ceil(@font-size-sm * 1.4));

td {
background: transparent;
}

&-tbody > tr:last-child > td {
border-bottom: 0;

Expand Down
1 change: 1 addition & 0 deletions components/typography/style/index.less
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
// =============== Basic ===============
.@{typography-prefix-cls} {
color: @text-color;
overflow-wrap: break-word;

&&-secondary {
color: @text-color-secondary;
Expand Down

0 comments on commit ad8a367

Please sign in to comment.