From 3500e369f99fdeab9d90db1f3f3bc910fd7083ad Mon Sep 17 00:00:00 2001 From: jlukic Date: Tue, 18 Aug 2015 18:29:07 -0400 Subject: [PATCH] Labeled buttons now vertically align labels, adds more label varaibles --- src/definitions/elements/button.less | 8 +++++--- src/themes/default/elements/button.variables | 2 ++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/definitions/elements/button.less b/src/definitions/elements/button.less index a56fddfd9..e32f5a8bc 100755 --- a/src/definitions/elements/button.less +++ b/src/definitions/elements/button.less @@ -393,7 +393,9 @@ margin: 0px; } .ui.labeled.button > .label { - margin: 0px 0px 0px -@borderBoxShadowWidth; + display: flex; + align-items: @labeledLabelAlign; + margin: 0px 0px 0px @labeledLabelBorderOffset; font-size: @labeledLabelFontSize; padding: @labeledLabelPadding; font-size: @labeledLabelFontSize; @@ -575,7 +577,7 @@ Icon ---------------*/ -.ui.button > .icon { +.ui.button > .icon:not(.button) { height: @iconHeight; opacity: @iconOpacity; margin: @iconMargin; @@ -583,7 +585,7 @@ vertical-align: @iconVerticalAlign; color: @iconColor; } -.ui.button > .right.icon { +.ui.button > .right.icon:not(.button) { margin: @rightIconMargin; } diff --git a/src/themes/default/elements/button.variables b/src/themes/default/elements/button.variables index 7b3af53f7..13703d4f4 100644 --- a/src/themes/default/elements/button.variables +++ b/src/themes/default/elements/button.variables @@ -161,9 +161,11 @@ /* Labeled */ @labeledLabelFontSize: @medium; +@labeledLabelAlign: center; @labeledLabelPadding: @verticalPadding @horizontalPadding; @labeledLabelFontSize: @relativeMedium; @labeledLabelBorderColor: @borderColor; +@labeledLabelBorderOffset: -@borderBoxShadowWidth; /* Labeled Icon */ @labeledIconWidth: 1em + (@verticalPadding * 2);