Browse Source

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

pull/35/head
yiminghe 10 years ago
parent
commit
32a5abdd91
  1. 4
      components/breadcrumb/demo/withIcon.md
  2. 11
      style/components/select.less
  3. 4
      style/components/steps.less

4
components/breadcrumb/demo/withIcon.md

@ -12,10 +12,10 @@ var Breadcrumb = require('antd/lib/breadcrumb');
React.render(
<Breadcrumb>
<Breadcrumb.Item href="">
<i className="anticon anticon-user"></i>
<i className="anticon anticon-home"></i>
</Breadcrumb.Item>
<Breadcrumb.Item href="">
<i className="anticon anticon-folder-open"></i>
<i className="anticon anticon-user"></i>
应用列表
</Breadcrumb.Item>
<Breadcrumb.Item>

11
style/components/select.less

@ -66,11 +66,10 @@
.transition(all .3s @ease-in-out);
&:hover {
border-color: #23c0fa;
box-shadow: 0 0 2px tint(@primary-color, 20%);
border-color: @primary-color;
}
&:active {
border-color: @primary-color;
border-color: shade(@primary-color, 5%);
}
}
@ -221,8 +220,8 @@
display: block;
}
.@{selectPrefixCls}-selection {
border-color: #23c0fa;
box-shadow: 0 0 3px #23c0fa;
border-color: @primary-color;
box-shadow: 0 0 3px tint(@primary-color, 20%);
}
}
@ -262,7 +261,7 @@
position: absolute;
top: 6px;
right: 16px;
color: #3CB8F0;
color: @primary-color;
}
}

4
style/components/steps.less

@ -128,9 +128,7 @@
> .@{stepsPrefixClass}-icon {
line-height: 1;
display: inline-block;
vertical-align: middle;
top: -2px;
top: -1px;
color: @primary-color;
position: relative;

Loading…
Cancel
Save