Skip to content
Merged
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
2 changes: 1 addition & 1 deletion packages/uui-base/lib/mixins/LabelMixin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

type Constructor<T = {}> = new (...args: any[]) => T;

export declare class LabelMixinInterface {

Check warning on line 6 in packages/uui-base/lib/mixins/LabelMixin.ts

View workflow job for this annotation

GitHub Actions / test

Class declaration should be prefixed with "UUI"
/**
* Label to be used for aria-label and potentially as visual label for some components
* @type {string}
Expand All @@ -28,7 +28,7 @@
/**
* Label mixin class containing the label functionality.
*/
class LabelMixinClass extends superClass {

Check warning on line 31 in packages/uui-base/lib/mixins/LabelMixin.ts

View workflow job for this annotation

GitHub Actions / test

Class declaration should be prefixed with "UUI"
/**
* Label to be used for aria-label and potentially as visual label for some components
* @type {string}
Expand Down Expand Up @@ -65,7 +65,7 @@
: ''}
<slot
class="label"
style=${this._labelSlotHasContent ? '' : 'visibility: hidden'}
style=${this._labelSlotHasContent ? '' : 'display: none'}
name=${labelSlotName ? labelSlotName : ''}
@slotchange=${this.labelSlotChanged}></slot>
`;
Expand Down
4 changes: 4 additions & 0 deletions packages/uui-boolean-input/lib/uui-boolean-input.element.ts
Original file line number Diff line number Diff line change
Expand Up @@ -256,6 +256,10 @@ export abstract class UUIBooleanInputElement extends UUIFormControlMixin(
.label {
display: block;
}

span.label:empty {
display: none;
}
`,
];
}
10 changes: 9 additions & 1 deletion packages/uui-input/lib/uui-input.element.ts
Original file line number Diff line number Diff line change
Expand Up @@ -478,7 +478,8 @@ export class UUIInputElement extends UUIFormControlMixin(

input {
font-family: inherit;
padding: var(--uui-size-1) var(--uui-size-space-3);
padding: 1px var(--uui-size-space-3) var(--uui-size-1)
var(--uui-size-space-3);
font-size: inherit;
color: inherit;
border-radius: var(--uui-border-radius);
Expand All @@ -502,6 +503,13 @@ export class UUIInputElement extends UUIFormControlMixin(
border: none;
}

slot[name='prepend'],
slot[name='append'] {
display: flex;
align-items: center;
line-height: 1;
}

::slotted(uui-input),
::slotted(uui-input-lock) {
height: 100%;
Expand Down
9 changes: 9 additions & 0 deletions packages/uui-input/lib/uui-input.story.ts
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,15 @@ export const PrependAndAppend: Story = {
};

export const PrependIcon: Story = {
args: {
'prepend slot': html`<uui-icon
name="search"
slot="prepend"
style="padding-left:var(--uui-size-space-2)"></uui-icon>`,
},
};

export const PrependIconInDiv: Story = {
args: {
'prepend slot': html`<div slot="prepend">
<uui-icon name="search"></uui-icon>
Expand Down
5 changes: 3 additions & 2 deletions packages/uui-ref-node/lib/uui-ref-node.element.ts
Original file line number Diff line number Diff line change
Expand Up @@ -183,9 +183,8 @@ export class UUIRefNodeElement extends UUIRefElement {
display: flex;
flex-grow: 1;
align-items: center;
justify-content: center;
line-height: 1.2em;
padding: calc(var(--uui-size-2));
padding: calc(var(--uui-size-3));
}

#open-part {
Expand All @@ -211,10 +210,12 @@ export class UUIRefNodeElement extends UUIRefElement {
justify-content: center;
height: 100%;
padding-left: var(--uui-size-2);
margin-top: 1px;
}

#detail {
opacity: 0.6;
line-height: 1.2em;
}

:host([selectable]) #open-part {
Expand Down
1 change: 1 addition & 0 deletions packages/uui-ref/lib/uui-ref.element.ts
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ export class UUIRefElement extends SelectOnlyMixin(
justify-content: space-between;
align-items: center;
width: 100%;
font-size: var(--uui-font-size);

box-sizing: border-box;
border-radius: var(--uui-border-radius);
Expand Down
2 changes: 1 addition & 1 deletion packages/uui-table/lib/uui-table-advanced-example.ts
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ export class UUITableWithSelectionExampleElement extends LitElement {
@selected=${() => this._selectRowHandler(item)}
@deselected=${() => this._deselectRowHandler(item)}>
<uui-table-cell>
<uui-icon name="wand" style="font-size: 20px;"></uui-icon>
<uui-icon name="wand"></uui-icon>
<uui-checkbox
@click=${(e: MouseEvent) => e.stopPropagation()}
@change=${(event: Event) => this._selectHandler(event, item)}
Expand Down
Loading