From 48c4d244340b9e67b44bd22fac2f6f93d735d1be Mon Sep 17 00:00:00 2001 From: SimaQ Date: Tue, 4 Aug 2015 14:41:30 +0800 Subject: [PATCH] modify ant-input-lg's font-size --- style/components/form.less | 9 +++------ style/mixins/input.less | 6 ++---- style/themes/default/custom.less | 6 +----- 3 files changed, 6 insertions(+), 15 deletions(-) diff --git a/style/components/form.less b/style/components/form.less index 2c08df511b..6a6558206c 100644 --- a/style/components/form.less +++ b/style/components/form.less @@ -127,9 +127,7 @@ form { .@{css-prefix}input, .@{css-prefix}input-group .@{css-prefix}input, .@{css-prefix}input-group .@{css-prefix}input-group-addon { - height: @input-height-lg; - font-size: @font-size-base; - padding: 6px 7px; + .input-lg(); } // Input combined with select @@ -266,9 +264,8 @@ form { bottom: 0; right: 0; font-family: "anticon" !important; - width: 32px; - height: 32px; - line-height: 32px; + .square(@input-height-lg); + line-height: @input-height-lg; text-align: center; font-size: 14px; } diff --git a/style/mixins/input.less b/style/mixins/input.less index a195436809..0f1b20982e 100644 --- a/style/mixins/input.less +++ b/style/mixins/input.less @@ -1,14 +1,12 @@ // size mixins for input .input-lg() { - padding: @input-padding-lg; + padding: @input-padding-vertical-lg @input-padding-horizontal; height: @input-height-lg; - font-size: @input-font-size-lg; } .input-sm() { padding: @input-padding-vertical-sm @input-padding-horizontal; height: @input-height-sm; - font-size: @input-font-size-sm; } // input status @@ -42,7 +40,7 @@ width: 100%; height: @input-height-base; cursor: text; - font-size: @input-font-size; + font-size: @font-size-base; line-height: @line-height-base; color: @input-color; background-color: @input-bg; diff --git a/style/themes/default/custom.less b/style/themes/default/custom.less index 772e8ca2e9..503279bbe0 100644 --- a/style/themes/default/custom.less +++ b/style/themes/default/custom.less @@ -121,17 +121,13 @@ @input-padding-horizontal : 7px; @input-padding-vertical-base : 4px; @input-padding-vertical-sm : 1px; -@input-padding-lg : 4px 7px 5px; +@input-padding-vertical-lg : 6px; @input-placeholder-color : #ccc; @input-color : #666; @input-border-color : #d9d9d9; @input-bg : #fff; -@input-font-size-lg : 14px; -@input-font-size : @font-size-base; -@input-font-size-sm : @font-size-base; - @input-hover-border-color : @primary-color; @input-focus-border-color : @primary-color; @input-disabled-bg : #f3f5f7;