Grasscutters/grasscutterTools
2
0
Fork 0
mirror of https://github.com/wmn1525/grasscutterTools.git synced 2024-11-22 15:37:59 +00:00
Code Issues Projects Releases Wiki Activity

:add 合并冲突

Browse Source
This commit is contained in:
wmn 2022-05-12 14:21:36 +08:00
commit e4ea0d703b
6 changed files with 13878 additions and 2420 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
index.html
View File

@ -1,5 +1,5 @@
<!DOCTYPE html> <!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> <head>
<meta charset="UTF-8" /> <meta charset="UTF-8" />

3
src/components.d.ts vendored
View File

@ -6,6 +6,9 @@ import '@vue/runtime-core'
declare module '@vue/runtime-core' { declare module '@vue/runtime-core' {
export interface GlobalComponents { export interface GlobalComponents {
AButton: typeof import('@arco-design/web-vue')['Button'] 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'] ATooltip: typeof import('@arco-design/web-vue')['Tooltip']
Footer: typeof import('./components/footer/index.vue')['default'] Footer: typeof import('./components/footer/index.vue')['default']
Header: typeof import('./components/Header/index.vue')['default'] Header: typeof import('./components/Header/index.vue')['default']

57
src/components/Header/index.vue
View File

@ -45,25 +45,20 @@ const ThemeChange = (val: string | number | boolean) => {
<template> <template>
<header class="antialiased bg-white Male text-slate-500 dark:text-slate-400 dark:bg-slate-900"> <header class="antialiased bg-white Male text-slate-500 dark:text-slate-400 dark:bg-slate-900">
<div <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="mx-auto max-w-8xl">
<div <div class="px-4 py-4 border-b border-slate-900/10 lg:px-8 lg:border-0 dark:border-slate-300/10">
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"> <div class="relative flex items-center text-2xl sm:text-2xl font-blimone">
<router-link <router-link to="/" class="mr-3 flex-none w-[2.0625rem] md:w-auto leading-6 dark:text-slate-200">
to="/" GrasscutterTools</router-link>
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"> <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"> <nav class="text-sm font-semibold leading-6 text-slate-700 dark:text-slate-200">
<ul class="flex space-x-8"> <ul class="flex space-x-8">
<li> <li>
<router-link <a href="https://www.grasscutter.cf/" target="_bank"
to="/" class="block ml-6 text-slate-400 hover:text-slate-500 dark:hover:text-slate-300">
class="hover:text-sky-500 dark:hover:text-sky-400" Grasscutter-docs-zh_CN
>GithubDemo</router-link> </a>
</li> </li>
<li> <li>
<router-link <router-link
@ -73,34 +68,21 @@ const ThemeChange = (val: string | number | boolean) => {
</li> </li>
</ul> </ul>
</nav> </nav>
<div <div class="flex items-center pl-6 ml-6 border-l border-slate-200 dark:border-slate-800">
class="flex items-center pl-6 ml-6 border-l border-slate-200 dark:border-slate-800" <a-tooltip :content="
> theme === 'light'
<a-tooltip ? '设置暗黑主题'
:content=" : '设置明亮主题'
theme === 'light' ">
? '设置暗黑主题' <a-button size="mini" class="nav-btn" type="outline" :shape="'circle'" @click="toggleTheme">
: '设置明亮主题'
"
>
<a-button
size="mini"
class="nav-btn"
type="outline"
:shape="'circle'"
@click="toggleTheme"
>
<template #icon> <template #icon>
<icon-moon-fill v-if="theme === 'dark'" /> <icon-moon-fill v-if="theme === 'dark'" />
<icon-sun-fill v-else /> <icon-sun-fill v-else />
</template> </template>
</a-button> </a-button>
</a-tooltip> </a-tooltip>
<a <a href="https://github.com/wmn1525/grasscutterTools" target="_bank"
href="https://github.com/wmn1525/grasscutterTools" class="block ml-6 text-slate-400 hover:text-slate-500 dark:hover:text-slate-300">
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" /> <SvgIcon name="svg-github" size="small" color="#999999" />
</a> </a>
</div> </div>
@ -117,19 +99,24 @@ const ThemeChange = (val: string | number | boolean) => {
color: #334155; color: #334155;
font-size: 0.875em; font-size: 0.875em;
font-variant-ligatures: none; font-variant-ligatures: none;
code { code {
color: #0f172a; color: #0f172a;
font-family: Fira Code VF, ui-monospace, SFMono-Regular, Menlo, Monaco, font-family: Fira Code VF, ui-monospace, SFMono-Regular, Menlo, Monaco,
Consolas, Liberation Mono, Courier New, monospace; Consolas, Liberation Mono, Courier New, monospace;
&::before { &::before {
content: "`"; content: "`";
} }
&::after { &::after {
content: "`"; content: "`";
} }
} }
&.dark\:prose-dark { &.dark\:prose-dark {
color: #94a3b8; color: #94a3b8;
code { code {
color: #e2e8f0; color: #e2e8f0;
} }

2
src/pages/start/components/holyrelic.vue
View File

@ -82,7 +82,7 @@ function copyvalue() {
<div class="text-slate-900 dark:text-slate-100"> <div class="text-slate-900 dark:text-slate-100">
圣遗物: 圣遗物:
</div> </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>
<div class="commuse-item"> <div class="commuse-item">

14648
src/pages/start/components/json/holyrelicname.json
View File

File diff suppressed because it is too large Load Diff

1584
src/pages/start/components/json/monster.json
View File

File diff suppressed because it is too large Load Diff