Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/v1/contrib' into release/1.8.0
Browse files Browse the repository at this point in the history
  • Loading branch information
iOvergaard committed Apr 11, 2024
2 parents 46d444c + 455c1ca commit f047a1d
Show file tree
Hide file tree
Showing 4 changed files with 47 additions and 23 deletions.
61 changes: 42 additions & 19 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@
"postcss-advanced-variables": "3.0.1",
"postcss-cli": "11.0.0",
"postcss-color-function": "4.1.0",
"postcss-custom-properties": "13.3.4",
"postcss-custom-properties": "13.3.6",
"postcss-jsx": "0.36.4",
"postcss-load-config": "5.0.3",
"postcss-syntax": "0.36.2",
Expand Down
5 changes: 2 additions & 3 deletions packages/uui-box/lib/uui-box.element.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ function slotHasContent(target: EventTarget | null): boolean {
* @cssprop --uui-box-border-width - overwrite the box border, default is 0
* @cssprop --uui-box-box-shadow - overwrite the box shadow, default is var(--uui-shadow-depth-1)
* @cssprop --uui-box-border-radius - overwrite the box border-radius, default is var(--uui-border-radius)
*
* @cssprop --uui-box-border-color - overwrites the box border colorm default is var(--uui-color-divider-standalone)
*/
@defineElement('uui-box')
export class UUIBoxElement extends LitElement {
Expand Down Expand Up @@ -123,8 +123,7 @@ export class UUIBoxElement extends LitElement {
:host {
display: block;
border: var(--uui-box-border-width, 0) solid
var(--uui-color-divider-standalone);
var(--uui-box-border-color, var(--uui-color-divider-standalone));
box-shadow: var(--uui-box-box-shadow, var(--uui-shadow-depth-1));
border-radius: var(--uui-box-border-radius, var(--uui-border-radius));
background-color: var(--uui-color-surface);
Expand Down
2 changes: 2 additions & 0 deletions packages/uui-menu-item/lib/uui-menu-item.element.ts
Original file line number Diff line number Diff line change
Expand Up @@ -464,6 +464,7 @@ export class UUIMenuItemElement extends SelectOnlyMixin(
color: currentColor;
min-height: var(--uui-size-12);
z-index: 1;
font-weight: inherit;
}
#label-button .label {
Expand Down Expand Up @@ -491,6 +492,7 @@ export class UUIMenuItemElement extends SelectOnlyMixin(
left: 0;
right: 0;
bottom: 0;
border-radius: var(--uui-menu-item-border-radius, 0px);
}
#actions-container {
Expand Down

0 comments on commit f047a1d

Please sign in to comment.