提交 53763092 编写于 作者: 然则

Merge branch 'master' of github.com:ant-design/ant-design

......@@ -28,7 +28,7 @@
| disabled | 禁用 | bool | false |
<style>
.code-box-demo .ant-calendar-picker {
.code-box-demo .ant-calendar-picker-input {
width: 200px;
}
</style>
......@@ -30,30 +30,21 @@
````html
<form class="ant-form-horizontal">
<fieldset disabled>
<div class="ant-form-item">
<label for="disabledTextInput" class="col-5">Input:</label>
<div class="ant-form-item ant-form-item-compact">
<label for="userName" class="col-5" required>用户名:</label>
<div class="col-12">
<input type="text" id="disabledTextInput" class="ant-input" placeholder="Disabled input">
<p class="ant-form-text">大眼萌 minion</p>
</div>
</div>
<div class="ant-form-item">
<label for="disabledSelect" class="col-5">Select:</label>
<label for="password" class="col-5" required>密码:</label>
<div class="col-12">
<select id="disabledSelect" class="ant-input">
<option>Disabled select</option>
</select>
</div>
</div>
<div class="ant-form-item ant-form-item-compact">
<div class="col-14 col-offset-5">
<label class="ant-checkbo-inline">
<input type="checkbox"> checkbox
</label>
<input class="ant-input" type="password" id="password" value="123456"/>
</div>
</div>
<div class="row">
<div class="col-14 col-offset-5">
<input type="submit" class="ant-btn ant-btn-primary" value="确 定">
<div class="col-12 col-offset-5">
<input type="submit" class="ant-btn ant-btn-primary" value="确 定" />
</div>
</div>
</fieldset>
......
......@@ -8,92 +8,88 @@
---
````html
<form class="ant-form-horizontal">
<div class="ant-form-item">
<label class="col-6">输入框:</label>
<div class="col-18">
<input type="text" class="ant-input" placeholder="Please enter...">
</div>
</div>
<div class="ant-form-item">
<label class="col-6">文本域:</label>
<div class="col-18">
<textarea class="ant-input"></textarea>
````jsx
var Select = antd.Select;
var Option = Select.Option;
var Checkbox = antd.Checkbox;
var Radio = antd.Radio;
var RadioGroup = antd.RadioGroup;
function handleSelectChange(value) {
console.log('selected ' + value);
}
React.render(
<form className="ant-form-horizontal">
<div className="ant-form-item">
<label className="col-6">输入框:</label>
<div className="col-14">
<input type="text" className="ant-input" placeholder="Please enter..." />
</div>
</div>
<div class="ant-form-item">
<label class="col-6">下拉列表:</label>
<div class="col-18">
<select class="ant-input">
<option>选项一</option>
<option>选项二</option>
<option>选项三</option>
<option>选项四</option>
<option>选线五</option>
</select>
<div className="ant-form-item">
<label className="col-6">文本域:</label>
<div className="col-14">
<textarea className="ant-input"></textarea>
</div>
</div>
<div class="ant-form-item ant-form-item-compact">
<label class="col-6">checkbox 复选框:</label>
<div class="col-18">
<label class="ant-checkbox-vertical">
<input type="checkbox" value="apple"> Apple
</label>
<!-- disabled checkbox -->
<label class="ant-checkbox-vertical">
<input type="checkbox" value="banana" disabled> Banana(disabled)
</label>
<div className="ant-form-item">
<label className="col-6">ant-select:</label>
<div className="col-14">
<Select value="lucy" style={{width:200}} onChange={handleSelectChange}>
<Option value="jack">jack</Option>
<Option value="lucy">lucy</Option>
<Option value="disabled" disabled>disabled</Option>
<Option value="yiminghe">yiminghe</Option>
</Select>
</div>
</div>
<div class="ant-form-item ant-form-item-compact">
<label class="col-6">内联的 checkbox:</label>
<div class="col-18">
<!-- 内联的checkbox -->
<label class="ant-checkbox-inline">
<input type="checkbox" id="inlineCheckbox1" value="Kevin"> Kevin
<div className="ant-form-item ant-form-item-compact">
<label className="col-6">ant-checkbox:</label>
<div className="col-18">
<label className="ant-checkbox-vertical">
<Checkbox /> 选项一
</label>
<label class="ant-checkbox-inline">
<input type="checkbox" id="inlineCheckbox2" value="Bob"> Bob
<label className="ant-checkbox-vertical">
<Checkbox /> 选项二
</label>
<label class="ant-checkbox-inline">
<input type="checkbox" id="inlineCheckbox3" value="Stuart"> Stuart
<label className="ant-checkbox-vertical">
<Checkbox disabled={true} /> 选项三(不可选)
</label>
</div>
</div>
<div class="ant-form-item ant-form-item-compact">
<label class="col-6">radio 单选框:</label>
<div class="col-18">
<label class="ant-radio-vertical">
<input type="radio" name="radios" id="optionsRadios1" value="option1" checked> Apple
<div className="ant-form-item ant-form-item-compact">
<label className="col-6">ant-checkbox:</label>
<div className="col-18">
<label className="ant-checkbox-inline">
<Checkbox />选项一
</label>
<label className="ant-checkbox-inline">
<Checkbox />选项二
</label>
<!-- disabled radio -->
<label class="ant-radio-vertical">
<input type="radio" name="radios" id="optionsRadios3" value="option3" disabled> Banana(disabled)
<label className="ant-checkbox-inline">
<Checkbox />选项三
</label>
</div>
</div>
<div class="ant-form-item ant-form-item-compact">
<label class="col-6">内联的 radio:</label>
<div class="col-18">
<!-- 内联的radio -->
<label class="ant-radio-inline">
<input type="radio" name="inlineRadios" id="inlineRadio1" value="Kevin"> Kevin
</label>
<label class="ant-radio-inline">
<input type="radio" name="inlineRadios" id="inlineRadio2" value="Stuart"> Stuart
</label>
<label class="ant-radio-inline">
<input type="radio" name="inlineRadios" id="inlineRadio3" value="Bob"> Bob
</label>
<div className="ant-form-item ant-form-item-compact">
<label className="col-6">ant-radio:</label>
<div className="col-18">
<RadioGroup>
<Radio value="a" checked={true}>A</Radio>
<Radio value="b" >B</Radio>
<Radio value="c" >C</Radio>
<Radio value="d" disabled={true}>D</Radio>
</RadioGroup>
</div>
</div>
<div class="ant-form-item ant-form-item-compact">
<label class="col-6" for="InputFile">头像:</label>
<div class="col-18">
<input type="file" id="InputFile" class="ant-upload">
<p class="ant-form-explain">请选择一个文件</p>
<div className="ant-form-item ant-form-item-compact">
<label className="col-6" for="InputFile">头像:</label>
<div className="col-18">
<input type="file" id="InputFile" className="ant-upload" />
<p className="ant-form-explain">请选择一个文件</p>
</div>
</div>
</form>
, document.getElementById('components-form-demo-form-controls'));
````
......@@ -12,48 +12,52 @@
---
````html
<form class="ant-form-horizontal">
<div class="ant-form-item ant-form-item-compact">
<label for="userName" class="col-6" required>用户名:</label>
<div class="col-6">
<p class="ant-form-text">大眼萌 minion</p>
````jsx
var Checkbox = antd.Checkbox;
var Radio = antd.Radio;
var RadioGroup = antd.RadioGroup;
React.render(
<form className="ant-form-horizontal">
<div className="ant-form-item ant-form-item-compact">
<label for="userName" className="col-6" required>用户名:</label>
<div className="col-6">
<p className="ant-form-text">大眼萌 minion</p>
</div>
</div>
<div class="ant-form-item">
<label for="password" class="col-6" required>密码:</label>
<div class="col-14">
<input class="ant-input" type="password" id="password" placeholder="请输入密码"/>
</div>
<div className="ant-form-item">
<label for="password" className="col-6" required>密码:</label>
<div className="col-14">
<input className="ant-input" type="password" id="password" placeholder="请输入密码"/>
</div>
</div>
<div class="ant-form-item ant-form-item-compact">
<label class="col-6" required>您的性别:</label>
<div class="col-14">
<label class="ant-radio-inline">
<input type="radio" name="radios" id="male-radio" value="male" checked> 男的
</label>
<label class="ant-radio-inline">
<input type="radio" name="radios" id="female-radio" value="female"> 女的
</label>
<div className="ant-form-item ant-form-item-compact">
<label className="col-6" required>您的性别:</label>
<div className="col-14">
<RadioGroup>
<Radio value="male" checked={true}>男的</Radio>
<Radio value="female">女的</Radio>
</RadioGroup>
</div>
</div>
<div class="ant-form-item">
<label for="password" class="col-6" required>备注:</label>
<div class="col-14">
<textarea class="ant-input" placeholder="随便写"></textarea>
<div className="ant-form-item">
<label for="password" className="col-6" required>备注:</label>
<div className="col-14">
<textarea className="ant-input" placeholder="随便写"></textarea>
</div>
</div>
<div class="ant-form-item ant-form-item-compact">
<div class="col-14 col-offset-6">
<div className="ant-form-item ant-form-item-compact">
<div className="col-14 col-offset-6">
<label>
<input type="checkbox"> 我是同意的
<Checkbox /> 同意
</label>
</div>
</div>
<div class="row">
<div class="col-16 col-offset-6">
<input type="submit" class="ant-btn ant-btn-primary" value="确 定" />
<div className="row">
<div className="col-16 col-offset-6">
<input type="submit" className="ant-btn ant-btn-primary" value="确 定" />
</div>
</div>
</form>
, document.getElementById('components-form-demo-horizontal-form'));
````
......@@ -6,34 +6,25 @@
---
````html
<form class="ant-form-inline">
<div class="ant-form-item">
````jsx
var Checkbox = antd.Checkbox;
React.render(
<form className="ant-form-inline">
<div className="ant-form-item">
<label for="userName">账户:</label>
<input class="ant-input" type="text" id="userName" placeholder="请输入"/>
<input className="ant-input" type="text" id="userName" placeholder="请输入账户名" />
</div>
<div class="ant-form-item">
<div className="ant-form-item">
<label for="password">密码:</label>
<input class="ant-input" type="password" id="password" placeholder="请输入密码"/>
<input className="ant-input" type="password" id="password" placeholder="请输入密码" />
</div>
<input type="submit" class="ant-btn ant-btn-primary" value="登 录" />
</form>
<br />
<form class="ant-form-inline">
<div class="ant-form-item">
<input class="ant-input" type="text" id="userName" placeholder="请输入账户名"/>
</div>
<div class="ant-form-item">
<input class="ant-input" type="password" id="password" placeholder="请输入密码"/>
</div>
<div class="ant-checkbox-inline">
<label>
<input type="checkbox"> 记住我
<div className="ant-checkbox-inline">
<label className="ant-checkbox-inline">
<Checkbox /> 记住我
</label>
</div>
<input type="submit" class="ant-btn ant-btn-primary" value="登 录" />
<input type="submit" className="ant-btn ant-btn-primary" value="登 录" />
</form>
, document.getElementById('components-form-demo-inline-form'));
````
......@@ -22,5 +22,4 @@
</div>
</div>
</div>
````
......@@ -76,5 +76,5 @@
<p class="ant-form-explain">请输入正确的电话号码</p>
</div>
</div>
</form>
</form>
````
......@@ -15,9 +15,6 @@ var Switch = antd.Switch;
var Menu = antd.Menu;
var Dropdown = antd.Dropdown;
var Slider = antd.Slider;
var Checkbox = antd.Checkbox;
var Radio = antd.Radio;
var RadioGroup = antd.RadioGroup;
var menu = <Menu>
<Menu.Item>
......@@ -40,131 +37,90 @@ function onInputNumberChange(v){
}
React.render(
<form className="ant-form-horizontal">
<div className="ant-form-item">
<label className="col-6" required>Input-Number:</label>
<div className="col-10">
<InputNumber min={1} max={10} defaultValue={3} onChange={onInputNumberChange} style={{width:100}}/>
<span className="ant-form-text"> 台机器</span>
</div>
<form className="ant-form-horizontal">
<div className="ant-form-item">
<label className="col-6" required>Input-Number:</label>
<div className="col-10">
<InputNumber min={1} max={10} defaultValue={3} onChange={onInputNumberChange} style={{width:100}}/>
<span className="ant-form-text"> 台机器</span>
</div>
<div className="ant-form-item ant-form-item-compact">
<label className="col-6" required>
<i className="anticon anticon-exclamation-circle" style={{color: '#f60'}}></i> 我是标题:
</label>
<div className="col-7">
<p className="ant-form-text">唧唧复唧唧木兰当户织呀</p>
</div>
<div className="col-9">
<p className="ant-form-text">
<a href="javascript:;">链接文字</a>
</p>
</div>
</div>
<div className="ant-form-item ant-form-item-compact">
<label className="col-6" required>
<i className="anticon anticon-exclamation-circle" style={{color: '#f60'}}></i> 我是标题:
</label>
<div className="col-10">
<p className="ant-form-text">唧唧复唧唧木兰当户织呀</p>
<p className="ant-form-text">
<a href="javascript:;">链接文字</a>
</p>
</div>
<div className="ant-form-item">
<label for="" className="col-6" required>Switch 开关:</label>
<div className="col-10">
<Switch />
</div>
</div>
<div className="ant-form-item">
<label for="" className="col-6" required>Switch 开关:</label>
<div className="col-10">
<Switch />
</div>
<div className="ant-form-item">
<label for="" className="col-6" required>Slider 滑动输入条:</label>
<div className="col-10">
<Slider marks={["A","B","C","D","E","F","G"]} />
</div>
</div>
<div className="ant-form-item">
<label for="" className="col-6" required>Slider 滑动输入条:</label>
<div className="col-10">
<Slider marks={["A","B","C","D","E","F","G"]} />
</div>
<div className="ant-form-item">
<label for="" className="col-6" required>Select 选择器:</label>
<div className="col-18">
<Select value="lucy" style={{width:200}} onChange={handleSelectChange}>
<Option value="jack">jack</Option>
<Option value="lucy">lucy</Option>
<Option value="disabled" disabled>disabled</Option>
<Option value="yiminghe">yiminghe</Option>
</Select>
</div>
</div>
<div className="ant-form-item">
<label for="" className="col-6" required>Select 选择器:</label>
<div className="col-18">
<Select value="lucy" style={{width:200}} onChange={handleSelectChange}>
<Option value="jack">jack</Option>
<Option value="lucy">lucy</Option>
<Option value="disabled" disabled>disabled</Option>
<Option value="yiminghe">yiminghe</Option>
</Select>
</div>
<div className="ant-form-item">
<label className="col-6" for="site4">按钮式下拉输入框:</label>
<div className="col-16">
<div className="ant-input-group">
<input type="text" className="ant-input" id="site4" placeholder="Search for..." />
<div className="ant-input-group-btn">
<Dropdown overlay={menu}>
<button className="ant-btn ant-btn-menu">
.com <i className="anticon anticon-down"></i>
</button>
</Dropdown>
</div>
</div>
<div className="ant-form-item">
<label className="col-6" for="site4">按钮式下拉输入框:</label>
<div className="col-16">
<div className="ant-input-group">
<input type="text" className="ant-input" id="site4" placeholder="Search for..." />
<div className="ant-input-group-btn">
<Dropdown overlay={menu}>
<button className="ant-btn ant-btn-menu">
.com <i className="anticon anticon-down"></i>
</button>
</Dropdown>
</div>
</div>
</div>
<div className="ant-form-item ant-form-item-compact">
<label for="" className="col-6" required>ant-radio:</label>
<div className="col-16">
<RadioGroup>
<Radio value="a" checked={true}>选项一</Radio>
<Radio value="b">选项二</Radio>
<Radio value="c">选项三</Radio>
<Radio value="d">选项四</Radio>
</RadioGroup>
</div>
</div>
<div className="ant-form-item">
<label for="" className="col-6" required>Datepicker:</label>
<div className="col-6">
<Datepicker value="" />
</div>
<div className="ant-form-item ant-form-item-compact">
<label for="" className="col-6" required>ant-checkbox:</label>
<div className="col-16">
<label className="ant-checkbox-inline">
<Checkbox />选项一
</label>
<label className="ant-checkbox-inline">
<Checkbox />选项二
</label>
<label className="ant-checkbox-inline">
<Checkbox />选项三
</label>
</div>
<div className="col-2">
<p className="ant-form-split">--</p>
</div>
<div className="ant-form-item ant-form-item-compact">
<label for="" className="col-6" required>垂直的 ant-checkbox:</label>
<div className="col-16">
<label className="ant-checkbox-vertical">
<Checkbox /> 选项一
</label>
<label className="ant-checkbox-vertical">
<Checkbox /> 选项二
</label>
<label className="ant-checkbox-vertical">
<Checkbox /> 选项三
</label>
</div>
<div className="col-6">
<Datepicker value="" />
</div>
<div className="ant-form-item">
<label for="" className="col-6" required>Datepicker:</label>
<div className="col-6">
<Datepicker value="" />
</div>
<div className="col-2">
<p className="ant-form-split">--</p>
</div>
<div className="col-6">
<Datepicker value="" />
</div>
</div>
<div className="ant-form-item has-error">
<label for="" className="col-6" required>Datepicker 校验:</label>
<div className="col-6">
<Datepicker value="" />
</div>
<div className="ant-form-item has-error">
<label for="" className="col-6" required>Datepicker 校验:</label>
<div className="col-6">
<Datepicker value="" />
</div>
<div className="col-2">
<p className="ant-form-split">--</p>
</div>
<div className="col-6">
<Datepicker value="" />
</div>
<div className="col-19 col-offset-6">
<p className="ant-form-explain">请输入正确选项</p>
</div>
<div className="col-2">
<p className="ant-form-split">--</p>
</div>
<div className="col-6">
<Datepicker value="" />
</div>
<div className="col-19 col-offset-6">
<p className="ant-form-explain">请输入正确选项</p>
</div>
</form>
</div>
</form>
, document.getElementById('components-form-demo-mix'));
````
......@@ -14,7 +14,7 @@ function onChange(value) {
}
React.render(
<InputNumber min={1} max={10} defaultValue={3} onChange={onChange} style={{width:100}} />
<InputNumber min={1} max={10} defaultValue={3} onChange={onChange} />
, document.getElementById('components-input-number-demo-basic'));
````
......@@ -22,10 +22,10 @@ var Test = React.createClass({
},
render() {
return <div>
<InputNumber min={1} max={10} disabled={this.state.disabled} defaultValue={3} style={{width:100}} />
<br />
<br />
<button onClick={this.toggle} className="ant-btn ant-btn-primary">Toggle disabled</button>
<InputNumber min={1} max={10} disabled={this.state.disabled} defaultValue={3} />
<div style={{marginTop: 20}}>
<button onClick={this.toggle} className="ant-btn ant-btn-primary">Toggle disabled</button>
</div>
</div>;
}
});
......
......@@ -8,7 +8,7 @@ var AntInputNumber = React.createClass({
};
},
render() {
return <InputNumber {...this.props} />;
return <InputNumber style={{width: 90}} {...this.props} />;
}
});
......
......@@ -10,7 +10,7 @@
## 何时使用
- 当需要获取标准数值时。
当需要获取标准数值时。
## API
......
......@@ -220,7 +220,4 @@ React.render(<Test/>, document.getElementById('components-motion-demo-basic'));
.motion-select {
text-align: center;
}
.code-boxes-col-2-1 {
width:100%;
}
</style>
\ No newline at end of file
</style>
......@@ -3,6 +3,7 @@
- category: CSS
- chinese: 组件动画
- order: 4
- cols: 1
---
......
......@@ -11,10 +11,8 @@
<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="/dist/{{ config.package.name }}-{{ config.package.version }}.css">
<link rel="stylesheet" href="/static/style.css">
<link rel="stylesheet" href="/static/tomorrow.css">
<script>
......@@ -85,12 +83,11 @@
<body {% block bodyAttribute %}{% endblock %}>
<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>
<div id="autoComplete"></div>
</form>
<div class="search">
<div id="autoComplete"></div>
</div>
<nav class="nav">
<span class="bar"></span>
......
/*! normalize.css v3.0.2 | MIT License | git.io/normalize */
/**
* 1. Set default font family to sans-serif.
* 2. Prevent iOS text size adjust after orientation change, without disabling
* user zoom.
*/
html {
font-family: sans-serif; /* 1 */
-ms-text-size-adjust: 100%; /* 2 */
-webkit-text-size-adjust: 100%; /* 2 */
}
/**
* Remove default margin.
*/
body {
margin: 0;
}
/* HTML5 display definitions
========================================================================== */
/**
* Correct `block` display not defined for any HTML5 element in IE 8/9.
* Correct `block` display not defined for `details` or `summary` in IE 10/11
* and Firefox.
* Correct `block` display not defined for `main` in IE 11.
*/
article,
aside,
details,
figcaption,
figure,
footer,
header,
hgroup,
main,
menu,
nav,
section,
summary {
display: block;
}
/**
* 1. Correct `inline-block` display not defined in IE 8/9.
* 2. Normalize vertical alignment of `progress` in Chrome, Firefox, and Opera.
*/
audio,
canvas,
progress,
video {
display: inline-block; /* 1 */
vertical-align: baseline; /* 2 */
}
/**
* Prevent modern browsers from displaying `audio` without controls.
* Remove excess height in iOS 5 devices.
*/
audio:not([controls]) {
display: none;
height: 0;
}
/**
* Address `[hidden]` styling not present in IE 8/9/10.
* Hide the `template` element in IE 8/9/11, Safari, and Firefox < 22.
*/
[hidden],
template {
display: none;
}
/* Links
========================================================================== */
/**
* Remove the gray background color from active links in IE 10.
*/
a {
background-color: transparent;
}
/**
* Improve readability when focused and also mouse hovered in all browsers.
*/
a:active,
a:hover {
outline: 0;
}
/* Text-level semantics
========================================================================== */
/**
* Address styling not present in IE 8/9/10/11, Safari, and Chrome.
*/
abbr[title] {
border-bottom: 1px dotted;
}
/**
* Address style set to `bolder` in Firefox 4+, Safari, and Chrome.
*/
b,
strong {
font-weight: bold;
}
/**
* Address styling not present in Safari and Chrome.
*/
dfn {
font-style: italic;
}
/**
* Address variable `h1` font-size and margin within `section` and `article`
* contexts in Firefox 4+, Safari, and Chrome.
*/
h1 {
font-size: 2em;
margin: 0.67em 0;
}
/**
* Address styling not present in IE 8/9.
*/
mark {
background: #ff0;
color: #000;
}
/**
* Address inconsistent and variable font size in all browsers.
*/
small {
font-size: 80%;
}
/**
* Prevent `sub` and `sup` affecting `line-height` in all browsers.
*/
sub,
sup {
font-size: 75%;
line-height: 0;
position: relative;
vertical-align: baseline;
}
sup {
top: -0.5em;
}
sub {
bottom: -0.25em;
}
/* Embedded content
========================================================================== */
/**
* Remove border when inside `a` element in IE 8/9/10.
*/
img {
border: 0;
}
/**
* Correct overflow not hidden in IE 9/10/11.
*/
svg:not(:root) {
overflow: hidden;
}
/* Grouping content
========================================================================== */
/**
* Address margin not present in IE 8/9 and Safari.
*/
figure {
margin: 1em 40px;
}
/**
* Address differences between Firefox and other browsers.
*/
hr {
-moz-box-sizing: content-box;
box-sizing: content-box;
height: 0;
}
/**
* Contain overflow in all browsers.
*/
pre {
overflow: auto;
}
/**
* Address odd `em`-unit font size rendering in all browsers.
*/
code,
kbd,
pre,
samp {
font-family: monospace, monospace;
font-size: 1em;
}
/* Forms
========================================================================== */
/**
* Known limitation: by default, Chrome and Safari on OS X allow very limited
* styling of `select`, unless a `border` property is set.
*/
/**
* 1. Correct color not being inherited.
* Known issue: affects color of disabled elements.
* 2. Correct font properties not being inherited.
* 3. Address margins set differently in Firefox 4+, Safari, and Chrome.
*/
button,
input,
optgroup,
select,
textarea {
color: inherit; /* 1 */
font: inherit; /* 2 */
margin: 0; /* 3 */
}
/**
* Address `overflow` set to `hidden` in IE 8/9/10/11.
*/
button {
overflow: visible;
}
/**
* Address inconsistent `text-transform` inheritance for `button` and `select`.
* All other form control elements do not inherit `text-transform` values.
* Correct `button` style inheritance in Firefox, IE 8/9/10/11, and Opera.
* Correct `select` style inheritance in Firefox.
*/
button,
select {
text-transform: none;
}
/**
* 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio`
* and `video` controls.
* 2. Correct inability to style clickable `input` types in iOS.
* 3. Improve usability and consistency of cursor style between image-type
* `input` and others.
*/
button,
html input[type="button"], /* 1 */
input[type="reset"],
input[type="submit"] {
-webkit-appearance: button; /* 2 */
cursor: pointer; /* 3 */
}
/**
* Re-set default cursor for disabled elements.
*/
button[disabled],
html input[disabled] {
cursor: default;
}
/**
* Remove inner padding and border in Firefox 4+.
*/
button::-moz-focus-inner,
input::-moz-focus-inner {
border: 0;
padding: 0;
}
/**
* Address Firefox 4+ setting `line-height` on `input` using `!important` in
* the UA stylesheet.
*/
input {
line-height: normal;
}
/**
* It's recommended that you don't attempt to style these elements.
* Firefox's implementation doesn't respect box-sizing, padding, or width.
*
* 1. Address box sizing set to `content-box` in IE 8/9/10.
* 2. Remove excess padding in IE 8/9/10.
*/
input[type="checkbox"],
input[type="radio"] {
box-sizing: border-box; /* 1 */
padding: 0; /* 2 */
}
/**
* Fix the cursor style for Chrome's increment/decrement buttons. For certain
* `font-size` values of the `input`, it causes the cursor style of the
* decrement button to change from `default` to `text`.
*/
input[type="number"]::-webkit-inner-spin-button,
input[type="number"]::-webkit-outer-spin-button {
height: auto;
}
/**
* 1. Address `appearance` set to `searchfield` in Safari and Chrome.
* 2. Address `box-sizing` set to `border-box` in Safari and Chrome
* (include `-moz` to future-proof).
*/
input[type="search"] {
-webkit-appearance: textfield; /* 1 */
-moz-box-sizing: content-box;
-webkit-box-sizing: content-box; /* 2 */
box-sizing: content-box;
}
/**
* Remove inner padding and search cancel button in Safari and Chrome on OS X.
* Safari (but not Chrome) clips the cancel button when the search input has
* padding (and `textfield` appearance).
*/
input[type="search"]::-webkit-search-cancel-button,
input[type="search"]::-webkit-search-decoration {
-webkit-appearance: none;
}
/**
* Define consistent border, margin, and padding.
*/
fieldset {
border: 1px solid #c0c0c0;
margin: 0 2px;
padding: 0.35em 0.625em 0.75em;
}
/**
* 1. Correct `color` not being inherited in IE 8/9/10/11.
* 2. Remove padding so people aren't caught out if they zero out fieldsets.
*/
legend {
border: 0; /* 1 */
padding: 0; /* 2 */
}
/**
* Remove default vertical scrollbar in IE 8/9/10/11.
*/
textarea {
overflow: auto;
}
/**
* Don't inherit the `font-weight` (applied by a rule above).
* NOTE: the default cannot safely be changed in Chrome and Safari on OS X.
*/
optgroup {
font-weight: bold;
}
/* Tables
========================================================================== */
/**
* Remove most spacing between table cells.
*/
table {
border-collapse: collapse;
border-spacing: 0;
}
td,
th {
padding: 0;
}
......@@ -59,7 +59,7 @@ body {
body {
font-family: "Helvetica Neue",Helvetica,"Hiragino Sans GB","Microsoft YaHei","微软雅黑",SimSun,sans-serif;
line-height: 1.5;
color: #888;
color: #777;
font-size: 14px;
background: #fff;
transition: background 1s cubic-bezier(0.075, 0.82, 0.165, 1);
......@@ -1647,7 +1647,7 @@ footer ul li > a {
}
.code-boxes-col-1-1 {
width: 75%;
width: 80%;
}
.code-boxes-col-2-1 {
......
......@@ -10,7 +10,6 @@
.@{prefixCalendarClass}-picker {
position: relative;
display: inline-block;
width: 100%;
&-icon {
position: absolute;
......
......@@ -85,13 +85,18 @@ input[type="checkbox"] {
}
.@{css-prefix}form-text, .@{css-prefix}form-split {
display: inline-block;
margin: 0!important;
padding-top: 7px;
padding-bottom: 7px;
}
.@{css-prefix}form-text {
display: inline-block;
padding-right: 8px;
}
.@{css-prefix}form-split {
display: block;
text-align: center;
}
......@@ -159,6 +164,10 @@ form {
margin-top: -1px;
margin-right: 8px;
}
.@{prefixCalendarClass}-picker {
width: 100%;
}
}
// Form layout
......
......@@ -22,7 +22,8 @@
height: 14px;
overflow: hidden;
color: #999;
&:hover {
&:hover &-up-inner,
&:hover &-down-inner {
color: tint(@primary-color, 20%);
}
}
......@@ -37,6 +38,7 @@
height: 12px;
.iconfont-size-under-12px(8px);
right: 4px;
color: #999;
}
&:hover {
......@@ -98,7 +100,6 @@
&-handler-down {
cursor: pointer;
&-inner {
bottom: 1px;
&:before {
content: "\e600";
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册