Commit 932c449dfffe9b0ae1369579d82c933370e2aaba
1 parent
5fc37ce4
update Button style
Showing
2 changed files
with
12 additions
and
12 deletions
Show diff stats
src/styles/custom.less
| @@ -70,9 +70,9 @@ | @@ -70,9 +70,9 @@ | ||
| 70 | @btn-padding-base : 5px 15px 6px; | 70 | @btn-padding-base : 5px 15px 6px; |
| 71 | @btn-padding-large : 6px 15px 6px 15px; | 71 | @btn-padding-large : 6px 15px 6px 15px; |
| 72 | @btn-padding-small : 1px 7px 2px; | 72 | @btn-padding-small : 1px 7px 2px; |
| 73 | -@btn-padding-base-icon : 6px 15px 6px; | ||
| 74 | -@btn-padding-large-icon : 6px 15px 7px 15px; | ||
| 75 | -@btn-padding-small-icon : 2px 7px 2px; | 73 | +@btn-padding-base-icon : 5px 15px 6px; |
| 74 | +@btn-padding-large-icon : 6px 15px 6px 15px; | ||
| 75 | +@btn-padding-small-icon : 1px 7px 2px; | ||
| 76 | @btn-font-size : 12px; | 76 | @btn-font-size : 12px; |
| 77 | @btn-font-size-large : 14px; | 77 | @btn-font-size-large : 14px; |
| 78 | @btn-border-radius : 4px; | 78 | @btn-border-radius : 4px; |
src/styles/mixins/button.less
| @@ -66,13 +66,13 @@ | @@ -66,13 +66,13 @@ | ||
| 66 | } | 66 | } |
| 67 | 67 | ||
| 68 | & .@{btnClassName}-icon-only .ivu-icon { | 68 | & .@{btnClassName}-icon-only .ivu-icon { |
| 69 | - font-size: 14px; | 69 | + font-size: 13px; |
| 70 | position: relative; | 70 | position: relative; |
| 71 | //top: 1px; | 71 | //top: 1px; |
| 72 | } | 72 | } |
| 73 | 73 | ||
| 74 | &-large .@{btnClassName}-icon-only .ivu-icon{ | 74 | &-large .@{btnClassName}-icon-only .ivu-icon{ |
| 75 | - font-size: 16px; | 75 | + font-size: 15px; |
| 76 | //top: 2px; | 76 | //top: 2px; |
| 77 | } | 77 | } |
| 78 | 78 | ||
| @@ -107,12 +107,12 @@ | @@ -107,12 +107,12 @@ | ||
| 107 | } | 107 | } |
| 108 | } | 108 | } |
| 109 | 109 | ||
| 110 | - &-small .@{btnClassName}-icon-only{ | ||
| 111 | - .button-size(@btn-padding-small-icon; @btn-font-size; @btn-border-radius-small); | ||
| 112 | - } | ||
| 113 | - &-large .@{btnClassName}-icon-only{ | ||
| 114 | - .button-size(@btn-padding-large-icon; @btn-font-size-large; @btn-border-radius); | ||
| 115 | - } | 110 | + //&-small .@{btnClassName}-icon-only{ |
| 111 | + // .button-size(@btn-padding-small-icon; @btn-font-size; @btn-border-radius-small); | ||
| 112 | + //} | ||
| 113 | + //&-large .@{btnClassName}-icon-only{ | ||
| 114 | + // .button-size(@btn-padding-large-icon; @btn-font-size-large; @btn-border-radius); | ||
| 115 | + //} | ||
| 116 | } | 116 | } |
| 117 | 117 | ||
| 118 | .button-group-vertical-base(@btnClassName) { | 118 | .button-group-vertical-base(@btnClassName) { |
| @@ -145,7 +145,7 @@ | @@ -145,7 +145,7 @@ | ||
| 145 | transition: color @transition-time linear, background-color @transition-time linear, border @transition-time linear, box-shadow @transition-time linear; | 145 | transition: color @transition-time linear, background-color @transition-time linear, border @transition-time linear, box-shadow @transition-time linear; |
| 146 | 146 | ||
| 147 | > .@{css-prefix-iconfont} { | 147 | > .@{css-prefix-iconfont} { |
| 148 | - line-height: 1; | 148 | + line-height: @line-height-base; |
| 149 | vertical-align: middle; | 149 | vertical-align: middle; |
| 150 | } | 150 | } |
| 151 | 151 |