Skip to content

Commit 420abc2

Browse files
committed
Merge remote-tracking branch 'origin/main' into fix-remove-tag-title
# Conflicts: # packages/components/src/components/tag/tag.lite.tsx
2 parents 3c08ecb + dcd4eaa commit 420abc2

File tree

8 files changed

+27
-10
lines changed

8 files changed

+27
-10
lines changed

package-lock.json

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

packages/components/src/components/tag/tag.lite.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,8 @@ export default function DBTag(props: DBTagProps) {
8484
data-icon="cross"
8585
data-size="small"
8686
data-no-text="true"
87-
data-variant="ghost">
87+
data-variant="ghost"
88+
type="button">
8889
<DBTooltip>{state.getRemoveButtonText()}</DBTooltip>
8990
{state.getRemoveButtonText()}
9091
</button>

packages/components/src/components/tag/tag.scss

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333

3434
&:has(.db-tab-remove-button) {
3535
padding-inline-end: 0;
36+
border-inline-end: 0;
3637
}
3738

3839
&:has(dbbutton):has(dbbutton:not(.db-tab-remove-button)),
@@ -229,8 +230,12 @@
229230
// overwrite to transparent
230231
background-color: colors.$db-adaptive-bg-basic-transparent-full-default;
231232
color: currentcolor;
232-
border: 0;
233233
aspect-ratio: 1 / 1;
234+
border-inline-start: 0;
235+
border-start-start-radius: 0;
236+
border-end-start-radius: 0;
237+
// stylelint-disable-next-line db-ux/use-border-color
238+
border-color: var(--db-tag-border-color);
234239
}
235240
}
236241
}

packages/components/src/styles/internal/_tag-components.scss

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,11 @@
77
$interactive-selectors: "label, button:not(.db-tab-remove-button), a";
88

99
@mixin get-weak($name: "adaptive", $border-color: 60, $background-color: 1) {
10-
// stylelint-disable-next-line db-ux/use-border-color
11-
border-color: var(
10+
--db-tag-border-color: var(
1211
--db-#{$name}-on-bg-basic-emphasis-#{$border-color}-default
1312
);
13+
// stylelint-disable-next-line db-ux/use-border-color
14+
border-color: var(--db-tag-border-color);
1415

1516
@include colors.set-current-colors(
1617
var(--db-#{$name}-bg-basic-level-#{$background-color}-default),
@@ -19,7 +20,9 @@ $interactive-selectors: "label, button:not(.db-tab-remove-button), a";
1920
}
2021

2122
@mixin get-strong($name: "adaptive") {
22-
border-color: var(--db-#{$name}-on-bg-basic-emphasis-70-default);
23+
--db-tag-border-color: var(--db-#{$name}-on-bg-basic-emphasis-70-default);
24+
// stylelint-disable-next-line db-ux/use-border-color
25+
border-color: var(--db-tag-border-color);
2326

2427
@include colors.set-current-colors(
2528
var(--db-#{$name}-bg-vibrant-default),

showcases/react-showcase/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"devDependencies": {
2626
"@types/react": "^18.3.13",
2727
"@types/react-dom": "^18.3.1",
28-
"@vitejs/plugin-react": "^4.4.1",
28+
"@vitejs/plugin-react": "^4.5.0",
2929
"cross-env": "^7.0.3",
3030
"typescript": "^5.4.5",
3131
"vite": "^6.3.5"

0 commit comments

Comments
 (0)