Add @active-item-bg to control hover and active states

This commit is contained in:
Graeme Yeates 2017-04-28 14:05:56 -04:00
parent 5d6439f15b
commit 4eb2855871
19 changed files with 26 additions and 21 deletions

View File

@ -100,7 +100,7 @@
transition: all .3s; transition: all .3s;
&:hover { &:hover {
background: @primary-1; background: @active-item-bg;
cursor: pointer; cursor: pointer;
} }
@ -195,7 +195,7 @@
transition: background .3s; transition: background .3s;
&:hover { &:hover {
background: @primary-1; background: @active-item-bg;
cursor: pointer; cursor: pointer;
} }

View File

@ -162,7 +162,7 @@
white-space: nowrap; white-space: nowrap;
transition: all 0.3s; transition: all 0.3s;
&:hover { &:hover {
background: @primary-1; background: @active-item-bg;
} }
&-disabled { &-disabled {
cursor: not-allowed; cursor: not-allowed;

View File

@ -2,8 +2,9 @@
@import "../../style/mixins/index"; @import "../../style/mixins/index";
@collapse-prefix-cls: ~"@{ant-prefix}-collapse"; @collapse-prefix-cls: ~"@{ant-prefix}-collapse";
@collapse-active-bg: #eee;
@collapse-header-bg: @background-color-base; @collapse-header-bg: @background-color-base;
@collapse-active-bg: @active-item-bg;
.collapse-close() { .collapse-close() {
.iconfont-size-under-12px(9px, 0); .iconfont-size-under-12px(9px, 0);

View File

@ -186,7 +186,7 @@
} }
&:hover { &:hover {
background: @primary-1; background: @active-item-bg;
cursor: pointer; cursor: pointer;
} }

View File

@ -47,7 +47,7 @@
transition: background 0.3s ease; transition: background 0.3s ease;
&:hover { &:hover {
background: @primary-1; background: @active-item-bg;
cursor: pointer; cursor: pointer;
} }
} }

View File

@ -69,7 +69,7 @@
transition: background 0.3s ease; transition: background 0.3s ease;
&:hover { &:hover {
background: @primary-1; background: @active-item-bg;
cursor: pointer; cursor: pointer;
} }
} }

View File

@ -130,7 +130,7 @@
&:before { &:before {
content: ''; content: '';
display: block; display: block;
background: @primary-1; background: @active-item-bg;
border-radius: 0; border-radius: 0;
border: 0; border: 0;
position: absolute; position: absolute;

View File

@ -96,7 +96,7 @@
} }
li:hover { li:hover {
background: @primary-1; background: @active-item-bg;
} }
li&-option-selected { li&-option-selected {

View File

@ -50,7 +50,7 @@
transition: background 0.3s ease; transition: background 0.3s ease;
&:hover { &:hover {
background: @primary-1; background: @active-item-bg;
cursor: pointer; cursor: pointer;
} }
} }

View File

@ -74,11 +74,11 @@
&-selected, &-selected,
&-selected > a { &-selected > a {
color: @primary-color; color: @primary-color;
background-color: @primary-1; background-color: @active-item-bg;
} }
&:hover { &:hover {
background-color: @primary-1; background-color: @active-item-bg;
} }
&-disabled { &-disabled {

View File

@ -79,7 +79,7 @@
&:hover, &:hover,
&.focus, &.focus,
&-active { &-active {
background-color: @primary-1; background-color: @active-item-bg;
} }
&-disabled { &-disabled {

View File

@ -40,7 +40,7 @@
&-item:active, &-item:active,
&-submenu-title:active { &-submenu-title:active {
background: @primary-1; background: @active-item-bg;
} }
&-submenu &-sub { &-submenu &-sub {
@ -108,7 +108,7 @@
} }
&:not(&-horizontal) &-item-selected { &:not(&-horizontal) &-item-selected {
background-color: @primary-1; background-color: @active-item-bg;
} }
&-horizontal, &-horizontal,

View File

@ -462,7 +462,7 @@
&:hover, &:hover,
&-active { &-active {
background-color: @primary-1; background-color: @active-item-bg;
} }
&-disabled { &-disabled {

View File

@ -59,6 +59,10 @@
@border-radius-base : 4px; @border-radius-base : 4px;
@border-radius-sm : 2px; @border-radius-sm : 2px;
// The background color used when an item (such as a list item or table cell)
// is active or hovered.
@active-item-bg : @primary-1;
// ICONFONT // ICONFONT
@iconfont-css-prefix : anticon; @iconfont-css-prefix : anticon;
@icon-url : "https://at.alicdn.com/t/font_0qcp222wvwijm7vi"; @icon-url : "https://at.alicdn.com/t/font_0qcp222wvwijm7vi";

View File

@ -126,7 +126,7 @@
} }
li:hover { li:hover {
background: @primary-1; background: @active-item-bg;
} }
li&-option-selected { li&-option-selected {

View File

@ -102,7 +102,7 @@
&-item:not(&-item-disabled):hover { &-item:not(&-item-disabled):hover {
cursor: pointer; cursor: pointer;
background-color: @primary-1; background-color: @active-item-bg;
} }
&-item-disabled { &-item-disabled {

View File

@ -38,7 +38,7 @@
color: @text-color; color: @text-color;
transition: all 0.3s ease; transition: all 0.3s ease;
&:hover { &:hover {
background-color: @primary-1; background-color: @active-item-bg;
} }
&.@{select-tree-prefix-cls}-node-selected { &.@{select-tree-prefix-cls}-node-selected {
background-color: @primary-2; background-color: @primary-2;

View File

@ -64,7 +64,7 @@
color: @text-color; color: @text-color;
transition: all 0.3s ease; transition: all 0.3s ease;
&:hover { &:hover {
background-color: @primary-1; background-color: @active-item-bg;
} }
&.@{tree-prefix-cls}-node-selected { &.@{tree-prefix-cls}-node-selected {
background-color: @primary-2; background-color: @primary-2;

View File

@ -159,7 +159,7 @@
} }
&:hover &-info { &:hover &-info {
background-color: @primary-1; background-color: @active-item-bg;
} }
&:hover .@{iconfont-css-prefix}-cross { &:hover .@{iconfont-css-prefix}-cross {