Merge b70dfa4 into 2c54421

HISTORY.md

@@ -1,6 +1,10 @@
 History
 =======
 
+0.4.10
+
+* `CHANGED` style change: move bg color form inner to content
+
 0.4.9
 ---
 

demo/TooltipDemo.jsx

@@ -5,6 +5,7 @@ import Button from 'uxcore-button';
 export default class Demo extends React.Component {
   render() {
     const overlay = <div style={{}}>提示文字</div>;
+    const longOverlay = <div style={{}}>特别特别长的提示文字特别特别长的提示文字特别特别长的提示文字特别特别长的提示文字</div>;
     return (
       <div className="demo">
         <div>
@@ -17,13 +18,13 @@ export default class Demo extends React.Component {
           <h3>讲解：鼠标点击出现提示</h3>
           <div className="container">
             <div className="top">
-              <Tooltip overlay={overlay} placement="topLeft" trigger={['click']}>
+              <Tooltip overlayClassName="kuma-tooltip-dark" overlay={overlay} placement="topLeft" trigger={['click']}>
                 <Button size="small" type="outline">上左</Button>
               </Tooltip>
-              <Tooltip overlay={overlay} placement="top" trigger={['click']}>
+              <Tooltip overlayClassName="kuma-tooltip-dark" overlay={longOverlay} placement="top" trigger={['click']}>
                 <Button style={{ marginLeft: 10 }} size="small" type="outline">上</Button>
               </Tooltip>
-              <Tooltip overlay={overlay} placement="topRight" trigger={['click']}>
+              <Tooltip overlay={longOverlay} placement="topRight" trigger={['click']} overlayStyle={{ maxWidth: 200 }}>
                 <Button style={{ marginLeft: 10 }} size="small" type="outline">上右</Button>
               </Tooltip>
             </div>

src/Tooltip.js

@@ -2,9 +2,11 @@ import RcTooltip from 'rc-tooltip';
 
 export default class Tooltip extends RcTooltip {
     static displayName = 'uxcore-tooltip'
+
     static propTypes = {
         ...RcTooltip.propTypes,
     }
+
     static defaultProps = {
         ...RcTooltip.defaultProps,
         prefixCls: 'kuma-tooltip',

src/Tooltip.less

@@ -159,6 +159,8 @@
     box-shadow: @box-shadow-1;
     border-radius: @global-border-radius;
     border: 1px solid @normal-alpha-6;
+    background-color: #fff;
+    // max-width: 320px;
   }
   &-inner {
     position: relative;
@@ -169,16 +171,15 @@
     text-align: center;
     color: @normal-alpha-2;
     text-decoration: none;
-    background-color: #fff;
   }
 }
 
 .@{__tooltipPrefixCls}-dark {
   .@{__tooltipPrefixCls}-content {
     border-color: @__tooltipDarkColorNoAlpha;
+    background:  @__tooltipDarkColorNoAlpha;
   }
   .@{__tooltipPrefixCls}-inner {
-    background:  @__tooltipDarkColorNoAlpha;
     color: white;
   }
   &.@{__tooltipPrefixCls}-placement-left,