Skip to content

Commit 8b7422f

Browse files
authored
fix: Allow uui-button to fit in less tall contexts (#236)
* removing top and bottom padding factor, always vertically aligned. * remove top bottom factor
1 parent af410f9 commit 8b7422f

File tree

6 files changed

+7
-12
lines changed

6 files changed

+7
-12
lines changed

packages/uui-button/lib/uui-button.element.ts

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,8 @@ export class UUIButtonElement extends FormControlMixin(
5858
margin-left: calc(var(--uui-button-merge-border-left, 0) * -1px);
5959
--uui-button-padding-left-factor: 3;
6060
--uui-button-padding-right-factor: 3;
61-
--uui-button-padding-top-factor: 1;
62-
--uui-button-padding-bottom-factor: 1;
6361
64-
height: var(--uui-button-height, auto);
62+
height: var(--uui-button-height, var(--uui-size-11));
6563
max-height: 100%;
6664
cursor: pointer;
6765
@@ -124,10 +122,10 @@ export class UUIButtonElement extends FormControlMixin(
124122
);
125123
cursor: pointer;
126124
127-
padding: calc(calc(8 / 15 * 1em) * var(--uui-button-padding-top-factor))
128-
calc(var(--uui-size-2) * var(--uui-button-padding-right-factor))
129-
calc(calc(8 / 15 * 1em) * var(--uui-button-padding-bottom-factor))
125+
padding: 0
126+
calc(var(--uui-size-2) * var(--uui-button-padding-right-factor)) 0
130127
calc(var(--uui-size-2) * var(--uui-button-padding-left-factor));
128+
131129
vertical-align: middle;
132130
box-shadow: none;
133131
}

packages/uui-combobox/lib/uui-combobox.element.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ export class UUIComboboxElement extends FormControlMixin(LitElement) {
289289
label="clear"
290290
slot="append"
291291
compact
292-
style="height: 100%; --uui-button-padding-top-factor: 0; --uui-button-padding-bottom-factor: 0;">
292+
style="height: 100%;">
293293
<uui-icon name="remove" .fallback=${iconRemove.strings[0]}></uui-icon>
294294
</uui-button>`;
295295
};

packages/uui-input-lock/lib/uui-input-lock.element.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ export class UUIInputLockElement extends UUIInputElement {
2020
#lock {
2121
height: 100%;
2222
23-
--uui-button-padding-top-factor: 0;
24-
--uui-button-padding-bottom-factor: 0;
2523
--uui-button-padding-left-factor: 0.75;
2624
--uui-button-padding-right-factor: 0.75;
2725
font-size: 12px;

packages/uui-input-password/lib/uui-input-password.element.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ export class UUIInputPasswordElement extends UUIInputElement {
6666
return html`<uui-button
6767
.disabled=${this.disabled}
6868
@click=${this._onPasswordToggle}
69-
style="--uui-button-padding-top-factor: 0; --uui-button-padding-bottom-factor: 0"
7069
compact
7170
label="${this.passwordType === 'password'
7271
? 'Show password'

packages/uui-input/lib/uui-input.element.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@ export class UUIInputElement extends FormControlMixin(LitElement) {
5353
);
5454
border: var(--uui-input-border-width, 1px) solid
5555
var(--uui-input-border-color, var(--uui-color-border));
56+
57+
--uui-button-height: 100%;
5658
}
5759
:host(:hover) {
5860
border-color: var(

stories/scaffolding/app-header/app-header.example.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ export class UUIAppHeaderExample extends LitElement {
2121
}
2222
2323
#logo {
24-
--uui-button-padding-top-factor: 1;
25-
--uui-button-padding-bottom-factor: 0.5;
2624
margin-right: var(--uui-size-space-2);
2725
}
2826

0 commit comments

Comments
 (0)