Merge pull request #44 from HuangQiii/master

[FIX] upgrade to 0.6.3, fix tree style, fix default style
open-hand · May 24, 2019 · 329304c · 329304c
2 parents 1fa800a + 97743e5
commit 329304c
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 23,343 deletions.
diff --git a/components/select/style/index.less b/components/select/style/index.less
@@ -649,11 +649,13 @@
 
       &-active,
       &:active {
-        background-color: @menu-item-active-bg;
+        // background-color: @menu-item-active-bg;
+        background-color: @item-hover-bg;
       }
 
       &:focus {
-        background-color: @menu-item-active-bg;
+        // background-color: @menu-item-active-bg;
+        background-color: @item-hover-bg;
       }
     }
 

diff --git a/components/style/themes/default.less b/components/style/themes/default.less
@@ -161,7 +161,7 @@
 
 @btn-height-base: .3rem;
 @btn-height-lg: .4rem;
-@btn-height-sm: .2rem;
+@btn-height-sm: .24rem;
 
 @btn-circle-size: @btn-height-base;
 @btn-circle-size-lg: @btn-height-lg;
@@ -285,9 +285,9 @@
 @input-padding-vertical-sm: .01rem;
 @input-padding-vertical-lg: .06rem;
 @input-placeholder-color: hsv(0, 0, 75%);
-@input-color: fade(@text-color, 54%);
+// @input-color: fade(@text-color, 54%);
 @input-active-color: @text-color;
-// @input-color                 : rgb(0,0,0);
+@input-color: rgb(0, 0, 0);
 // @input-border-color: @border-color-base;
 @input-baseline-color: rgba(0, 0, 0, 0.54);
 @input-border-color: rgba(0, 0, 0, 0.2);

diff --git a/components/tree/index.tsx b/components/tree/index.tsx
@@ -144,6 +144,7 @@ export default class Tree extends Component<TreeProps, any> {
         className={classNames(!showIcon && `${prefixCls}-icon-hide`, className)}
         checkable={checkable ? <span className={`${prefixCls}-checkbox-inner`} /> : checkable}
         switcherIcon={this.renderSwitcherIcon}
+        prefixCls={prefixCls}
       >
         {this.props.children}
       </RcTree>