Fix: マージミス
This commit is contained in:
parent
15005c4266
commit
c2cf3149ab
|
@ -30,7 +30,6 @@ SPDX-License-Identifier: AGPL-3.0-only
|
||||||
v-else-if="item.type === 'link'"
|
v-else-if="item.type === 'link'"
|
||||||
role="menuitem"
|
role="menuitem"
|
||||||
:to="item.to"
|
:to="item.to"
|
||||||
:tabindex="i"
|
|
||||||
class="_button"
|
class="_button"
|
||||||
:class="[$style.item,{[$style.gamingDark]: gamingType === 'dark',[$style.gamingLight]: gamingType === 'light' }]"
|
:class="[$style.item,{[$style.gamingDark]: gamingType === 'dark',[$style.gamingLight]: gamingType === 'light' }]"
|
||||||
@click.passive="close(true)"
|
@click.passive="close(true)"
|
||||||
|
@ -49,7 +48,6 @@ SPDX-License-Identifier: AGPL-3.0-only
|
||||||
:href="item.href"
|
:href="item.href"
|
||||||
:target="item.target"
|
:target="item.target"
|
||||||
:download="item.download"
|
:download="item.download"
|
||||||
:tabindex="i"
|
|
||||||
class="_button"
|
class="_button"
|
||||||
:class="[$style.item,{[$style.gamingDark]: gamingType === 'dark',[$style.gamingLight]: gamingType === 'light' }]"
|
:class="[$style.item,{[$style.gamingDark]: gamingType === 'dark',[$style.gamingLight]: gamingType === 'light' }]"
|
||||||
@click.passive="close(true)"
|
@click.passive="close(true)"
|
||||||
|
@ -78,7 +76,6 @@ SPDX-License-Identifier: AGPL-3.0-only
|
||||||
<button
|
<button
|
||||||
v-else-if="item.type === 'switch'"
|
v-else-if="item.type === 'switch'"
|
||||||
role="menuitemcheckbox"
|
role="menuitemcheckbox"
|
||||||
:tabindex="i"
|
|
||||||
class="_button"
|
class="_button"
|
||||||
:class="[$style.item, $style.switch, { [$style.switchDisabled]: item.disabled } , { [$style.gamingDark]: gamingType === 'dark',[$style.gamingLight]: gamingType === 'light' }]"
|
:class="[$style.item, $style.switch, { [$style.switchDisabled]: item.disabled } , { [$style.gamingDark]: gamingType === 'dark',[$style.gamingLight]: gamingType === 'light' }]"
|
||||||
:disabled="unref(item.disabled)"
|
:disabled="unref(item.disabled)"
|
||||||
|
@ -803,5 +800,7 @@ onBeforeUnmount(() => {
|
||||||
100% {
|
100% {
|
||||||
background-position: 0% 50%
|
background-position: 0% 50%
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|
|
@ -281,8 +281,7 @@ SPDX-License-Identifier: AGPL-3.0-only
|
||||||
</MkFolder>
|
</MkFolder>
|
||||||
</MkFoldableSection>
|
</MkFoldableSection>
|
||||||
|
|
||||||
<MkButton primary rounded @cl
|
<MkButton primary rounded @click="updateBaseRole">{{ i18n.ts.save }}</MkButton>
|
||||||
ick="updateBaseRole">{{ i18n.ts.save }}</MkButton>
|
|
||||||
</div>
|
</div>
|
||||||
</MkFolder>
|
</MkFolder>
|
||||||
<MkButton primary rounded @click="create"><i class="ti ti-plus"></i> {{ i18n.ts._role.new }}</MkButton>
|
<MkButton primary rounded @click="create"><i class="ti ti-plus"></i> {{ i18n.ts._role.new }}</MkButton>
|
||||||
|
|
1995
pnpm-lock.yaml
1995
pnpm-lock.yaml
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue