From b407c5e9244e253f0846dacd973677b47305703f Mon Sep 17 00:00:00 2001 From: afc163 Date: Thu, 9 Jul 2015 10:56:28 +0800 Subject: [PATCH] fix button variable --- style/components/button.less | 10 +++++----- style/mixins/button.less | 4 ++-- style/themes/default/custom.less | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/style/components/button.less b/style/components/button.less index 62d6bd9b68..ae08b8fcfc 100644 --- a/style/components/button.less +++ b/style/components/button.less @@ -11,22 +11,22 @@ .btn-primary; .@{btnPrefixClass}-group &:not(:first-child):not(:last-child) { - border-right-color: @btn-primary-border; - border-left-color: btn-primary-border; + border-right-color: @btn-group-border; + border-left-color: @btn-group-border; } .@{btnPrefixClass}-group &:first-child { &:not(:last-child) { - border-right-color: @btn-primary-border; + border-right-color: @btn-group-border; } } .@{btnPrefixClass}-group &:last-child:not(:first-child) { - border-left-color: @btn-primary-border; + border-left-color: @btn-group-border; } .@{btnPrefixClass}-group & + .@{btnPrefixClass} { - border-left-color: @btn-primary-border; + border-left-color: @btn-group-border; } } diff --git a/style/mixins/button.less b/style/mixins/button.less index 8a1e1f460d..c0e56019e7 100644 --- a/style/mixins/button.less +++ b/style/mixins/button.less @@ -14,7 +14,7 @@ } &:active, &.active { - .button-color(shade(@color, 5%); shade(@background, 5%); shade(@border, 5%)); + .button-color(shade(@color, 5%); shade(@background, 5%); shade(@background, 5%)); } &:active, &.active { @@ -133,7 +133,7 @@ // primary button style .btn-primary() { - .button-variant(@btn-primary-color; @btn-primary-bg; @btn-primary-border); + .button-variant(@btn-primary-color; @btn-primary-bg; @primary-color); &:hover, &:active, diff --git a/style/themes/default/custom.less b/style/themes/default/custom.less index 5f195b418d..1401bb562e 100644 --- a/style/themes/default/custom.less +++ b/style/themes/default/custom.less @@ -46,7 +46,7 @@ @btn-primary-color : #fff; @btn-primary-bg : @primary-color; -@btn-primary-border : shade(@primary-color, 5%); +@btn-group-border : shade(@primary-color, 5%); @btn-default-color : #666; @btn-default-bg : #f4f4f4;