mirror of
https://github.com/wmn1525/grasscutterTools.git
synced 2024-11-21 22:58:26 +00:00
:add 合并冲突
This commit is contained in:
wmn
commit
e4ea0d703b
@ -1,5 +1,5 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en" class="[--scroll-mt:9.875rem] lg:[--scroll-mt:6.3125rem] js-focus-visible dark" data-js-focus-visible>
|
||||
<html lang="zh" class="[--scroll-mt:9.875rem] lg:[--scroll-mt:6.3125rem] js-focus-visible dark" data-js-focus-visible>
|
||||
|
||||
<head>
|
||||
<meta charset="UTF-8" />
|
||||
@ -13,4 +13,4 @@
|
||||
<script type="module" src="/src/main.ts"></script>
|
||||
</body>
|
||||
|
||||
</html>
|
||||
</html>
|
||||
|
||||
3
src/components.d.ts
vendored
3
src/components.d.ts
vendored
@ -6,6 +6,9 @@ import '@vue/runtime-core'
|
||||
declare module '@vue/runtime-core' {
|
||||
export interface GlobalComponents {
|
||||
AButton: typeof import('@arco-design/web-vue')['Button']
|
||||
ACascader: typeof import('@arco-design/web-vue')['Cascader']
|
||||
AInput: typeof import('@arco-design/web-vue')['Input']
|
||||
AInputNumber: typeof import('@arco-design/web-vue')['InputNumber']
|
||||
ATooltip: typeof import('@arco-design/web-vue')['Tooltip']
|
||||
Footer: typeof import('./components/footer/index.vue')['default']
|
||||
Header: typeof import('./components/Header/index.vue')['default']
|
||||
|
||||
@ -45,25 +45,20 @@ const ThemeChange = (val: string | number | boolean) => {
|
||||
<template>
|
||||
<header class="antialiased bg-white Male text-slate-500 dark:text-slate-400 dark:bg-slate-900">
|
||||
<div
|
||||
class="sticky top-0 z-40 w-full backdrop-blur flex-none transition-colors duration-500 lg:z-50 lg:border-b lg:border-slate-900/10 dark:border-slate-50/[0.06] bg-white/95 supports-backdrop-blur:bg-white/60 dark:bg-transparent"
|
||||
>
|
||||
class="sticky top-0 z-40 w-full backdrop-blur flex-none transition-colors duration-500 lg:z-50 lg:border-b lg:border-slate-900/10 dark:border-slate-50/[0.06] bg-white/95 supports-backdrop-blur:bg-white/60 dark:bg-transparent">
|
||||
<div class="mx-auto max-w-8xl">
|
||||
<div
|
||||
class="px-4 py-4 border-b border-slate-900/10 lg:px-8 lg:border-0 dark:border-slate-300/10"
|
||||
>
|
||||
<div class="px-4 py-4 border-b border-slate-900/10 lg:px-8 lg:border-0 dark:border-slate-300/10">
|
||||
<div class="relative flex items-center text-2xl sm:text-2xl font-blimone">
|
||||
<router-link
|
||||
to="/"
|
||||
class="mr-3 flex-none w-[2.0625rem] md:w-auto leading-6 dark:text-slate-200"
|
||||
>GrasscutterTools</router-link>
|
||||
<router-link to="/" class="mr-3 flex-none w-[2.0625rem] md:w-auto leading-6 dark:text-slate-200">
|
||||
GrasscutterTools</router-link>
|
||||
<div class="relative items-center hidden ml-auto lg:flex">
|
||||
<nav class="text-sm font-semibold leading-6 text-slate-700 dark:text-slate-200">
|
||||
<ul class="flex space-x-8">
|
||||
<li>
|
||||
<router-link
|
||||
to="/"
|
||||
class="hover:text-sky-500 dark:hover:text-sky-400"
|
||||
>GithubDemo</router-link>
|
||||
<a href="https://www.grasscutter.cf/" target="_bank"
|
||||
class="block ml-6 text-slate-400 hover:text-slate-500 dark:hover:text-slate-300">
|
||||
Grasscutter-docs-zh_CN
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<router-link
|
||||
@ -73,34 +68,21 @@ const ThemeChange = (val: string | number | boolean) => {
|
||||
</li>
|
||||
</ul>
|
||||
</nav>
|
||||
<div
|
||||
class="flex items-center pl-6 ml-6 border-l border-slate-200 dark:border-slate-800"
|
||||
>
|
||||
<a-tooltip
|
||||
:content="
|
||||
theme === 'light'
|
||||
? '设置暗黑主题'
|
||||
: '设置明亮主题'
|
||||
"
|
||||
>
|
||||
<a-button
|
||||
size="mini"
|
||||
class="nav-btn"
|
||||
type="outline"
|
||||
:shape="'circle'"
|
||||
@click="toggleTheme"
|
||||
>
|
||||
<div class="flex items-center pl-6 ml-6 border-l border-slate-200 dark:border-slate-800">
|
||||
<a-tooltip :content="
|
||||
theme === 'light'
|
||||
? '设置暗黑主题'
|
||||
: '设置明亮主题'
|
||||
">
|
||||
<a-button size="mini" class="nav-btn" type="outline" :shape="'circle'" @click="toggleTheme">
|
||||
<template #icon>
|
||||
<icon-moon-fill v-if="theme === 'dark'" />
|
||||
<icon-sun-fill v-else />
|
||||
</template>
|
||||
</a-button>
|
||||
</a-tooltip>
|
||||
<a
|
||||
href="https://github.com/wmn1525/grasscutterTools"
|
||||
target="_bank"
|
||||
class="block ml-6 text-slate-400 hover:text-slate-500 dark:hover:text-slate-300"
|
||||
>
|
||||
<a href="https://github.com/wmn1525/grasscutterTools" target="_bank"
|
||||
class="block ml-6 text-slate-400 hover:text-slate-500 dark:hover:text-slate-300">
|
||||
<SvgIcon name="svg-github" size="small" color="#999999" />
|
||||
</a>
|
||||
</div>
|
||||
@ -117,19 +99,24 @@ const ThemeChange = (val: string | number | boolean) => {
|
||||
color: #334155;
|
||||
font-size: 0.875em;
|
||||
font-variant-ligatures: none;
|
||||
|
||||
code {
|
||||
color: #0f172a;
|
||||
font-family: Fira Code VF, ui-monospace, SFMono-Regular, Menlo, Monaco,
|
||||
Consolas, Liberation Mono, Courier New, monospace;
|
||||
|
||||
&::before {
|
||||
content: "`";
|
||||
}
|
||||
|
||||
&::after {
|
||||
content: "`";
|
||||
}
|
||||
}
|
||||
|
||||
&.dark\:prose-dark {
|
||||
color: #94a3b8;
|
||||
|
||||
code {
|
||||
color: #e2e8f0;
|
||||
}
|
||||
|
||||
@ -82,7 +82,7 @@ function copyvalue() {
|
||||
<div class="text-slate-900 dark:text-slate-100">
|
||||
圣遗物:
|
||||
</div>
|
||||
<n-select v-model:value="holyrelicnamevalue" filterable placeholder="选择圣遗物" :options="options" />
|
||||
<n-cascader v-model:value="holyrelicnamevalue" filterable placeholder="选择圣遗物" :options="options" check-strategy="child"/>
|
||||
</div>
|
||||
|
||||
<div class="commuse-item">
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user