Skip to content

Commit f047a1d

Browse files
committed
Merge remote-tracking branch 'origin/v1/contrib' into release/1.8.0
2 parents 46d444c + 455c1ca commit f047a1d

File tree

4 files changed

+47
-23
lines changed

4 files changed

+47
-23
lines changed

package-lock.json

Lines changed: 42 additions & 19 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@
105105
"postcss-advanced-variables": "3.0.1",
106106
"postcss-cli": "11.0.0",
107107
"postcss-color-function": "4.1.0",
108-
"postcss-custom-properties": "13.3.4",
108+
"postcss-custom-properties": "13.3.6",
109109
"postcss-jsx": "0.36.4",
110110
"postcss-load-config": "5.0.3",
111111
"postcss-syntax": "0.36.2",

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ function slotHasContent(target: EventTarget | null): boolean {
2323
* @cssprop --uui-box-border-width - overwrite the box border, default is 0
2424
* @cssprop --uui-box-box-shadow - overwrite the box shadow, default is var(--uui-shadow-depth-1)
2525
* @cssprop --uui-box-border-radius - overwrite the box border-radius, default is var(--uui-border-radius)
26-
*
26+
* @cssprop --uui-box-border-color - overwrites the box border colorm default is var(--uui-color-divider-standalone)
2727
*/
2828
@defineElement('uui-box')
2929
export class UUIBoxElement extends LitElement {
@@ -123,8 +123,7 @@ export class UUIBoxElement extends LitElement {
123123
:host {
124124
display: block;
125125
border: var(--uui-box-border-width, 0) solid
126-
var(--uui-color-divider-standalone);
127-
126+
var(--uui-box-border-color, var(--uui-color-divider-standalone));
128127
box-shadow: var(--uui-box-box-shadow, var(--uui-shadow-depth-1));
129128
border-radius: var(--uui-box-border-radius, var(--uui-border-radius));
130129
background-color: var(--uui-color-surface);

packages/uui-menu-item/lib/uui-menu-item.element.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -464,6 +464,7 @@ export class UUIMenuItemElement extends SelectOnlyMixin(
464464
color: currentColor;
465465
min-height: var(--uui-size-12);
466466
z-index: 1;
467+
font-weight: inherit;
467468
}
468469
469470
#label-button .label {
@@ -491,6 +492,7 @@ export class UUIMenuItemElement extends SelectOnlyMixin(
491492
left: 0;
492493
right: 0;
493494
bottom: 0;
495+
border-radius: var(--uui-menu-item-border-radius, 0px);
494496
}
495497
496498
#actions-container {

0 commit comments

Comments
 (0)