Skip to content

Commit

Permalink
fix: Controls the initial font size of all components.
Browse files Browse the repository at this point in the history
  • Loading branch information
jaywcjlove committed Nov 5, 2017
1 parent 6285282 commit daeda01
Show file tree
Hide file tree
Showing 15 changed files with 26 additions and 4 deletions.
1 change: 1 addition & 0 deletions src/alert/style/index.less
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
border: 1px solid transparent;
border-radius: @alert-border-raduis;
padding: @alert-padding @alert-padding + 5;
font-size: 12px;
.w-alert-message + .w-alert-close-icon{
font-size: 12px;
}
Expand Down
1 change: 1 addition & 0 deletions src/breadcrumb/style/index.less
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

.w-breadcrumb{
color: #595959;
font-size: 12px;
.w-breadcrumb-item:last-child{
color: #c0c0c0;
.w-breadcrumb-item-separator{
Expand Down
1 change: 1 addition & 0 deletions src/checkbox/style/index.less
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@
padding-left: @checkbox-label-padding-left;
padding-right: @checkbox-label-padding-right;
user-select:none;
font-size: 12px;
}
&.disabled{
background-color: @gray-lighter;
Expand Down
2 changes: 2 additions & 0 deletions src/icon/style/index.less
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
@import "~uiw-iconfont/fonts/w-iconfont.css";


.w-icon-spin:before{
display: inline-block;
animation: loading-circle 1s infinite linear;
}

[class^="w-icon-"]:before,{
vertical-align: middle;
display: inline-block;
}
[class^="w-icon-"]:after,
[class*=" w-icon-"]:after,{
Expand Down
1 change: 1 addition & 0 deletions src/input/style/index.less
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

.w-input{
position: relative;
font-size: 12px;
}
.w-input-inner{
// iOS 中使用appearance修改输入框样式
Expand Down
7 changes: 6 additions & 1 deletion src/menu/style/index.less
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,17 @@
z-index: 1000;
color: rgba(0,0,0,.65);
background: #fff;
line-height: 46px;
line-height: 42px;
background-color: #f9f9f9;
li{
list-style: none;
}
i[class^='w-icon']{
margin-right: 5px;
transform: scale(0.9);
}
.w-menu-item{
line-height: 42px;
margin: 0;
padding: 0 20px;
font-size: 14px;
Expand Down Expand Up @@ -76,6 +80,7 @@
.w-sub-menu-title{
padding: 0 20px;
font-size: 14px;
line-height: 42px;
cursor: pointer;
&:hover{
color: #0fa120;
Expand Down
1 change: 1 addition & 0 deletions src/paging/style/index.less
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
position: relative;
display: inline-block;
user-select: none;
font-size: 12px;
li{
display: inline-block;
border:1px solid @paging-border-color;
Expand Down
1 change: 1 addition & 0 deletions src/radio/style/index.less
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@

.w-radio{
white-space: nowrap;
font-size: 12px;
cursor: pointer;
& + .w-radio{
margin-left: 5px;
Expand Down
2 changes: 2 additions & 0 deletions src/select/style/index.less
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
display: inline-block;
position: relative;
vertical-align: middle;
font-size: 12px;
& + .w-select{
margin-left: 5px;
}
Expand All @@ -27,6 +28,7 @@

.w-select-warp{
min-height: 10px;
padding: 0;
li{
font-size: 12px;
padding: 8px 10px;
Expand Down
1 change: 1 addition & 0 deletions src/slider/style/index.less
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
background-color: #e4e8f1;
border-radius: 3px;
position: relative;
font-size: 12px;
cursor: pointer;
user-select: none;
vertical-align: middle;
Expand Down
1 change: 1 addition & 0 deletions src/table/style/index.less
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
@import "../../style/mixins/index.less";

.w-table{
font-size: 12px;
table{
border-collapse: separate;
border-spacing: 0;
Expand Down
2 changes: 1 addition & 1 deletion src/tabs/style/index.less
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
overflow: hidden;
position: relative;
font-size: 14px;
.w-tabs-content{
&-content{
position: relative;
.w-tabs-pane{
position: absolute;
Expand Down
4 changes: 2 additions & 2 deletions src/tag/Tag.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export default class Tag extends Component {
return /^(white|pink|red|yellow|orange|cyan|green|blue|purple)?$/.test(color)
}
render() {
const { prefixCls, color, onClose, className, checked, children, ...others } = this.props;
const { prefixCls, color, onClose, className, checked, children, data, ...others } = this.props;
const { visible } = this.state;
let colors = '';
switch (color) {
Expand All @@ -59,7 +59,7 @@ export default class Tag extends Component {
return visible ? (
<span {...others} style={styles} className={cls}>
{children}
{(onClose && checked !== true && checked !== false) && <i onClick={this.close} ref="iconclose"><Icon type="close" /></i>}
{(onClose && checked !== true && checked !== false) && <Icon type="close" onClick={this.close} ref="iconclose" />}
</span>
) : null;
}
Expand Down
4 changes: 4 additions & 0 deletions src/tag/style/index.less
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@
top: -1px;
margin-left: 2px;
}
.w-icon-close{
margin: -4px 0 0 0px;
transform: scale(.83333333) rotate(0deg);
}
}

.@{tag-cls}-white{
Expand Down
1 change: 1 addition & 0 deletions src/tooltip/style/index.less
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
z-index: 1987;
}
.w-tooltip-inner{
font-size: 12px;
max-width: 250px;
padding: 5px 10px;
display: block;
Expand Down

0 comments on commit daeda01

Please sign in to comment.