Skip to content

A
ant-design

wanjj_1210 / ant-design
与 Fork 源项目一致

从无法访问的项目Fork

通知 10
Star 0
Fork 0
A
ant-design

体验新版 GitCode，发现更多精彩内容 >>

提交 30e719cb 编写于 作者: A afc163
浏览文件
操作

merge master

上级 2c46ad34 c27921f9
隐藏空白更改
内联 并排
Showing with 106 addition and 78 deletion
components/breadcrumb/demo/router.md
浏览文件 @ 30e719cb
......@@ -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
浏览文件 @ 30e719cb
......@@ -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;
......
scripts/demo.js
浏览文件 @ 30e719cb
window['react-router'] = require('react-router');
window['css-animation'] = require('css-animation');
window['react-router'] = window.ReactRouter;
site/templates/layout.html
浏览文件 @ 30e719cb
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<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-status-bar-style" content="black">
<meta name="format-detection" content="telephone=no">
<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="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 rel="stylesheet" href="/static/normalize.css">
{% 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 src="/static/script.js"></script>
<script>
window.antdVersion = {
latest: '{{config.package.version}}',
stable: '{{config.package.stableVersion}}'
};
</script>
{% block scripts %}{% endblock %}
<meta charset="utf-8">
<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-status-bar-style" content="black">
<meta name="format-detection" content="telephone=no">
<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="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 rel="stylesheet" href="/static/normalize.css">
{% block styles %}{% endblock %}
<link rel="stylesheet" href="/static/style.css">
<link rel="stylesheet" href="/static/tomorrow.css">
<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 = {
latest: '{{config.package.version}}',
stable: '{{config.package.stableVersion}}'
};
</script>
{% block scripts %}{% endblock %}
</head>
<body {% block bodyAttribute %}{% endblock %}>
<header id="header">
<header id="header">
<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>
<div class="search">
<form>
<input type="text" placeholder="search">
<button type="submit"></button>
</form>
<form>
<input type="text" placeholder="search">
<button type="submit"></button>
</form>
</div>
<nav class="nav">
<span class="bar"></span>
<ul>
<li class="{%- if post.meta.filepath === 'README.md' %}current{%- endif %}">
<a href="/">首页</a>
</li>
<li class="{%- if post.directory|rootDirectoryIs('docs') %}current{%- endif %}">
<a href="/docs/introduce">使用</a>
</li>
<li class="{%- if post.directory|rootDirectoryIs('design') %}current{%- endif %}">
<a class="disabled" href="/design/">设计</a>
</li>
<li class="{%- if post.directory|rootDirectoryIs('components') %}current{%- endif %}">
<a href="/components">组件</a>
</li>
<li>
<a target="_blank" href="https://github.com/ant-design/ant-design">Github</a>
</li>
</ul>
<span class="bar"></span>
<ul>
<li class="{%- if post.meta.filepath === 'README.md' %}current{%- endif %}">
<a href="/">首页</a>
</li>
<li class="{%- if post.directory|rootDirectoryIs('docs') %}current{%- endif %}">
<a href="/docs/introduce">使用</a>
</li>
<li class="{%- if post.directory|rootDirectoryIs('design') %}current{%- endif %}">
<a class="disabled" href="/design/">设计</a>
</li>
<li class="{%- if post.directory|rootDirectoryIs('components') %}current{%- endif %}">
<a href="/components">组件</a>
</li>
<li>
<a target="_blank" href="https://github.com/ant-design/ant-design">Github</a>
</li>
</ul>
</nav>
</header>
<div class="main-wrapper">
</header>
<div class="main-wrapper">
{% block aside %}{% endblock %} {% block content %}{% endblock %}
</div>
{%- include "footer.html" %}
</div>
{%- include "footer.html" %}
</body>
</html>
style/components/inputNumber.less
浏览文件 @ 30e719cb
......@@ -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
浏览文件 @ 30e719cb
......@@ -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;
......
style/mixins/input.less
浏览文件 @ 30e719cb
......@@ -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);
}
}
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或