Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: update styles(ant-design 3.10.7) #2432

Merged
merged 1 commit into from
Nov 18, 2018
+133 −90
Merged

chore: update styles(ant-design 3.10.7) #2432

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions components/avatar/style/index.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,12 @@
line-height: @size;
}

&-string {
position: absolute;
left: 50%;
transform-origin: 0 center;
}

&.@{avatar-prefix-cls}-icon {
font-size: @font-size;
}
Expand Down
13 changes: 11 additions & 2 deletions components/button/style/index.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,10 @@
// Button styles
// -----------------------------
.@{btn-prefix-cls} {
line-height: @line-height-base;
// Fixing https://github.com/ant-design/ant-design/issues/12978
// It is a render problem of chrome, which is only happened in the codesandbox demo
// 0.001px solution works and I don't why
line-height: @line-height-base - 0.001;
.btn;
.btn-default;

Expand All @@ -21,6 +24,7 @@
> i,
> span {
pointer-events: none;
display: inline-block;
}

&-primary {
Expand Down Expand Up @@ -149,7 +153,7 @@
letter-spacing: .34em;
}

&-two-chinese-chars > * {
&-two-chinese-chars > *:not(.@{iconfont-css-prefix}) {
letter-spacing: .34em;
margin-right: -.34em;
}
Expand Down Expand Up @@ -177,6 +181,11 @@
.christmas&-primary&-sm:before {
background-size: 56px;
}

// https://github.com/ant-design/ant-design/issues/12681
&:empty {
vertical-align: top;
}
}

a.@{btn-prefix-cls} {
Expand Down
4 changes: 1 addition & 3 deletions components/button/style/mixin.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
.button-variant-primary(@color; @background) {
.button-color(@color; @background; @background);
text-shadow: 0 -1px 0 rgba(0, 0, 0, .12);
box-shadow: 0 2px 0 rgba(0, 0, 0, .035);
box-shadow: 0 2px 0 rgba(0, 0, 0, .045);

&:hover,
&:focus {
Expand Down Expand Up @@ -118,7 +118,6 @@
> .@{btnClassName},
> span > .@{btnClassName} {
position: relative;
line-height: @btn-height-base - 2px;

&:hover,
&:focus,
Expand Down Expand Up @@ -182,7 +181,6 @@

&:not([disabled]):active {
outline: 0;
transition: none;
box-shadow: none;
}

Expand Down
4 changes: 2 additions & 2 deletions components/card/style/index.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,16 +39,16 @@

&-wrapper {
display: flex;
align-items: center;
}

&-title {
padding: @card-head-padding 0;
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap;
display: flex;
align-items: center;
flex: 1;
display: inline-block;
}

.@{ant-prefix}-tabs {
Expand Down
48 changes: 29 additions & 19 deletions components/checkbox/style/mixin.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,9 @@
border-radius: @border-radius-sm;
background-color: @checkbox-check-color;
transition: all .3s;
// Fix IE checked style
// https://github.com/ant-design/ant-design/issues/12597
border-collapse: separate;

&:after {
@check-width: (@checkbox-size / 14) * 5px;
Expand Down Expand Up @@ -84,25 +87,6 @@
}
}

// 半选状态
.@{checkbox-prefix-cls}-indeterminate .@{checkbox-inner-prefix-cls}:after {
@indeterminate-width: @checkbox-size - 8px;
@indeterminate-height: @checkbox-size - 8px;
content: ' ';
transform: translate(-50%, -50%) scale(1);
border: 0;
left: 50%;
top: 50%;
width: @indeterminate-width;
height: @indeterminate-height;
background-color: @checkbox-color;
opacity: 1;
}

.@{checkbox-prefix-cls}-indeterminate.@{checkbox-prefix-cls}-disabled .@{checkbox-inner-prefix-cls}:after {
border-color: @disabled-color;
}

// 选中状态
.@{checkbox-prefix-cls}-checked .@{checkbox-inner-prefix-cls}:after {
transform: rotate(45deg) scale(1);
Expand Down Expand Up @@ -183,6 +167,32 @@
margin-left: 0;
}
}

// 半选状态
.@{checkbox-prefix-cls}-indeterminate {
.@{checkbox-inner-prefix-cls} {
background-color: #fff;
border-color: @border-color-base;
}
.@{checkbox-inner-prefix-cls}:after {
@indeterminate-width: @checkbox-size - 8px;
@indeterminate-height: @checkbox-size - 8px;
content: ' ';
transform: translate(-50%, -50%) scale(1);
border: 0;
left: 50%;
top: 50%;
width: @indeterminate-width;
height: @indeterminate-height;
background-color: @checkbox-color;
opacity: 1;
}

&.@{checkbox-prefix-cls}-disabled .@{checkbox-inner-prefix-cls}:after {
border-color: @disabled-color;
background-color: @disabled-color;
}
}
}

@keyframes antCheckboxEffect {
Expand Down
1 change: 1 addition & 0 deletions components/divider/style/index.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
display: block;
height: 1px;
width: 100%;
min-width: 100%; // Fix https://github.com/ant-design/ant-design/issues/10914
margin: 24px 0;
clear: both;
}
Expand Down
4 changes: 4 additions & 0 deletions components/dropdown/style/index.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,10 @@
&-submenu-popup {
position: absolute;
z-index: @zindex-dropdown;

> .@{dropdown-prefix-cls}-menu {
transform-origin: 0 0;
}
}

&-item,
Expand Down
14 changes: 6 additions & 8 deletions components/form/style/index.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,9 @@ input[type="checkbox"] {
.@{form-prefix-cls}-explain,
.@{form-prefix-cls}-extra {
color: @text-color-secondary;
line-height: @line-height-base;
// Magic tweak pixel number to float line-height diff in windows
// Fix https://github.com/ant-design/ant-design/issues/12803
line-height: @line-height-base + 0.024;
transition: color .3s @ease-out; // sync input color transition
margin-top: @form-help-margin-top;
clear: both;
Expand Down Expand Up @@ -381,9 +383,10 @@ form {
margin-bottom: 24px;
}

> .@{form-prefix-cls}-item-control-wrapper, > .@{form-prefix-cls}-item-label {
> .@{form-prefix-cls}-item-control-wrapper,
> .@{form-prefix-cls}-item-label {
display: inline-block;
vertical-align: middle;
vertical-align: top;
}
}

Expand All @@ -394,11 +397,6 @@ form {
.has-feedback {
display: inline-block;
}

// Fix https://github.com/ant-design/ant-design/issues/1040
.@{form-prefix-cls}-explain {
position: absolute;
}
}

// Validation state
Expand Down
3 changes: 0 additions & 3 deletions components/list/style/index.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,9 +164,6 @@
}
&-meta {
margin-bottom: @list-item-meta-margin-bottom;
&-avatar {
display: none;
}
&-title {
color: @heading-color;
margin-bottom: @list-item-meta-title-margin-bottom;
Expand Down
2 changes: 1 addition & 1 deletion components/menu/style/dark.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@

&&-dark &-item-selected,
&-submenu-popup&-dark &-item-selected {
background-color: @menu-dark-item-selected-bg;
background-color: @menu-dark-item-active-bg;
}

// Disabled state sets text to dark gray and nukes hover/tab effects
Expand Down
2 changes: 1 addition & 1 deletion components/modal/style/modal.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
&-header {
padding: 16px 24px;
border-radius: @border-radius-base @border-radius-base 0 0;
background: @component-background;
background: @modal-header-bg;
color: @text-color;
border-bottom: @border-width-base @border-style-base @border-color-split;
}
Expand Down
4 changes: 2 additions & 2 deletions components/progress/style/index.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,8 +133,8 @@
left: 0;
margin: 0;
color: @progress-text-color;
overflow: hidden;
text-overflow: ellipsis;
white-space: normal;
padding: 0 6px;

.@{iconfont-css-prefix} {
font-size: 14 / 12em;
Expand Down
1 change: 0 additions & 1 deletion components/radio/style/index.less
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
@import "../../style/themes/default";
@import "../../style/mixins/index";
@import "../../style/mixins/index";

@radio-prefix-cls: ~"@{ant-prefix}-radio";
@radio-group-prefix-cls: ~"@{radio-prefix-cls}-group";
Expand Down
1 change: 1 addition & 0 deletions components/select/style/index.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -545,6 +545,7 @@

&&--multiple {
.@{select-prefix-cls}-dropdown-menu-item {
padding-right: @control-padding-horizontal + 20;
& .@{select-prefix-cls}-selected-icon {
color: transparent;
.iconfont-size-under-12px(10px);
Expand Down
1 change: 1 addition & 0 deletions components/slider/style/index.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
padding: 4px 0;
height: 12px;
cursor: pointer;
touch-action: none;

.vertical();

Expand Down
6 changes: 3 additions & 3 deletions components/style/themes/default.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
@heading-color-dark : fade(#fff, 100%);
@text-color-dark : fade(#fff, 85%);
@text-color-secondary-dark: fade(#fff, 65%);
@font-variant-base : tabular-nums;
@font-size-base : 14px;
@font-size-lg : @font-size-base + 2px;
@font-size-sm : 12px;
Expand Down Expand Up @@ -306,6 +307,7 @@

// Modal
// --
@modal-header-bg: @component-background;
@modal-mask-bg: rgba(0, 0, 0, 0.65);

// Progress
Expand All @@ -319,7 +321,7 @@
@menu-inline-toplevel-item-height: 40px;
@menu-item-height: 40px;
@menu-collapsed-width: 80px;
@menu-bg: @component-background;
@menu-bg: transparent;
@menu-item-color: @text-color;
@menu-highlight-color: @primary-color;
@menu-item-active-bg: @item-active-bg;
Expand Down Expand Up @@ -526,5 +528,3 @@
@list-item-meta-margin-bottom: @padding-md;
@list-item-meta-avatar-margin-right: @padding-md;
@list-item-meta-title-margin-bottom: @padding-sm;

@import "./default.deperated.less";
Loading