Seperate @active-item-bg into 2 variables

nanqiu · May 3, 2017 · d8d17a6 · d8d17a6
1 parent 0bc8284
commit d8d17a6
Show file tree

Hide file tree

Showing 18 changed files with 33 additions and 26 deletions.
diff --git a/components/calendar/style/index.less b/components/calendar/style/index.less
@@ -100,7 +100,7 @@
     transition: all .3s;
 
     &:hover {
-      background: @active-item-bg;
+      background: @item-hover-bg;
       cursor: pointer;
     }
 
@@ -195,7 +195,7 @@
     transition: background .3s;
 
     &:hover {
-      background: @active-item-bg;
+      background: @item-hover-bg;
       cursor: pointer;
     }
 

diff --git a/components/cascader/style/index.less b/components/cascader/style/index.less
@@ -162,7 +162,7 @@
     white-space: nowrap;
     transition: all 0.3s;
     &:hover {
-      background: @active-item-bg;
+      background: @item-hover-bg;
     }
     &-disabled {
       cursor: not-allowed;

diff --git a/components/date-picker/style/Calendar.less b/components/date-picker/style/Calendar.less
@@ -186,7 +186,7 @@
     }
 
     &:hover {
-      background: @active-item-bg;
+      background: @item-hover-bg;
       cursor: pointer;
     }
 

diff --git a/components/date-picker/style/DecadePanel.less b/components/date-picker/style/DecadePanel.less
@@ -47,7 +47,7 @@
   transition: background 0.3s ease;
 
   &:hover {
-    background: @active-item-bg;
+    background: @item-hover-bg;
     cursor: pointer;
   }
 }

diff --git a/components/date-picker/style/MonthPanel.less b/components/date-picker/style/MonthPanel.less
@@ -69,7 +69,7 @@
   transition: background 0.3s ease;
 
   &:hover {
-    background: @active-item-bg;
+    background: @item-hover-bg;
     cursor: pointer;
   }
 }
diff --git a/components/date-picker/style/RangePicker.less b/components/date-picker/style/RangePicker.less
@@ -130,7 +130,7 @@
     &:before {
       content: '';
       display: block;
-      background: @active-item-bg;
+      background: @item-active-bg;
       border-radius: 0;
       border: 0;
       position: absolute;

diff --git a/components/date-picker/style/TimePicker.less b/components/date-picker/style/TimePicker.less
@@ -96,7 +96,7 @@
     }
 
     li:hover {
-      background: @active-item-bg;
+      background: @item-hover-bg;
     }
 
     li&-option-selected {

diff --git a/components/date-picker/style/YearPanel.less b/components/date-picker/style/YearPanel.less
@@ -50,7 +50,7 @@
   transition: background 0.3s ease;
 
   &:hover {
-    background: @active-item-bg;
+    background: @item-hover-bg;
     cursor: pointer;
   }
 }

diff --git a/components/dropdown/style/index.less b/components/dropdown/style/index.less
@@ -74,11 +74,11 @@
       &-selected,
       &-selected > a {
         color: @primary-color;
-        background-color: @active-item-bg;
+        background-color: @item-active-bg;
       }
 
       &:hover {
-        background-color: @active-item-bg;
+        background-color: @item-hover-bg;
       }
 
       &-disabled {

diff --git a/components/mention/style/index.less b/components/mention/style/index.less
@@ -76,10 +76,13 @@
     overflow: hidden;
     transition: background 0.3s;
 
-    &:hover,
+    &:hover {
+      background-color: @item-hover-bg;
+    }
+
     &.focus,
     &-active {
-      background-color: @active-item-bg;
+      background-color: @item-active-bg;
     }
 
     &-disabled {

diff --git a/components/menu/style/index.less b/components/menu/style/index.less
@@ -40,7 +40,7 @@
 
   &-item:active,
   &-submenu-title:active {
-    background: @active-item-bg;
+    background: @item-active-bg;
   }
 
   &-submenu &-sub {
@@ -108,7 +108,7 @@
   }
 
   &:not(&-horizontal) &-item-selected {
-    background-color: @active-item-bg;
+    background-color: @item-active-bg;
   }
 
   &-horizontal,

diff --git a/components/select/style/index.less b/components/select/style/index.less
@@ -460,9 +460,12 @@
       overflow: hidden;
       transition: background 0.3s ease;
 
-      &:hover,
+      &:hover {
+        background-color: @item-hover-bg;
+      }
+
       &-active {
-        background-color: @active-item-bg;
+        background-color: @item-active-bg;
       }
 
       &-disabled {

diff --git a/components/style/themes/default.less b/components/style/themes/default.less
@@ -59,9 +59,10 @@
 @border-radius-base     : 4px;
 @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;
+// The background colors for active and hover states for things like
+// list items or table cells.
+@item-active-bg         : @primary-1;
+@item-hover-bg          : @primary-1;
 
 // ICONFONT
 @iconfont-css-prefix    : anticon;

diff --git a/components/time-picker/style/index.less b/components/time-picker/style/index.less
@@ -126,7 +126,7 @@
     }
 
     li:hover {
-      background: @active-item-bg;
+      background: @item-hover-bg;
     }
 
     li&-option-selected {

diff --git a/components/transfer/style/index.less b/components/transfer/style/index.less
@@ -102,7 +102,7 @@
 
       &-item:not(&-item-disabled):hover {
         cursor: pointer;
-        background-color: @active-item-bg;
+        background-color: @item-hover-bg;
       }
 
       &-item-disabled {

diff --git a/components/tree-select/style/index.less b/components/tree-select/style/index.less
@@ -38,10 +38,10 @@
       color: @text-color;
       transition: all 0.3s ease;
       &:hover {
-        background-color: @active-item-bg;
+        background-color: @item-hover-bg;
       }
       &.@{select-tree-prefix-cls}-node-selected {
-        background-color: @primary-2;
+        background-color: @item-active-bg;
       }
     }
     span {

diff --git a/components/tree/style/index.less b/components/tree/style/index.less
@@ -64,7 +64,7 @@
       color: @text-color;
       transition: all 0.3s ease;
       &:hover {
-        background-color: @active-item-bg;
+        background-color: @item-hover-bg;
       }
       &.@{tree-prefix-cls}-node-selected {
         background-color: @primary-2;

diff --git a/components/upload/style/index.less b/components/upload/style/index.less
@@ -159,7 +159,7 @@
     }
 
     &:hover &-info {
-      background-color: @active-item-bg;
+      background-color: @item-hover-bg;
     }
 
     &:hover .@{iconfont-css-prefix}-cross {