From 92a624a31ced5ef0e70052a00253f5edc70a104b Mon Sep 17 00:00:00 2001 From: Lipis Date: Tue, 3 Dec 2013 15:03:07 +0100 Subject: Get rid of empty line before the last closing bracket --- less/buttons.less | 1 - 1 file changed, 1 deletion(-) (limited to 'less/buttons.less') diff --git a/less/buttons.less b/less/buttons.less index a0909606f..ee6f6612a 100644 --- a/less/buttons.less +++ b/less/buttons.less @@ -45,7 +45,6 @@ .opacity(.65); .box-shadow(none); } - } -- cgit v1.2.3 From 4a45650026a16d372feb1f150899e883d410a35e Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Tue, 3 Dec 2013 18:03:04 -0800 Subject: fix .btn-group-xs portion of #10979 --- less/buttons.less | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'less/buttons.less') diff --git a/less/buttons.less b/less/buttons.less index ee6f6612a..0a484ead2 100644 --- a/less/buttons.less +++ b/less/buttons.less @@ -122,13 +122,12 @@ // line-height: ensure even-numbered height of button next to large input .button-size(@padding-large-vertical; @padding-large-horizontal; @font-size-large; @line-height-large; @border-radius-large); } -.btn-sm, -.btn-xs { +.btn-sm { // line-height: ensure proper height of button next to small input .button-size(@padding-small-vertical; @padding-small-horizontal; @font-size-small; @line-height-small; @border-radius-small); } .btn-xs { - padding: 1px 5px; + .button-size(@padding-xs-vertical; @padding-xs-horizontal; @font-size-small; @line-height-small; @border-radius-small); } -- cgit v1.2.3 From 01afe84b316d22374ad2333b3c15b35ad17029af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zlatan=20Vasovi=C4=87?= Date: Thu, 5 Dec 2013 07:43:50 +0100 Subject: Remove redundant, duplicate comment --- less/buttons.less | 1 - 1 file changed, 1 deletion(-) (limited to 'less/buttons.less') diff --git a/less/buttons.less b/less/buttons.less index ee6f6612a..d1ac7d7c7 100644 --- a/less/buttons.less +++ b/less/buttons.less @@ -6,7 +6,6 @@ // Base styles // -------------------------------------------------- -// Core styles .btn { display: inline-block; margin-bottom: 0; // For input.btn -- cgit v1.2.3 From c07632e4e8398f55d796d00b520ca43df38dbf29 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 7 Dec 2013 11:47:37 -0800 Subject: Reorder button and table variants for consistent order --- less/buttons.less | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'less/buttons.less') diff --git a/less/buttons.less b/less/buttons.less index 62e693bee..b728f332c 100644 --- a/less/buttons.less +++ b/less/buttons.less @@ -56,6 +56,10 @@ .btn-primary { .button-variant(@btn-primary-color; @btn-primary-bg; @btn-primary-border); } +// Success appears as green +.btn-success { + .button-variant(@btn-success-color; @btn-success-bg; @btn-success-border); +} // Warning appears as orange .btn-warning { .button-variant(@btn-warning-color; @btn-warning-bg; @btn-warning-border); @@ -64,10 +68,6 @@ .btn-danger { .button-variant(@btn-danger-color; @btn-danger-bg; @btn-danger-border); } -// Success appears as green -.btn-success { - .button-variant(@btn-success-color; @btn-success-bg; @btn-success-border); -} // Info appears as blue-green .btn-info { .button-variant(@btn-info-color; @btn-info-bg; @btn-info-border); -- cgit v1.2.3