merge master

components/breadcrumb/demo/router.md

@@ -22,12 +22,6 @@ var Apps = React.createClass({
   }
 });
 
-var App = React.createClass({
-  render() {
-    return <div></div>;
-  }
-});
-
 var App = React.createClass({
   render() {
     return (<div>

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 = <Link to={route.path} params={params}>{name}</Link>;
         }
-        return <BreadcrumbItem>{link}</BreadcrumbItem>;
+        return <BreadcrumbItem key={name}>{link}</BreadcrumbItem>;
       });
     } else {
       crumbs = this.props.children;

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"
   },

scripts/demo.js

@@ -1,3 +1,2 @@
-window['react-router'] = require('react-router');
-
 window['css-animation'] = require('css-animation');
+window['react-router'] = window.ReactRouter;

site/templates/layout.html

@@ -14,7 +14,26 @@
     {% block styles %}{% endblock %}
     <link rel="stylesheet" href="/static/style.css">
     <link rel="stylesheet" href="/static/tomorrow.css">
-  <script src="https://a.alipayobjects.com/??jquery/jquery/1.11.1/jquery.js,es5-shim/4.0.5/es5-shim.js,es5-shim/4.0.5/es5-sham.js,html5shiv/3.7.2/src/html5shiv.js,react/0.13.3/react.js,bluebird/2.9.30/bluebird.js"></script>
+    <script>
+        (function (con) {
+            'use strict';
+            var prop, method;
+            var empty = {};
+            var dummy = function () {
+            };
+            var properties = 'memory'.split(',');
+            var methods = ('assert,clear,count,debug,dir,dirxml,error,exception,group,' +
+            'groupCollapsed,groupEnd,info,log,markTimeline,profile,profiles,profileEnd,' +
+            'show,table,time,timeEnd,timeline,timelineEnd,timeStamp,trace,warn').split(',');
+            while (prop = properties.pop()) {
+                con[prop] = con[prop] || empty;
+            }
+            while (method = methods.pop()) {
+                con[method] = con[method] || dummy;
+            }
+        })(this.console = this.console || {});
+    </script>
+    <script src="https://a.alipayobjects.com/??bluebird/2.9.30/bluebird.js,jquery/jquery/1.11.1/jquery.js,es5-shim/4.0.5/es5-shim-debug.js,es5-shim/4.0.5/es5-sham-debug.js,html5shiv/3.7.2/src/html5shiv.js,react/0.13.3/react.js,react-router/0.13.3/ReactRouter.js"></script>
     <script src="/static/script.js"></script>
     <script>
         window.antdVersion = {
@@ -29,6 +48,7 @@
     <a class="logo" href="/">
         <img width="60" src="https://t.alipayobjects.com/images/rmsweb/T1B9hfXcdvXXXXXXXX.svg"> {{ config.site.name }}
     </a>
+
     <div class="search">
         <form>
             <input type="text" placeholder="search">

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);
       }
     }
   }

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 {
+      filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=3);
       .rotate(270deg);
     }
-    }
     .@{selectPrefixCls}-dropdown {
       display: block;
     }
-
     .@{selectPrefixCls}-selection {
       border-color: #23c0fa;
       box-shadow: 0 0 3px #23c0fa;

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);
     }
   }