merge master

pull/34/head
afc163 10 years ago
commit 30e719cb49

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

@ -17,7 +17,7 @@ let BreadcrumbItem = React.createClass({
let Breadcrumb = React.createClass({ let Breadcrumb = React.createClass({
contextTypes: { contextTypes: {
router: React.PropTypes.func.isRequired router: React.PropTypes.func
}, },
render() { render() {
var crumbs, routes, params; var crumbs, routes, params;
@ -35,7 +35,7 @@ let Breadcrumb = React.createClass({
} else { } else {
link = <Link to={route.path} params={params}>{name}</Link>; link = <Link to={route.path} params={params}>{name}</Link>;
} }
return <BreadcrumbItem>{link}</BreadcrumbItem>; return <BreadcrumbItem key={name}>{link}</BreadcrumbItem>;
}); });
} else { } else {
crumbs = this.props.children; crumbs = this.props.children;

@ -44,7 +44,6 @@
"lodash": "^3.10.0", "lodash": "^3.10.0",
"nico-jsx": "~0.5.8", "nico-jsx": "~0.5.8",
"precommit-hook": "^1.0.7", "precommit-hook": "^1.0.7",
"react-router": "~0.13.3",
"webpack": "^1.10.1", "webpack": "^1.10.1",
"webpack-dev-middleware": "^1.2.0" "webpack-dev-middleware": "^1.2.0"
}, },

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

@ -1,64 +1,84 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="apple-mobile-web-app-capable" content="yes"> <meta name="apple-mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-status-bar-style" content="black"> <meta name="apple-mobile-web-app-status-bar-style" content="black">
<meta name="format-detection" content="telephone=no"> <meta name="format-detection" content="telephone=no">
<title>{% block title %}{{ config.site.name }} - {{ config.site.description }}{% endblock %}</title> <title>{% block title %}{{ config.site.name }} - {{ config.site.description }}{% endblock %}</title>
<link rel="icon" href="https://t.alipayobjects.com/images/T1QUBfXo4fXXXXXXXX.png" type="image/x-icon"> <link rel="icon" href="https://t.alipayobjects.com/images/T1QUBfXo4fXXXXXXXX.png" type="image/x-icon">
<link rel="shortcut icon" href="https://t.alipayobjects.com/images/T1QUBfXo4fXXXXXXXX.png" type="image/x-icon"> <link rel="shortcut icon" href="https://t.alipayobjects.com/images/T1QUBfXo4fXXXXXXXX.png" type="image/x-icon">
<link href="http://fonts.useso.com/css?family=Raleway:600,500,400,300" rel="stylesheet" type="text/css" > <link href="http://fonts.useso.com/css?family=Raleway:600,500,400,300" rel="stylesheet" type="text/css">
<link rel="stylesheet" href="/static/normalize.css"> <link rel="stylesheet" href="/static/normalize.css">
{% block styles %}{% endblock %} {% block styles %}{% endblock %}
<link rel="stylesheet" href="/static/style.css"> <link rel="stylesheet" href="/static/style.css">
<link rel="stylesheet" href="/static/tomorrow.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>
<script src="/static/script.js"></script> (function (con) {
<script> 'use strict';
window.antdVersion = { var prop, method;
latest: '{{config.package.version}}', var empty = {};
stable: '{{config.package.stableVersion}}' var dummy = function () {
}; };
</script> var properties = 'memory'.split(',');
{% block scripts %}{% endblock %} 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 = {
latest: '{{config.package.version}}',
stable: '{{config.package.stableVersion}}'
};
</script>
{% block scripts %}{% endblock %}
</head> </head>
<body {% block bodyAttribute %}{% endblock %}> <body {% block bodyAttribute %}{% endblock %}>
<header id="header"> <header id="header">
<a class="logo" href="/"> <a class="logo" href="/">
<img width="60" src="https://t.alipayobjects.com/images/rmsweb/T1B9hfXcdvXXXXXXXX.svg"> {{ config.site.name }} <img width="60" src="https://t.alipayobjects.com/images/rmsweb/T1B9hfXcdvXXXXXXXX.svg"> {{ config.site.name }}
</a> </a>
<div class="search"> <div class="search">
<form> <form>
<input type="text" placeholder="search"> <input type="text" placeholder="search">
<button type="submit"></button> <button type="submit"></button>
</form> </form>
</div> </div>
<nav class="nav"> <nav class="nav">
<span class="bar"></span> <span class="bar"></span>
<ul> <ul>
<li class="{%- if post.meta.filepath === 'README.md' %}current{%- endif %}"> <li class="{%- if post.meta.filepath === 'README.md' %}current{%- endif %}">
<a href="/">首页</a> <a href="/">首页</a>
</li> </li>
<li class="{%- if post.directory|rootDirectoryIs('docs') %}current{%- endif %}"> <li class="{%- if post.directory|rootDirectoryIs('docs') %}current{%- endif %}">
<a href="/docs/introduce">使用</a> <a href="/docs/introduce">使用</a>
</li> </li>
<li class="{%- if post.directory|rootDirectoryIs('design') %}current{%- endif %}"> <li class="{%- if post.directory|rootDirectoryIs('design') %}current{%- endif %}">
<a class="disabled" href="/design/">设计</a> <a class="disabled" href="/design/">设计</a>
</li> </li>
<li class="{%- if post.directory|rootDirectoryIs('components') %}current{%- endif %}"> <li class="{%- if post.directory|rootDirectoryIs('components') %}current{%- endif %}">
<a href="/components">组件</a> <a href="/components">组件</a>
</li> </li>
<li> <li>
<a target="_blank" href="https://github.com/ant-design/ant-design">Github</a> <a target="_blank" href="https://github.com/ant-design/ant-design">Github</a>
</li> </li>
</ul> </ul>
</nav> </nav>
</header> </header>
<div class="main-wrapper"> <div class="main-wrapper">
{% block aside %}{% endblock %} {% block content %}{% endblock %} {% block aside %}{% endblock %} {% block content %}{% endblock %}
</div> </div>
{%- include "footer.html" %} {%- include "footer.html" %}
</body> </body>
</html> </html>

@ -80,10 +80,11 @@
cursor: pointer; cursor: pointer;
&-inner { &-inner {
.iconfont-mixin(); .iconfont-mixin();
transform: rotate(270deg) scale(0.8);
filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=3);
top:-2px; top:-2px;
&:before { &:before {
content: "\e611"; content: "\e611";
transform: rotate(270deg) scale(0.8);
} }
} }
} }
@ -92,9 +93,10 @@
cursor: pointer; cursor: pointer;
&-inner { &-inner {
.iconfont-mixin(); .iconfont-mixin();
transform: rotate(90deg) scale(0.8);
filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=1);
&:before { &:before {
content: "\e611"; content: "\e611";
transform: rotate(90deg) scale(0.8);
} }
} }
} }

