Commit 6ef51083 authored by timel's avatar timel

Merge branch 'fix/0819-2' into 'main'

fix: small

See merge request mycard/Neos!274
parents 49b4f00e f23803f0
Pipeline #23211 passed with stages
in 9 minutes and 40 seconds
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
"build:prod": "vite build --base=https://cdn02.moecube.com:444/neos/", "build:prod": "vite build --base=https://cdn02.moecube.com:444/neos/",
"preview": "vite preview", "preview": "vite preview",
"lint": "eslint --ext .ts --ext .tsx src", "lint": "eslint --ext .ts --ext .tsx src",
"fmt": "eslint --ext .ts --ext .tsx src --fix && cd rust-src && cargo fmt" "fmt": "npx tsc && eslint --ext .ts --ext .tsx src --fix && cd rust-src && cargo fmt"
}, },
"eslintConfig": { "eslintConfig": {
"extends": [ "extends": [
......
...@@ -59,6 +59,7 @@ ...@@ -59,6 +59,7 @@
font-size: 14px; font-size: 14px;
line-height: 24px; line-height: 24px;
color: hsla(0, 0%, 100%, 0.6); color: hsla(0, 0%, 100%, 0.6);
white-space: pre-wrap;
} }
} }
} }
import { import {
EditOutlined, EditOutlined,
LoadingOutlined, LoadingOutlined,
PlayCircleOutlined, PlayCircleFilled,
SettingFilled, SettingFilled,
} from "@ant-design/icons"; } from "@ant-design/icons";
import { App, Button, Space } from "antd"; import { App, Button, Space } from "antd";
...@@ -135,13 +135,13 @@ export const Component: React.FC = () => { ...@@ -135,13 +135,13 @@ export const Component: React.FC = () => {
<div className={styles["mode-select"]}> <div className={styles["mode-select"]}>
<Mode <Mode
title="竞技匹配" title="竞技匹配"
desc="与天梯其他数万名玩家激战,追求胜利登顶最强。每月最后一天晚上10点结算成绩,获取奖励与公布排名。" desc="与天梯其他数万名玩家激战,力争最强。每月最后一天22点结算,公布排名并获取奖励。"
icon={<IconFont type="icon-battle" size={32} />} icon={<IconFont type="icon-battle" size={32} />}
onClick={onCompetitiveMatch} onClick={onCompetitiveMatch}
/> />
<Mode <Mode
title="娱乐匹配" title="娱乐匹配"
desc="过去一周竞技匹配使用数最靠前的20个卡组被禁止使用。将胜负暂且搁置,尽情享受决斗的乐趣。" desc="暂且搁置胜负,享受决斗的乐趣。过去一周竞技匹配使用数最多的20个卡组将被。"
icon={ icon={
matchLoading ? ( matchLoading ? (
<LoadingOutlined /> <LoadingOutlined />
...@@ -153,7 +153,7 @@ export const Component: React.FC = () => { ...@@ -153,7 +153,7 @@ export const Component: React.FC = () => {
/> />
<Mode <Mode
title="单人模式" title="单人模式"
desc="开启与AI的决斗,验证自己的卡组,或者只是打发时间。" desc="开启一场与AI的决斗,验证自己的卡组,或者只是打发时间。"
icon={ icon={
singleLoading ? ( singleLoading ? (
<LoadingOutlined /> <LoadingOutlined />
...@@ -165,7 +165,7 @@ export const Component: React.FC = () => { ...@@ -165,7 +165,7 @@ export const Component: React.FC = () => {
/> />
<Mode <Mode
title="自定义房间" title="自定义房间"
desc="创建双打TAG或自定义规则的房间,或与好友约战,甚至举办竞技比赛。" desc="创建双打TAG或自定义规则的房间,与好友约战。"
icon={<SettingFilled />} icon={<SettingFilled />}
onClick={onCustomRoom} onClick={onCustomRoom}
/> />
...@@ -177,8 +177,8 @@ export const Component: React.FC = () => { ...@@ -177,8 +177,8 @@ export const Component: React.FC = () => {
/> />
<Mode <Mode
title="观战列表" title="观战列表"
desc="观看MyCard上正在进行的决斗" desc="观看萌卡MyCard上正在进行的决斗。"
icon={<PlayCircleOutlined />} icon={<PlayCircleFilled />}
onClick={onWatchList} onClick={onWatchList}
/> />
</div> </div>
......
import { ConfigProvider, Select as AntdSelect } from "antd"; import { Select as AntdSelect } from "antd";
import classNames from "classnames"; import classNames from "classnames";
import styles from "./index.module.scss"; import styles from "./index.module.scss";
...@@ -6,31 +6,16 @@ import styles from "./index.module.scss"; ...@@ -6,31 +6,16 @@ import styles from "./index.module.scss";
export const Select: React.FC< export const Select: React.FC<
React.ComponentProps<typeof AntdSelect> & { title: string } React.ComponentProps<typeof AntdSelect> & { title: string }
> = ({ title, className, dropdownStyle, ...rest }) => ( > = ({ title, className, dropdownStyle, ...rest }) => (
<ConfigProvider <div className={styles["custom-select"]}>
theme={{ <span className={styles.prefix}>{title}</span>
components: { <AntdSelect
Select: { className={classNames(styles.select, className)}
colorBgElevated: "hsla(0, 0%, 100%, 0.05)", size="large"
controlItemBgActive: "#79797955", dropdownStyle={{
colorBorder: "transparent", backdropFilter: "blur(20px)",
colorBgContainer: "hsla(0, 0%, 100%, 0.05)", ...dropdownStyle,
colorPrimaryHover: "#3400d1", }}
lineWidth: 0, {...rest}
}, />
}, </div>
}}
>
<div className={styles["custom-select"]}>
<span className={styles.prefix}>{title}</span>
<AntdSelect
className={classNames(styles.select, className)}
size="large"
dropdownStyle={{
backdropFilter: "blur(20px)",
...dropdownStyle,
}}
{...rest}
/>
</div>
</ConfigProvider>
); );
...@@ -17,12 +17,13 @@ export const theme: ThemeConfig = { ...@@ -17,12 +17,13 @@ export const theme: ThemeConfig = {
paddingContentHorizontalLG: 36, paddingContentHorizontalLG: 36,
}, },
Select: { Select: {
colorBgElevated: "hsla(0, 0%, 20%, 0.3)", colorBgElevated: "hsla(0, 0%, 20%, 0.1)",
controlItemBgActive: "#79797955", controlItemBgActive: "#3a4e69",
colorBorder: "transparent", colorBorder: "transparent",
colorBgContainer: "hsla(0, 0%, 100%, 0.05)", colorBgContainer: "hsla(0, 0%, 100%, 0.05)",
colorPrimaryHover: "#3400d1", colorPrimaryHover: "#3400d1",
lineWidth: 0, lineWidth: 0,
fontSizeLG: 14,
}, },
InputNumber: { InputNumber: {
colorBorder: "transparent", colorBorder: "transparent",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment