Grasscutters/Grasscutter
3
0
Fork 0
mirror of https://github.com/Melledy/Grasscutter.git synced 2024-11-22 20:03:21 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/unstable' into unstable

Browse Source
This commit is contained in:
KingRainbow44 2023-05-12 23:20:26 -04:00
commit b55cbbc507
No known key found for this signature in database
GPG Key ID: FC2CB64B00D257BE
4 changed files with 6 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/handbook/src/backend/data.ts
View File

@ -70,9 +70,7 @@ export function getCommands(): CommandDump {
* Fetches and lists all the commands in the file.
*/
export function listCommands(): Command[] {
return Object.values(getCommands())
.sort((a, b) =>
a.name[0].localeCompare(b.name[0]));
return Object.values(getCommands()).sort((a, b) => a.name[0].localeCompare(b.name[0]));
}
/**
@ -115,9 +113,7 @@ export function getAvatars(): AvatarDump {
* Fetches and lists all the avatars in the file.
*/
export function listAvatars(): Avatar[] {
return Object.values(getAvatars())
.sort((a, b) =>
a.name.localeCompare(b.name));
return Object.values(getAvatars()).sort((a, b) => a.name.localeCompare(b.name));
}
/**

5
src/handbook/src/ui/pages/HomePage.tsx
View File

@ -41,10 +41,7 @@ class HomePage extends React.Component<any, any> {
<p>trademarks and copyrights of HoYoverse.</p>
</div>
<div
className={"HomePage_Discord"}
onClick={() => openUrl("https://discord.gg/grasscutter")}
>
<div className={"HomePage_Discord"} onClick={() => openUrl("https://discord.gg/grasscutter")}>
<DiscordLogo />
<p>Join the Community!</p>
</div>

6
src/handbook/src/ui/pages/ScenesPage.tsx
View File

@ -45,7 +45,7 @@ class ScenesPage extends React.PureComponent {
if (connected) {
await teleportTo(scene);
} else {
await copyToClipboard(action.teleport(scene))
await copyToClipboard(action.teleport(scene));
}
}
@ -61,9 +61,7 @@ class ScenesPage extends React.PureComponent {
title={scene.identifier}
alternate={`ID: ${scene.id} | ${sceneTypeToString(scene.type)}`}
button={
<button className={"ScenesPage_Button"}
onClick={() => this.teleport(scene.id)}
>
<button className={"ScenesPage_Button"} onClick={() => this.teleport(scene.id)}>
Teleport
</button>
}

6
src/handbook/src/ui/widgets/Character.tsx
View File

@ -49,11 +49,7 @@ class Character extends React.PureComponent<IProps> {
/>
<div className={"Character_Label"}>
<p
style={{ fontSize: characterName.length >= 12 ? 13 : 17 }}
>
{characterName}
</p>
<p style={{ fontSize: characterName.length >= 12 ? 13 : 17 }}>{characterName}</p>
</div>
</div>
);