From e9269466f17c6c29d48804f577b66f853b477dcb Mon Sep 17 00:00:00 2001 From: GZTime Date: Mon, 7 Aug 2023 10:47:15 +0800 Subject: [PATCH] fix(style): flag icon in challenge cards are not unified --- src/GZCTF/ClientApp/package.json | 4 +-- src/GZCTF/ClientApp/pnpm-lock.yaml | 32 +++++++++---------- .../src/components/ChallengeCard.tsx | 5 +-- .../src/components/ChallengePanel.tsx | 2 +- 4 files changed, 22 insertions(+), 21 deletions(-) diff --git a/src/GZCTF/ClientApp/package.json b/src/GZCTF/ClientApp/package.json index cff1df119..103a8c083 100644 --- a/src/GZCTF/ClientApp/package.json +++ b/src/GZCTF/ClientApp/package.json @@ -32,7 +32,7 @@ "embla-carousel-react": "^7.1.0", "katex": "^0.16.8", "lz-string": "^1.5.0", - "marked": "^6.0.0", + "marked": "^7.0.0", "pdfjs-dist": "3.6.172", "prismjs": "^1.29.0", "react": "^18.2.0", @@ -48,7 +48,7 @@ "@nabla/vite-plugin-eslint": "^1.5.0", "@trivago/prettier-plugin-sort-imports": "^4.2.0", "@types/katex": "^0.16.2", - "@types/node": "20.4.7", + "@types/node": "20.4.8", "@types/prismjs": "^1.26.0", "@types/react": "^18.2.18", "@types/react-dom": "^18.2.7", diff --git a/src/GZCTF/ClientApp/pnpm-lock.yaml b/src/GZCTF/ClientApp/pnpm-lock.yaml index 96139944f..0a5a4eccb 100644 --- a/src/GZCTF/ClientApp/pnpm-lock.yaml +++ b/src/GZCTF/ClientApp/pnpm-lock.yaml @@ -69,8 +69,8 @@ dependencies: specifier: ^1.5.0 version: 1.5.0 marked: - specifier: ^6.0.0 - version: 6.0.0 + specifier: ^7.0.0 + version: 7.0.0 pdfjs-dist: specifier: 3.6.172 version: 3.6.172 @@ -113,8 +113,8 @@ devDependencies: specifier: ^0.16.2 version: 0.16.2 '@types/node': - specifier: 20.4.7 - version: 20.4.7 + specifier: 20.4.8 + version: 20.4.8 '@types/prismjs': specifier: ^1.26.0 version: 1.26.0 @@ -168,7 +168,7 @@ devDependencies: version: 5.1.6 vite: specifier: ^4.4.8 - version: 4.4.8(@types/node@20.4.7) + version: 4.4.8(@types/node@20.4.8) vite-plugin-pages: specifier: ^0.31.0 version: 0.31.0(vite@4.4.8) @@ -1071,7 +1071,7 @@ packages: '@types/eslint': 8.40.0 chalk: 4.1.2 eslint: 8.46.0 - vite: 4.4.8(@types/node@20.4.7) + vite: 4.4.8(@types/node@20.4.8) dev: true /@nicolo-ribaudo/eslint-scope-5-internals@5.1.1-v1: @@ -1276,8 +1276,8 @@ packages: resolution: {integrity: sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA==} dev: true - /@types/node@20.4.7: - resolution: {integrity: sha512-bUBrPjEry2QUTsnuEjzjbS7voGWCc30W0qzgMf90GPeDGFRakvrz47ju+oqDAKCXLUCe39u57/ORMl/O/04/9g==} + /@types/node@20.4.8: + resolution: {integrity: sha512-0mHckf6D2DiIAzh8fM8f3HQCvMKDpK94YQ0DSVkfWTG9BZleYIWudw9cJxX8oCk9bM+vAkDyujDV6dmKHbvQpg==} /@types/parse-json@4.0.0: resolution: {integrity: sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==} @@ -1456,7 +1456,7 @@ packages: '@babel/plugin-transform-react-jsx-self': 7.22.5(@babel/core@7.22.9) '@babel/plugin-transform-react-jsx-source': 7.22.5(@babel/core@7.22.9) react-refresh: 0.14.0 - vite: 4.4.8(@types/node@20.4.7) + vite: 4.4.8(@types/node@20.4.8) transitivePeerDependencies: - supports-color dev: true @@ -2839,8 +2839,8 @@ packages: resolution: {integrity: sha512-JhvWq/iz1BvlmnPvLJjXv+xnMPJZuychrDC68V+yCGQJn5chcA8rLGKo5EP1XwIKVrigSXKLmbeXAGkf36wdCQ==} dev: false - /marked@6.0.0: - resolution: {integrity: sha512-7E3m/xIlymrFL5gWswIT4CheIE3fDeh51NV09M4x8iOc7NDYlyERcQMLAIHcSlrvwliwbPQ4OGD+MpPSYiQcqw==} + /marked@7.0.0: + resolution: {integrity: sha512-7Gv1Ry8tqR352ElQOQfxdGpIh8kNZh/yYjNCxAQCN1DDbY4bCTG3qDCSkZWlRElSseeEILDxkY/G9w7cgziBNw==} engines: {node: '>= 16'} hasBin: true dev: false @@ -3968,7 +3968,7 @@ packages: json5: 2.2.3 local-pkg: 0.4.3 picocolors: 1.0.0 - vite: 4.4.8(@types/node@20.4.7) + vite: 4.4.8(@types/node@20.4.8) yaml: 2.3.1 transitivePeerDependencies: - supports-color @@ -3994,7 +3994,7 @@ packages: clean-css: 5.3.2 flat-cache: 3.0.4 picocolors: 1.0.0 - vite: 4.4.8(@types/node@20.4.7) + vite: 4.4.8(@types/node@20.4.8) transitivePeerDependencies: - debug dev: true @@ -4010,13 +4010,13 @@ packages: debug: 4.3.4 globrex: 0.1.2 tsconfck: 2.1.1(typescript@5.1.6) - vite: 4.4.8(@types/node@20.4.7) + vite: 4.4.8(@types/node@20.4.8) transitivePeerDependencies: - supports-color - typescript dev: false - /vite@4.4.8(@types/node@20.4.7): + /vite@4.4.8(@types/node@20.4.8): resolution: {integrity: sha512-LONawOUUjxQridNWGQlNizfKH89qPigK36XhMI7COMGztz8KNY0JHim7/xDd71CZwGT4HtSRgI7Hy+RlhG0Gvg==} engines: {node: ^14.18.0 || >=16.0.0} hasBin: true @@ -4044,7 +4044,7 @@ packages: terser: optional: true dependencies: - '@types/node': 20.4.7 + '@types/node': 20.4.8 esbuild: 0.18.17 postcss: 8.4.27 rollup: 3.27.2 diff --git a/src/GZCTF/ClientApp/src/components/ChallengeCard.tsx b/src/GZCTF/ClientApp/src/components/ChallengeCard.tsx index 19654224e..c2af6d6d5 100644 --- a/src/GZCTF/ClientApp/src/components/ChallengeCard.tsx +++ b/src/GZCTF/ClientApp/src/components/ChallengeCard.tsx @@ -10,6 +10,7 @@ import { Title, createStyles, keyframes, + Box, } from '@mantine/core' import { mdiFlag } from '@mdi/js' import { Icon } from '@mdi/react' @@ -72,11 +73,11 @@ const ChallengeCard: FC = (props: ChallengeCardProps) => { })} > - + {challenge.title} - {solved && } + {solved && } diff --git a/src/GZCTF/ClientApp/src/components/ChallengePanel.tsx b/src/GZCTF/ClientApp/src/components/ChallengePanel.tsx index ef78605e7..dad83dbf3 100644 --- a/src/GZCTF/ClientApp/src/components/ChallengePanel.tsx +++ b/src/GZCTF/ClientApp/src/components/ChallengePanel.tsx @@ -34,7 +34,7 @@ const GRID_BREAKPOINTS = [ { maxWidth: 2500, cols: 5 }, { maxWidth: 2100, cols: 4 }, { maxWidth: 1700, cols: 3 }, - { maxWidth: 1300, cols: 2 }, + { maxWidth: 1350, cols: 2 }, { maxWidth: 900, cols: 1 }, ]