Skip to content

N
Neos
Commit 6d78b4fb authored by timel's avatar timel
Browse files
Options

Merge branch 'fix/0819' into 'main' 

Fix/0819

See merge request !273
parents cd06a16a 6c7dca9a
Pipeline #23205 passed with stages
              in 11 minutes and 5 seconds
              Hide whitespace changes
              Inline Side-by-side
              Showing with 3 additions and 3 deletions
              src/ui/Match/index.tsx
              View file @ 6d78b4fb
              ...@@ -77,9 +77,10 @@ export const Component: React.FC = () => { ...@@ -77,9 +77,10 @@ export const Component: React.FC = () => {
              }))} }))}
              /> />
              <Button <Button
              style={{ width: 150, fontSize: "14px" }} style={{ width: 150 }}
              icon={<EditOutlined />} icon={<EditOutlined />}
              onClick={() => navigate("/build")} onClick={() => navigate("/build")}
              size="large"
              > >
              卡组编辑 卡组编辑
              </Button> </Button>
              ......
              src/ui/Shared/YgoCard/index.module.scss
              View file @ 6d78b4fb
              ...@@ -5,7 +5,6 @@ ...@@ -5,7 +5,6 @@
              align-items: center; align-items: center;
              justify-content: center; justify-content: center;
              font-size: 12px; font-size: 12px;
              padding: 5px;
              line-height: 1.75em; line-height: 1.75em;
              overflow: hidden; //超出的文本隐藏 overflow: hidden; //超出的文本隐藏
              text-overflow: ellipsis; //溢出用省略号显示 text-overflow: ellipsis; //溢出用省略号显示
              ......
              src/ui/theme.ts
              View file @ 6d78b4fb
              ...@@ -46,7 +46,7 @@ export const theme: ThemeConfig = { ...@@ -46,7 +46,7 @@ export const theme: ThemeConfig = {
              fontSizeLG: 14, fontSizeLG: 14,
              fontSize: 12, fontSize: 12,
              colorBgContainer: "hsla(0, 0%, 100%, 0.05)", colorBgContainer: "hsla(0, 0%, 100%, 0.05)",
              colorPrimaryHover: "#ccc", // colorPrimaryHover: "#ccc",
              colorPrimaryActive: "#aaa", colorPrimaryActive: "#aaa",
              }, },
              Popover: { Popover: {
              ......
              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