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

This commit is contained in:
afc163 2015-06-09 12:12:05 +08:00
commit 8093c24ba9
2 changed files with 13 additions and 14 deletions

View File

@ -32,12 +32,12 @@
<h4>带图标按钮组合 </h4>
<div class="ant-btn-group">
<button class="ant-btn ant-btn-primary">
<span class="anticon anticon-caret-left"></span>
<span>前 进</span>
<span class="anticon anticon-angle-double-left"></span>
<span>后 退</span>
</button>
<button class="ant-btn ant-btn-primary">
<span>后 退</span>
<span class="anticon anticon-caret-right"></span>
<span>前 进</span>
<span class="anticon anticon-angle-double-right"></span>
</button>
</div>
<div class="ant-btn-group">
@ -55,8 +55,8 @@
<button class="ant-btn ant-btn-ghost">3</button>
<button class="ant-btn ant-btn-ghost">4</button>
<button class="ant-btn ant-btn-ghost">
<span>前进</span>
<span class="anticon anticon-caret-right"></span>
<span> </span>
<span class="anticon anticon-angle-double-right"></span>
</button>
</div>
<h4>尺寸</h4>
@ -66,9 +66,9 @@
<button class="ant-btn ant-btn-ghost"></button>
</div>
<div class="ant-btn-group">
<button class="ant-btn ant-btn-ghost">正常</button>
<button class="ant-btn ant-btn-ghost">正常</button>
<button class="ant-btn ant-btn-ghost">正常</button>
<button class="ant-btn ant-btn-ghost">默 认</button>
<button class="ant-btn ant-btn-ghost">默 认</button>
<button class="ant-btn ant-btn-ghost">默 认</button>
</div>
<div class="ant-btn-group ant-btn-group-sm">
<button class="ant-btn ant-btn-ghost"></button>
@ -81,4 +81,7 @@
.nico-insert-code h4:first-child {
margin-top: 0;
}
.nico-insert-code .ant-btn-group {
margin-left: 8px;
}
</style>

View File

@ -6,11 +6,7 @@
使用下面列出的类即可创建带有预定义样式的按钮,我们通过样式来显示重要程度的不同。
- `ant-btn-primary`
- `ant-btn-default`
- `ant-btn-ghost`
`ant-btn-primary`、`ant-btn-default`、`ant-btn-ghost`
**注**: 当按钮文字为两个字时,中间需要**间隔一个字符**。