Browse Source

Labeled buttons now vertically align labels, adds more label varaibles

pull/2907/head
jlukic 9 years ago
parent
commit
3500e369f9
2 changed files with 7 additions and 3 deletions
  1. 8
      src/definitions/elements/button.less
  2. 2
      src/themes/default/elements/button.variables

8
src/definitions/elements/button.less

@ -393,7 +393,9 @@
margin: 0px; margin: 0px;
} }
.ui.labeled.button > .label { .ui.labeled.button > .label {
margin: 0px 0px 0px -@borderBoxShadowWidth;
display: flex;
align-items: @labeledLabelAlign;
margin: 0px 0px 0px @labeledLabelBorderOffset;
font-size: @labeledLabelFontSize; font-size: @labeledLabelFontSize;
padding: @labeledLabelPadding; padding: @labeledLabelPadding;
font-size: @labeledLabelFontSize; font-size: @labeledLabelFontSize;
@ -575,7 +577,7 @@
Icon Icon
---------------*/ ---------------*/
.ui.button > .icon {
.ui.button > .icon:not(.button) {
height: @iconHeight; height: @iconHeight;
opacity: @iconOpacity; opacity: @iconOpacity;
margin: @iconMargin; margin: @iconMargin;
@ -583,7 +585,7 @@
vertical-align: @iconVerticalAlign; vertical-align: @iconVerticalAlign;
color: @iconColor; color: @iconColor;
} }
.ui.button > .right.icon {
.ui.button > .right.icon:not(.button) {
margin: @rightIconMargin; margin: @rightIconMargin;
} }

2
src/themes/default/elements/button.variables

@ -161,9 +161,11 @@
/* Labeled */ /* Labeled */
@labeledLabelFontSize: @medium; @labeledLabelFontSize: @medium;
@labeledLabelAlign: center;
@labeledLabelPadding: @verticalPadding @horizontalPadding; @labeledLabelPadding: @verticalPadding @horizontalPadding;
@labeledLabelFontSize: @relativeMedium; @labeledLabelFontSize: @relativeMedium;
@labeledLabelBorderColor: @borderColor; @labeledLabelBorderColor: @borderColor;
@labeledLabelBorderOffset: -@borderBoxShadowWidth;
/* Labeled Icon */ /* Labeled Icon */
@labeledIconWidth: 1em + (@verticalPadding * 2); @labeledIconWidth: 1em + (@verticalPadding * 2);

Loading…
Cancel
Save