Skip to content

Commit 4d54911

Browse files
committed
Merge branch 'v1/contrib' into v1/feature/use-font-size-14
2 parents 52e0ff0 + e71ed10 commit 4d54911

File tree

6 files changed

+23
-21
lines changed

6 files changed

+23
-21
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@ export class UUIBoxElement extends LitElement {
131131
132132
#header {
133133
display: flex;
134+
align-items: center;
134135
column-gap: var(--uui-size-space-5);
135136
border-bottom: 1px solid var(--uui-color-divider-standalone);
136137
padding: var(

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -293,9 +293,12 @@ export class UUIButtonElement extends UUIFormControlMixin(
293293
294294
.label {
295295
line-height: normal; /** needed to reset 'a > span' */
296-
display: block;
297296
transition: opacity 120ms;
297+
display: flex;
298+
gap: var(--uui-size-1);
299+
align-items: center;
298300
}
301+
299302
:host([state]:not([state=''])) .label {
300303
opacity: 0;
301304
}

packages/uui-card-content-node/lib/uui-card-content-node.element.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ export class UUICardContentNodeElement extends UUICardElement {
6868

6969
#renderContent() {
7070
return html`
71-
<span id="content">
71+
<span id="content" class="uui-text">
7272
<span id="item">
7373
<span id="icon">
7474
<slot name="icon" @slotchange=${this._onSlotIconChange}></slot>
@@ -167,7 +167,6 @@ export class UUICardContentNodeElement extends UUICardElement {
167167
#open-part {
168168
display: flex;
169169
position: relative;
170-
font-weight: 700;
171170
align-items: center;
172171
cursor: pointer;
173172
flex-grow: 1;

packages/uui-card-media/lib/uui-card-media.element.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -102,12 +102,12 @@ export class UUICardMediaElement extends UUICardElement {
102102

103103
#renderContent() {
104104
return html`
105-
<div id="content">
105+
<div id="content" class="uui-text">
106106
<!--
107107
TODO: Implement info box when pop-out is ready
108108
-->
109109
<span id="name">${this.name}</span>
110-
${this.detail}<slot name="detail"></slot>
110+
<small id="detail">${this.detail}<slot name="detail"></slot></small>
111111
</div>
112112
`;
113113
}
@@ -219,8 +219,8 @@ export class UUICardMediaElement extends UUICardElement {
219219
opacity: 0.96;
220220
}
221221
222-
#name {
223-
font-weight: 700;
222+
#detail {
223+
opacity: 0.6;
224224
}
225225
226226
:host(

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,9 @@ export class UUIIconElement extends LitElement {
139139
static styles = [
140140
css`
141141
:host {
142-
display: inline-block;
143-
vertical-align: bottom;
142+
display: inline-flex;
143+
align-items: center;
144+
justify-content: center;
144145
width: 1.125em;
145146
height: 1.125em;
146147
}

packages/uui-ref-node/lib/uui-ref-node.element.ts

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ export class UUIRefNodeElement extends UUIRefElement {
104104

105105
#renderContent() {
106106
return html`
107-
<span id="content">
107+
<span id="content" class="uui-text">
108108
<span id="icon">
109109
<slot name="icon" @slotchange=${this.#onSlotIconChange}></slot>
110110
${this._iconSlotHasContent === false
@@ -122,6 +122,7 @@ export class UUIRefNodeElement extends UUIRefElement {
122122
#renderLink() {
123123
return html`<a
124124
id="open-part"
125+
class="uui-text"
125126
tabindex=${this.disabled ? (nothing as any) : '0'}
126127
href=${ifDefined(!this.disabled ? this.href : undefined)}
127128
target=${ifDefined(this.target || undefined)}
@@ -140,6 +141,7 @@ export class UUIRefNodeElement extends UUIRefElement {
140141
<button
141142
type="button"
142143
id="open-part"
144+
class="uui-text"
143145
tabindex="0"
144146
@click=${this.handleOpenClick}
145147
@keydown=${this.handleOpenKeydown}
@@ -178,27 +180,27 @@ export class UUIRefNodeElement extends UUIRefElement {
178180
}
179181
180182
#content {
181-
align-self: stretch;
182-
line-height: normal;
183183
display: flex;
184-
position: relative;
185184
align-items: center;
185+
justify-content: center;
186+
line-height: 1.2em;
186187
}
187188
188189
#open-part {
189190
color: inherit;
190191
text-decoration: none;
191192
cursor: pointer;
192-
align-self: stretch;
193193
display: flex;
194194
flex-grow: 1;
195-
padding: calc(var(--uui-size-2));
195+
padding: calc(var(--uui-size-3));
196196
}
197197
198198
#icon {
199199
font-size: 1.2em;
200-
margin-left: var(--uui-size-2);
201200
margin-right: var(--uui-size-1);
201+
display: flex;
202+
align-items: center;
203+
justify-content: center;
202204
}
203205
204206
#info {
@@ -210,12 +212,8 @@ export class UUIRefNodeElement extends UUIRefElement {
210212
padding-left: var(--uui-size-2);
211213
}
212214
213-
#name {
214-
font-weight: 700;
215-
}
216-
217215
#detail {
218-
font-size: var(--uui-type-small-size);
216+
opacity: 0.6;
219217
}
220218
221219
:host([selectable]) #open-part {

0 commit comments

Comments
 (0)