Skip to content

Commit 8a0f58f

Browse files
committed
Merge branch 'master' into dev
2 parents 97a20f6 + 35f7e0c commit 8a0f58f

File tree

13 files changed

+48
-17
lines changed

13 files changed

+48
-17
lines changed

lerna.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@
1313
}
1414
},
1515
"npmClient": "pnpm",
16-
"version": "3.10.8"
16+
"version": "3.10.9"
1717
}

packages/api-generator/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@vuetify/api-generator",
33
"type": "module",
4-
"version": "3.10.8",
4+
"version": "3.10.9",
55
"private": true,
66
"description": "",
77
"scripts": {

packages/api-generator/src/locale/en/VThemeProvider.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{
22
"props": {
3-
"root": "Use the current value of `$vuetify.theme.dark` as opposed to the provided one.",
4-
"withBackground": "Use the current value of `$vuetify.theme.dark` as opposed to the provided one."
3+
"withBackground": "Wraps its children in an element and applies the current theme's background color to it."
54
},
65
"slots": {
76
"default": "All child components will have their theme overridden. Must have exactly one root element."

packages/docs/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"description": "A Vue.js project",
55
"private": true,
66
"author": "John Leider <[email protected]>",
7-
"version": "3.10.8",
7+
"version": "3.10.9",
88
"repository": {
99
"type": "git",
1010
"url": "git+https://github.com/vuetifyjs/vuetify.git",

packages/docs/src/components/app/drawer/PinnedItems.vue

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,14 @@
33
v-if="one.isSubscriber && user.ecosystem.docs.pins.enabled"
44
v-model:opened="opened"
55
:items="pinned"
6-
class="pb-0 mb-n2"
6+
class="pb-0 mb-n1"
77
nav
88
>
99
<template #item="{ props: itemProps }">
1010
<v-hover v-slot="{ props: activatorProps, isHovering }">
1111
<v-list-item
1212
:title="itemProps.title"
1313
:to="itemProps.to"
14-
class="mb-1"
1514
v-bind="activatorProps"
1615
@click.prevent="onClickPin(itemProps.to)"
1716
>

packages/vuetify/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "vuetify",
33
"description": "Vue Material Component Framework",
4-
"version": "3.10.8",
4+
"version": "3.10.9",
55
"author": {
66
"name": "John Leider",
77
"email": "[email protected]"

packages/vuetify/src/components/VBtnToggle/VBtnToggle.sass

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,25 @@
88

99
&.v-btn--variant-plain
1010
opacity: 1
11+
12+
@media (forced-colors: active)
13+
> .v-btn:not(.v-btn--disabled)
14+
border-color: buttontext !important
15+
16+
&:focus-visible
17+
outline: 0
18+
19+
&:not(.v-btn--active)
20+
&:hover,
21+
&:focus-visible
22+
color: highlight
23+
border-color: currentColor !important
24+
25+
> .v-btn--active
26+
color: highlight !important
27+
forced-color-adjust: preserve-parent-color;
28+
29+
&:not(.v-btn--variant-text, .v-btn--variant-plain)
30+
background-color: highlight !important
31+
color: highlighttext !important
32+
border-color: highlight !important

packages/vuetify/src/components/VList/VList.sass

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,12 @@
2121
&--nav
2222
padding-inline: $list-nav-padding
2323

24+
.v-list-item:not(:first-child),
25+
.v-list-group:not(:first-child) > .v-list-item,
26+
.v-list-group__items > .v-list-item,
27+
.v-list-group__items > .v-list-group
28+
margin-top: $list-item-nav-margin-top
29+
2430
&--rounded
2531
@include tools.rounded($list-rounded-border-radius)
2632

packages/vuetify/src/components/VList/VListItem.sass

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -274,10 +274,6 @@
274274
&--nav
275275
padding-inline: $list-nav-padding
276276

277-
.v-list &
278-
&:not(:only-child)
279-
margin-bottom: $list-item-nav-margin-top
280-
281277
.v-list-item__underlay
282278
position: absolute
283279

packages/vuetify/src/components/VOverlay/useActivator.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,8 @@ export function useActivator (
172172
}
173173

174174
if (openOnFocus.value) {
175-
events.onFocusin = () => {
175+
events.onFocusin = (e: Event) => {
176+
if (!(e.target as HTMLElement).matches(':focus-visible')) return
176177
isFocused = true
177178
runOpenDelay()
178179
}

0 commit comments

Comments
 (0)