diff --git a/components/date-picker/RangePicker.jsx b/components/date-picker/RangePicker.jsx index 345c9fc672..32979c0e5e 100644 --- a/components/date-picker/RangePicker.jsx +++ b/components/date-picker/RangePicker.jsx @@ -102,6 +102,7 @@ export default class RangePicker extends React.Component { return ( + + , +
+
+
+
    +
  • +
  • +
  • +
+
+
+ ] : null; return (

- {this.state.show ? [ -
-
    -
  • -
  • -
  • -
-
, -
-
-
-
    -
  • -
  • -
  • -
-
-
- ] : null} + {list}
); diff --git a/components/queue-anim/demo/custom.md b/components/queue-anim/demo/custom.md index 63308a3ee4..ebc5d65ef4 100644 --- a/components/queue-anim/demo/custom.md +++ b/components/queue-anim/demo/custom.md @@ -20,6 +20,25 @@ const Test = React.createClass({ }); }, render() { + const list = this.state.show ? [ +
+
    +
  • +
  • +
  • +
+
, +
+
+
+
    +
  • +
  • +
  • +
+
+
+ ] : null; return (

@@ -30,25 +49,7 @@ const Test = React.createClass({ { opacity: [1, 0], translateY: [0, 50] }, { opacity: [1, 0], translateY: [0, -50] } ]}> - {this.state.show ? [ -

-
    -
  • -
  • -
  • -
-
, -
-
-
-
    -
  • -
  • -
  • -
-
-
- ] : null} + {list}
); diff --git a/components/queue-anim/demo/enter-leave.md b/components/queue-anim/demo/enter-leave.md index e72835904b..0b75af2396 100644 --- a/components/queue-anim/demo/enter-leave.md +++ b/components/queue-anim/demo/enter-leave.md @@ -20,6 +20,25 @@ const Test = React.createClass({ }); }, render() { + const list = this.state.show ? [ +
+
    +
  • +
  • +
  • +
+
, +
+
+
+
    +
  • +
  • +
  • +
+
+
+ ] : null; return (

@@ -29,25 +48,7 @@ const Test = React.createClass({ key="demo" type={['right', 'left']} ease={['easeOutQuart', 'easeInOutQuart']}> - {this.state.show ? [ -

-
    -
  • -
  • -
  • -
-
, -
-
-
-
    -
  • -
  • -
  • -
-
-
- ] : null} + {list}
); diff --git a/components/queue-anim/demo/page.md b/components/queue-anim/demo/page.md index ed57588e67..c9b60e5c4c 100644 --- a/components/queue-anim/demo/page.md +++ b/components/queue-anim/demo/page.md @@ -20,54 +20,53 @@ const Test = React.createClass({ }); }, render() { - return ( -
-

- -

- - {this.state.show ? [ -
-
- - logo -
- + const page = this.state.show ? [ +
+
+ + logo +
+ +
  • +
  • +
  • +
  • +
  • +
    +
    , + +
    我是标题
    +
    + +
  • +
  • +
  • +
    +
    +
    我是标题
    +
    + +
    +
  • -
    , - -
    我是标题
    -
    - -
  • -
  • -
  • -
    -
    -
    我是标题
    -
    - -
    - -
  • -
  • -
  • -
  • -
  • -
    -
    -
    -
    , - -
    - ] : null} -
    +
    +
    , + +
    +
    + ] : null; + return ( +
    +

    + +

    + {page}
    ); } diff --git a/style/components/menu.less b/style/components/menu.less index 9085ab2cc2..2c90bf3b51 100644 --- a/style/components/menu.less +++ b/style/components/menu.less @@ -69,7 +69,8 @@ color: @primary-color; // fix chrome render bug transform: translateZ(0); - > a { + > a, + > a:hover { color: @primary-color; } } @@ -349,6 +350,10 @@ background-color: @primary-color; color: #fff; transform: translateZ(0); + > a, + > a:hover { + color: #fff; + } } &-dark &-item-active,