Merge origin/4.0-prepare into feat-dark-palette

components/form/style/index.less

@@ -249,10 +249,7 @@
     //select
     .@{ant-prefix}-select {
       .@{ant-prefix}-select-selector {
-        border-color: @warning-color;
-        &:hover {
-          border-color: @warning-color;
-        }
+        border-color: @warning-color !important;
       }
       &.@{ant-prefix}-select-open .@{ant-prefix}-select-selector,
       &.@{ant-prefix}-select-focused .@{ant-prefix}-select-selector {
@@ -290,10 +287,7 @@
     //select
     .@{ant-prefix}-select {
       .@{ant-prefix}-select-selector {
-        border-color: @error-color;
-        &:hover {
-          border-color: @error-color;
-        }
+        border-color: @error-color !important;
       }
       &.@{ant-prefix}-select-open .@{ant-prefix}-select-selector,
       &.@{ant-prefix}-select-focused .@{ant-prefix}-select-selector {

components/select/style/index.less

@@ -54,6 +54,11 @@
 
   position: relative;
   display: inline-block;
+  width: 100px;
+
+  &:not(.@{select-prefix-cls}-disabled):hover &-selector {
+    .hover();
+  }
 
   // ======================== Selection ========================
   &-selection-item {
@@ -85,8 +90,13 @@
     pointer-events: none;
 
     .anticon {
+      vertical-align: top;
       transition: transform 0.3s;
 
+      > svg {
+        vertical-align: top;
+      }
+
       .@{select-prefix-cls}-open &.anticon-down {
         transform: rotate(180deg);
       }
@@ -170,7 +180,7 @@
   }
 
   // ========================= Options =========================
-  &-item {
+  .item() {
     position: relative;
     display: block;
     min-height: 32px;
@@ -178,6 +188,15 @@
     color: @text-color;
     font-weight: normal;
     line-height: 22px;
+  }
+
+  &-item-empty {
+    .item();
+  }
+
+  &-item {
+    .item();
+
     cursor: pointer;
     transition: background 0.3s ease;
 
@@ -216,6 +235,10 @@
         color: @disabled-color;
         cursor: not-allowed;
       }
+
+      &-grouped {
+        padding-left: @control-padding-horizontal * 2;
+      }
     }
   }
 

package.json

@@ -123,7 +123,7 @@
     "rc-progress": "~2.5.0",
     "rc-rate": "~2.5.0",
     "rc-resize-observer": "^0.1.0",
-    "rc-select": "~10.0.0-alpha.29",
+    "rc-select": "~10.0.0-alpha.31",
     "rc-slider": "~8.7.1",
     "rc-steps": "~3.5.0",
     "rc-switch": "~1.9.0",

site/theme/template/Layout/Header.jsx

@@ -150,6 +150,7 @@ class Header extends React.Component {
         key="version"
         className="version"
         size="small"
+        style={{ width: 110 }}
         dropdownMatchSelectWidth={false}
         defaultValue={antdVersion}
         onChange={this.handleVersionChange}