diff --git a/components/breadcrumb/demo/router.md b/components/breadcrumb/demo/router.md index 85a3cf8c06..0230435677 100644 --- a/components/breadcrumb/demo/router.md +++ b/components/breadcrumb/demo/router.md @@ -22,12 +22,6 @@ var Apps = React.createClass({ } }); -var App = React.createClass({ - render() { - return
; - } -}); - var App = React.createClass({ render() { return (
diff --git a/components/breadcrumb/index.jsx b/components/breadcrumb/index.jsx index 1ae4ef9dcf..f7cf1fb8b8 100644 --- a/components/breadcrumb/index.jsx +++ b/components/breadcrumb/index.jsx @@ -17,7 +17,7 @@ let BreadcrumbItem = React.createClass({ let Breadcrumb = React.createClass({ contextTypes: { - router: React.PropTypes.func.isRequired + router: React.PropTypes.func }, render() { var crumbs, routes, params; @@ -35,7 +35,7 @@ let Breadcrumb = React.createClass({ } else { link = {name}; } - return {link}; + return {link}; }); } else { crumbs = this.props.children; diff --git a/package.json b/package.json index a1209db34f..02bc0d62ad 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,6 @@ "lodash": "^3.10.0", "nico-jsx": "~0.5.8", "precommit-hook": "^1.0.7", - "react-router": "~0.13.3", "webpack": "^1.10.1", "webpack-dev-middleware": "^1.2.0" }, diff --git a/scripts/demo.js b/scripts/demo.js index 43d7be9c76..d2bbc2ae20 100644 --- a/scripts/demo.js +++ b/scripts/demo.js @@ -1,3 +1,2 @@ -window['react-router'] = require('react-router'); - window['css-animation'] = require('css-animation'); +window['react-router'] = window.ReactRouter; diff --git a/site/templates/layout.html b/site/templates/layout.html index 3c9c786863..6d22f97e5c 100644 --- a/site/templates/layout.html +++ b/site/templates/layout.html @@ -1,64 +1,84 @@ - - - - - - {% block title %}{{ config.site.name }} - {{ config.site.description }}{% endblock %} - - - - - {% block styles %}{% endblock %} - - - - - - {% block scripts %}{% endblock %} + + + + + + {% block title %}{{ config.site.name }} - {{ config.site.description }}{% endblock %} + + + + + {% block styles %}{% endblock %} + + + + + + + {% block scripts %}{% endblock %} - +
{% block aside %}{% endblock %} {% block content %}{% endblock %} -
- {%- include "footer.html" %} +
+{%- include "footer.html" %} diff --git a/style/components/inputNumber.less b/style/components/inputNumber.less index 3f5580f212..96276075e9 100644 --- a/style/components/inputNumber.less +++ b/style/components/inputNumber.less @@ -80,10 +80,11 @@ cursor: pointer; &-inner { .iconfont-mixin(); + transform: rotate(270deg) scale(0.8); + filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=3); top:-2px; &:before { content: "\e611"; - transform: rotate(270deg) scale(0.8); } } } @@ -92,9 +93,10 @@ cursor: pointer; &-inner { .iconfont-mixin(); + transform: rotate(90deg) scale(0.8); + filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=1); &:before { content: "\e611"; - transform: rotate(90deg) scale(0.8); } } } diff --git a/style/components/select.less b/style/components/select.less index 07793bc4e2..b4f37cf5b4 100644 --- a/style/components/select.less +++ b/style/components/select.less @@ -30,21 +30,25 @@ // arrow &-arrow { + .iconfont-mixin(); height: 26px; position: absolute; top: 1px; right: 1px; - width: 20px; - font-family: 'anticon'; font-size: @font-size-base; font-size: ~"10px \9"; // ie8-9 .scale(0.83); + width: 26px; + line-height: 26px; + filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=1); + .rotate(90deg); + + * { + display: none; + } + &:before { content: '\e611'; - .rotate(90deg); - position: absolute; - top: 4px; - left: 3px; } } @@ -210,14 +214,12 @@ &-open { .@{selectPrefixCls}-arrow { - &:before { - .rotate(270deg); - } + filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=3); + .rotate(270deg); } .@{selectPrefixCls}-dropdown { display: block; } - .@{selectPrefixCls}-selection { border-color: #23c0fa; box-shadow: 0 0 3px #23c0fa; diff --git a/style/mixins/input.less b/style/mixins/input.less index d4bd78826d..7c85bcabda 100644 --- a/style/mixins/input.less +++ b/style/mixins/input.less @@ -11,6 +11,20 @@ font-size: @input-font-size-sm; } +// input status +// == when focus or actived +.active(@color: @input-hover-border-color) { + border-color: @color; + outline: 0; + box-shadow: 0 0 3px tint(@color, 20%); +} + +// == when hoverd +.hover(@color: @input-hover-border-color ) { + border-color: @color; +} + + // Basic style for input .input() { position: relative; @@ -30,13 +44,11 @@ .transition(~"border .3s @{ease-in-out}, background .3s @{ease-in-out}, box-shadow .3s @{ease-in-out}"); &:hover { - border-color: @input-hover-border-color; + .hover(); } &:focus { - border-color: @input-focus-border-color; - outline: 0; - box-shadow: 0 0 3px tint(@input-focus-border-color, 20%); + .active(); } &[disabled], @@ -44,7 +56,7 @@ background-color: @input-disabled-bg; opacity: 1; &:hover { - border-color: @input-border-color; + .hover(@input-border-color); } }