Fix: マージミス

Type4ny-Project · Jul 15, 2024 · c2cf314 · c2cf314
1 parent 15005c4
commit c2cf314
Show file tree

Hide file tree

Showing 3 changed files with 1,185 additions and 840 deletions.
diff --git a/packages/frontend/src/components/MkMenu.vue b/packages/frontend/src/components/MkMenu.vue
@@ -30,7 +30,6 @@ SPDX-License-Identifier: AGPL-3.0-only
 				v-else-if="item.type === 'link'"
 				role="menuitem"
 				:to="item.to"
-				:tabindex="i"
 				class="_button"
 				:class="[$style.item,{[$style.gamingDark]: gamingType === 'dark',[$style.gamingLight]: gamingType === 'light' }]"
 				@click.passive="close(true)"
@@ -49,7 +48,6 @@ SPDX-License-Identifier: AGPL-3.0-only
 				:href="item.href"
 				:target="item.target"
 				:download="item.download"
-				:tabindex="i"
 				class="_button"
 				:class="[$style.item,{[$style.gamingDark]: gamingType === 'dark',[$style.gamingLight]: gamingType === 'light' }]"
 				@click.passive="close(true)"
@@ -78,7 +76,6 @@ SPDX-License-Identifier: AGPL-3.0-only
 			<button
 				v-else-if="item.type === 'switch'"
 				role="menuitemcheckbox"
-				:tabindex="i"
 				class="_button"
 				:class="[$style.item, $style.switch, { [$style.switchDisabled]: item.disabled } , {  [$style.gamingDark]: gamingType === 'dark',[$style.gamingLight]: gamingType === 'light' }]"
 				:disabled="unref(item.disabled)"
@@ -803,5 +800,7 @@ onBeforeUnmount(() => {
   100% {
     background-position: 0% 50%
   }
+}
+	}
 }
 </style>
diff --git a/packages/frontend/src/pages/admin/roles.vue b/packages/frontend/src/pages/admin/roles.vue
@@ -281,8 +281,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 							</MkFolder>
 						</MkFoldableSection>
 
-						<MkButton primary rounded @cl
-											ick="updateBaseRole">{{ i18n.ts.save }}</MkButton>
+						<MkButton primary rounded @click="updateBaseRole">{{ i18n.ts.save }}</MkButton>
 					</div>
 				</MkFolder>
 				<MkButton primary rounded @click="create"><i class="ti ti-plus"></i> {{ i18n.ts._role.new }}</MkButton>