Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions Button/Button.module.less
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,14 @@
.lime-custom-text({
font-size: @lime-button-font-size-large;
height: @lime-button-height-large;
min-width: @lime-button-height-large;
min-width: @lime-button-min-width;
line-height: (@lime-button-height-large - (2 * @lime-button-border-width));
--button-height: $height;

&.minWidth {
min-width: @lime-button-min-width-default-large;
}

&.red,
&.green,
&.yellow,
Expand Down Expand Up @@ -243,12 +247,12 @@
.lime-custom-text({
font-size: @lime-button-small-font-size-large;
height: @lime-button-small-height-large;
min-width: @lime-button-small-height-large;
min-width: @lime-button-small-min-width;
line-height: (@lime-button-small-height-large - (2 * @lime-button-border-width));
--button-height: $height;

&.minWidth {
min-width: @lime-button-small-min-width-default;
min-width: @lime-button-small-min-width-default-large;
}

&.red,
Expand All @@ -273,7 +277,8 @@
min-width: @lime-button-height;

.lime-custom-text({
min-width: @lime-button-height-large;
min-width: @lime-button-icon-only-height-large;
height: @lime-button-icon-only-height-large;
});

.client {
Expand All @@ -295,7 +300,8 @@
.padding-start-end(.extract(@lime-button-icon-small-padding, left)[], .extract(@lime-button-icon-small-padding, right)[]);

.lime-custom-text({
min-width: @lime-button-small-height-large;
height: @lime-button-small-icon-only-height-large;
min-width: @lime-button-small-icon-only-height-large;
});
}

Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ The following is a curated list of changes in the Enact limestone module, newest

### Changed

- `limestone/Button` styling to match the latest GUI
- `limestone/ImageItem` styling to match the latest GUI

## [unreleased]
Expand Down
1 change: 1 addition & 0 deletions Chips/Chip.module.less
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@

:global(.largeText) & {
.button.small {
height: @lime-chip-button-height;
min-width: @lime-chip-min-width;
}
}
Expand Down
9 changes: 7 additions & 2 deletions styles/variables.less
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,7 @@
@lime-button-focusexpand-margin: 9px .extract(@lime-button-margin, right)[]; // 9px provides enough space for the expanded focus state
@lime-button-h-padding: var(--primitive-spacing-60);
@lime-button-height: 132px;
@lime-button-height-large: @lime-button-height;
@lime-button-height-large: 156px;
@lime-button-icon-h-margin: var(--primitive-spacing-24);
@lime-button-icon-margin-end: @lime-button-icon-h-margin;
@lime-button-icon-margin-start: 0;
Expand All @@ -420,15 +420,17 @@
@lime-button-max-width: 1200px;
@lime-button-min-width: 300px;
@lime-button-min-width-default: 840px;
@lime-button-min-width-default-large: 1008px;
@lime-button-focus-duration: @lime-spotlight-focus-animation-duration;
@lime-button-small-margin: var(--primitive-spacing-24);
@lime-button-small-focusexpand-margin: @lime-button-focusexpand-margin;
@lime-button-small-h-padding: var(--primitive-spacing-60);
@lime-button-small-height: 108px;
@lime-button-small-height-large: @lime-button-small-height;
@lime-button-small-height-large: 132px;
@lime-button-small-max-width: 1020px;
@lime-button-small-min-width: 264px;
@lime-button-small-min-width-default: 720px;
@lime-button-small-min-width-default-large: 864px;
@lime-button-colordot-bottom: var(--primitive-spacing-12);
@lime-button-colordot-border-radius: var(--semantic-radius-full);
@lime-button-colordot-width: 60px;
Expand All @@ -447,6 +449,8 @@
@lime-button-small-colordot-padding-start: var(--primitive-spacing-30);
@lime-button-icon-only-colordot-width: 30px;
@lime-button-icon-only-colordot-height: 12px;
@lime-button-icon-only-height-large: @lime-button-height;
@lime-button-small-icon-only-height-large: @lime-button-small-height;
@lime-button-collapse-duration: 300ms;
@lime-button-collapsable-icon-margin: 0 var(--primitive-spacing-24);

Expand Down Expand Up @@ -505,6 +509,7 @@
// Chip
// ---------------------------------------
@lime-chip-margin: 0;
@lime-chip-button-height: @lime-button-small-height;
@lime-chip-button-spacing: var(--primitive-spacing-12);
@lime-chip-min-width: 108px;
@lime-chips-gap: var(--primitive-spacing-36);
Expand Down
Loading