Merge branch 'master' into antd-3.0

imcoddy · Nov 18, 2017 · 8ca9c95 · 8ca9c95
2 parents 633708f + 5cca35c
commit 8ca9c95
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 10 deletions.
diff --git a/components/rate/style/index.less b/components/rate/style/index.less
@@ -10,6 +10,7 @@
   list-style: none;
   font-size: 20px;
   display: inline-block;
+  color: @rate-star-color;
 
   &-disabled &-star {
     cursor: not-allowed;
@@ -25,13 +26,14 @@
     margin-right: 8px;
     position: relative;
     transition: all .3s;
-    color: @rate-star-bg;
+    color: inherit;
     cursor: pointer;
 
     &-first,
     &-second {
       user-select: none;
       transition: all .3s;
+      color: @rate-star-bg;
     }
 
     &:hover {
@@ -55,12 +57,7 @@
 
     &-half &-first,
     &-full &-second {
-      color: @rate-star-color;
-    }
-
-    &-half:hover &-first,
-    &-full:hover &-second {
-      color: tint(@rate-star-color, 20%);
+      color: inherit;
     }
   }
 

diff --git a/components/select/index.en-US.md b/components/select/index.en-US.md
@@ -8,8 +8,8 @@ Select component to select value from options.
 
 ## When To Use
 
-- A dropdown menu for choosing, an elegant alternative to the native select component.
-- [Radio](/components/radio/) is a better solution when options amount is too little (less than 5).
+- A dropdown menu for displaying choices - an elegant alternative to the native `<select>` element.
+- Utilizing [Radio](/components/radio/) is recommended when there are fewer total options (less than 5).
 
 ## API
 

diff --git a/docs/resource/work-with-us.md b/docs/resource/work-with-us.md
@@ -11,8 +11,8 @@ title:
 
 ```__react
 const emails = [
-  'lindong.lld#alipay.com',
   'momo.zxy#alipay.com',
+  'lindong.lld#alipay.com',
   'luli.fxx#alipay.com',
 ];
 ReactDOM.render(