Merge pull request #20484 from ant-design/fix-theme-dark

fix: dark theme review
This commit is contained in:
信鑫-King 2019-12-27 11:14:14 +08:00 committed by GitHub
commit 66512c8d45
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 35 additions and 9 deletions

View File

@ -96,19 +96,47 @@
&:hover,
&:focus {
& when (@border = transparent) {
.button-color(~`colorPalette('@{color}', 5) `; transparent; transparent);
& when (@theme = dark) {
.button-color(~`colorPalette('@{color}', 7) `; transparent; transparent);
}
& when not (@theme = dark) {
.button-color(~`colorPalette('@{color}', 5) `; transparent; transparent);
}
}
& when not(@border = transparent) {
.button-color(~`colorPalette('@{color}', 5) `; transparent; ~`colorPalette('@{color}', 5) `);
& when not (@border = transparent) {
& when (@theme = dark) {
.button-color(
~`colorPalette('@{color}', 7) `; transparent; ~`colorPalette('@{color}', 7) `
);
}
& when not (@theme = dark) {
.button-color(
~`colorPalette('@{color}', 5) `; transparent; ~`colorPalette('@{color}', 5) `
);
}
}
}
&:active,
&.active {
& when (@border = transparent) {
.button-color(~`colorPalette('@{color}', 7) `; transparent; transparent);
& when (@theme = dark) {
.button-color(~`colorPalette('@{color}', 5) `; transparent; transparent);
}
& when not (@theme = dark) {
.button-color(~`colorPalette('@{color}', 7) `; transparent; transparent);
}
}
& when not(@border = transparent) {
.button-color(~`colorPalette('@{color}', 7) `; transparent; ~`colorPalette('@{color}', 7) `);
& when (@theme = dark) {
.button-color(
~`colorPalette('@{color}', 5) `; transparent; ~`colorPalette('@{color}', 5) `
);
}
& when not (@theme = dark) {
.button-color(
~`colorPalette('@{color}', 7) `; transparent; ~`colorPalette('@{color}', 7) `
);
}
}
}
.button-disabled();

View File

@ -3,7 +3,6 @@
@card-prefix-cls: ~'@{ant-prefix}-card';
@card-head-height: 48px;
@card-hover-border: transparent;
@card-action-icon-size: 16px;
@gradient-min: fade(@card-skeleton-bg, 20%);
@ -20,7 +19,6 @@
&-hoverable {
cursor: pointer;
&:hover {
border-color: @card-hover-border;
box-shadow: @card-shadow;
}
}

View File

@ -76,7 +76,7 @@ pre[class*='language-'] {
[data-theme='dark'] :not(pre) > code[class*='language-'],
[data-theme='dark'] pre[class*='language-'] {
color: rgba(255, 255, 255, 0.65);
background: #141414;
background: #262626;
}
/* Inline code */
@ -193,7 +193,7 @@ pre[class*='language-'] {
.token.symbol,
.token.bullet,
.token.addition {
color: #4fb4d7;
color: #177ddc;
}
.token.title,