@ -30,21 +30,25 @@
// arrow // arrow
&-arrow { &-arrow {
.iconfont-mixin();
height: 26px; height: 26px;
position: absolute; position: absolute;
top: 1px; top: 1px;
right: 1px; right: 1px;
width: 20px;
font-family: 'anticon';
font-size: @font-size-base; font-size: @font-size-base;
font-size: ~"10px \9"; // ie8-9 font-size: ~"10px \9"; // ie8-9
.scale(0.83); .scale(0.83);
width: 26px;
line-height: 26px;
filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=1);
.rotate(90deg);
* {
display: none;
}
&:before { &:before {
content: '\e611'; content: '\e611';
.rotate(90deg);
position: absolute;
top: 4px;
left: 3px;
} }
} }
@ -210,14 +214,12 @@
&-open { &-open {
.@{selectPrefixCls}-arrow { .@{selectPrefixCls}-arrow {
&:before { filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=3);
.rotate(270deg); .rotate(270deg);
}
} }
.@{selectPrefixCls}-dropdown { .@{selectPrefixCls}-dropdown {
display: block; display: block;
} }
.@{selectPrefixCls}-selection { .@{selectPrefixCls}-selection {
border-color: #23c0fa; border-color: #23c0fa;
box-shadow: 0 0 3px #23c0fa; box-shadow: 0 0 3px #23c0fa;

@ -11,6 +11,20 @@
font-size: @input-font-size-sm; 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 // Basic style for input
.input() { .input() {
position: relative; position: relative;
@ -30,13 +44,11 @@
.transition(~"border .3s @{ease-in-out}, background .3s @{ease-in-out}, box-shadow .3s @{ease-in-out}"); .transition(~"border .3s @{ease-in-out}, background .3s @{ease-in-out}, box-shadow .3s @{ease-in-out}");
&:hover { &:hover {
border-color: @input-hover-border-color; .hover();
} }
&:focus { &:focus {
border-color: @input-focus-border-color; .active();
outline: 0;
box-shadow: 0 0 3px tint(@input-focus-border-color, 20%);
} }
&[disabled], &[disabled],
@ -44,7 +56,7 @@
background-color: @input-disabled-bg; background-color: @input-disabled-bg;
opacity: 1; opacity: 1;
&:hover { &:hover {
border-color: @input-border-color; .hover(@input-border-color);
} }
} }

Loading…
Cancel
Save