From 72a5b1fef72a3221a35efe295503b08d8cd19e05 Mon Sep 17 00:00:00 2001
From: George Gray <george@ummodesign.com>
Date: Tue, 23 Jan 2018 13:03:22 +0000
Subject: [PATCH] Vars to theme slider (#9065)

* vars to theme slider

* add @slider-margin back
---
 components/slider/style/index.less   | 31 ++++++++++------------------
 components/style/themes/default.less | 17 +++++++++++++++
 2 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/components/slider/style/index.less b/components/slider/style/index.less
index b0be1941bb..e7962cb3d9 100644
--- a/components/slider/style/index.less
+++ b/components/slider/style/index.less
@@ -2,15 +2,6 @@
 @import "../../style/mixins/index";
 
 @slider-prefix-cls: ~"@{ant-prefix}-slider";
-// slider color
-@slider-disabled-color: @disabled-color;
-// tooltip
-@slider-tooltip-color: #fff;
-@slider-tooltip-bg: tint(@text-color, 4%);
-@slider-tooltip-arrow-width: 4px;
-@slider-tooltip-distance: @slider-tooltip-arrow-width + 4px;
-@slider-tooltip-arrow-color: @slider-tooltip-bg;
-@slider-margin: 14px 6px 10px;
 
 .@{slider-prefix-cls} {
   .reset-component;
@@ -31,7 +22,7 @@
     width: 100%;
     height: 4px;
     border-radius: 2px;
-    background-color: @background-color-base;
+    background-color: @slider-rail-background-color;
     transition: background-color .3s;
   }
 
@@ -39,7 +30,7 @@
     position: absolute;
     height: 4px;
     border-radius: @border-radius-base;
-    background-color: @primary-3;
+    background-color: @slider-track-background-color;
     transition: background-color 0.3s ease;
   }
 
@@ -51,30 +42,30 @@
     height: 14px;
     cursor: pointer;
     border-radius: 50%;
-    border: solid 2px @primary-3;
+    border: solid 2px @slider-handle-color;
     background-color: @component-background;
     transition: border-color .3s, transform .3s cubic-bezier(0.18, 0.89, 0.32, 1.28);
 
     &:focus {
-      border-color: tint(@primary-color, 20%);
-      box-shadow: 0 0 0 5px tint(@primary-color, 50%);
+      border-color: @slider-handle-color-focus;
+      box-shadow: 0 0 0 5px @slider-handle-color-focus-shadow;
       outline: none;
     }
 
     &.@{ant-prefix}-tooltip-open {
-      border-color: @primary-color;
+      border-color: @slider-handle-color-tooltip-open;
     }
   }
 
   &:hover {
     .@{slider-prefix-cls}-rail {
-      background-color: #e1e1e1;
+      background-color: @slider-rail-background-color-hover;
     }
     .@{slider-prefix-cls}-track {
-      background-color: @primary-4;
+      background-color: @slider-track-background-color-hover;
     }
     .@{slider-prefix-cls}-handle:not(.@{ant-prefix}-tooltip-open) {
-      border-color: @primary-4;
+      border-color: @slider-handle-color-hover;
     }
   }
 
@@ -112,7 +103,7 @@
     margin-left: -4px;
     width: 8px;
     height: 8px;
-    border: 2px solid @border-color-split;
+    border: 2px solid @slider-dot-border-color;
     background-color: @component-background;
     cursor: pointer;
     border-radius: 50%;
@@ -124,7 +115,7 @@
       margin-left: -4px;
     }
     &-active {
-      border-color: tint(@primary-color, 50%);
+      border-color: @slider-dot-border-color-active;
     }
   }
 
diff --git a/components/style/themes/default.less b/components/style/themes/default.less
index 25f0003148..57b55f586a 100644
--- a/components/style/themes/default.less
+++ b/components/style/themes/default.less
@@ -414,3 +414,20 @@
 @breadcrumb-link-color-hover:  @primary-5;
 @breadcrumb-separator-color:   @text-color-secondary;
 @breadcrumb-separator-margin:  0 @padding-xs;
+
+// Slider
+// ---
+@slider-margin:                       14px 6px 10px;
+@slider-rail-background-color:        @background-color-base;
+@slider-rail-background-color-hover:  #e1e1e1;
+@slider-track-background-color:       @primary-3;
+@slider-track-background-color-hover: @primary-4;
+@slider-handle-color:                 @primary-3;
+@slider-handle-color-hover:           @primary-4;
+@slider-handle-color-focus:           tint(@primary-color, 20%);
+@slider-handle-color-focus-shadow:    tint(@primary-color, 50%);
+@slider-handle-color-tooltip-open:    @primary-color;
+@slider-dot-border-color:             @border-color-split;
+@slider-dot-border-color-active:      tint(@primary-color, 50%);
+@slider-disabled-color:               @disabled-color;
+@slider-disabled-background-color:    @component-background;