Fix Menu[theme="dark"] text color, close #4440

This commit is contained in:
afc163 2017-01-03 00:12:23 +08:00
parent 372a44a92a
commit d0df37ed42
2 changed files with 20 additions and 11 deletions

View File

@ -333,28 +333,28 @@
.@{menu-prefix-cls} { .@{menu-prefix-cls} {
&-dark, &-dark,
&-dark &-sub { &-dark &-sub {
color: @text-color-secondary; color: @text-color-secondary-dark;
background: #404040; background: @menu-dark-bg;
} }
&-dark &-inline&-sub { &-dark &-inline&-sub {
background: #333; background: @menu-dark-submenu-bg;
} }
&-dark&-horizontal { &-dark&-horizontal {
border-bottom-color: #404040; border-bottom-color: @menu-dark-bg;
} }
&-dark&-horizontal > &-item, &-dark&-horizontal > &-item,
&-dark&-horizontal > &-submenu { &-dark&-horizontal > &-submenu {
border-color: #404040; border-color: @menu-dark-bg;
border-bottom: 0; border-bottom: 0;
top: 0; top: 0;
} }
&-dark &-item, &-dark &-item,
&-dark &-item > a { &-dark &-item > a {
color: @text-color-secondary; color: @text-color-secondary-dark;
} }
&-dark&-inline, &-dark&-inline,
@ -376,18 +376,18 @@
&-dark &-submenu:hover, &-dark &-submenu:hover,
&-dark &-submenu-title:hover { &-dark &-submenu-title:hover {
background-color: transparent; background-color: transparent;
color: #fff; color: @text-color-dark;
> a { > a {
color: #fff; color: @text-color-dark;
} }
} }
&-dark &-item-selected { &-dark &-item-selected {
border-right: 0; border-right: 0;
color: #fff; color: @text-color-dark;
> a, > a,
> a:hover { > a:hover {
color: #fff; color: @text-color-dark;
} }
} }

View File

@ -27,10 +27,14 @@
@component-background : #fff; @component-background : #fff;
@font-family : -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "Helvetica Neue", Helvetica, Arial, sans-serif; @font-family : -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "Helvetica Neue", Helvetica, Arial, sans-serif;
@code-family : Consolas, Menlo, Courier, monospace; @code-family : Consolas, Menlo, Courier, monospace;
@text-color : fade(#000, 65%);
@heading-color : fade(#000, 75%); @heading-color : fade(#000, 75%);
@text-color : fade(#000, 65%);
@text-color-secondary : fade(#000, 43%); @text-color-secondary : fade(#000, 43%);
@disabled-color : fade(#000, 25%); @disabled-color : fade(#000, 25%);
@heading-color-dark : fade(#fff, 97%);
@text-color-dark : fade(#fff, 91%);
@text-color-secondary-dark : fade(#fff, 57%);
@disabled-color-dark : fade(#000, 35%);
@font-size-base : 12px; @font-size-base : 12px;
@font-size-lg : @font-size-base + 2px; @font-size-lg : @font-size-base + 2px;
@line-height-base : 1.5; @line-height-base : 1.5;
@ -219,3 +223,8 @@
// Progress // Progress
// -- // --
@process-default-color: @primary-color; @process-default-color: @primary-color;
// Menu
// --
@menu-dark-bg: #404040;
@menu-dark-submenu-bg: #333;