Skip to content

Commit

Permalink
style: update scoreboard icon justify & tidy up
Browse files Browse the repository at this point in the history
  • Loading branch information
GZTimeWalker committed Sep 26, 2022
1 parent b991456 commit 9e85f0e
Show file tree
Hide file tree
Showing 7 changed files with 33 additions and 29 deletions.
2 changes: 1 addition & 1 deletion GZCTF/CTFServer.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<AssemblyVersion>0.12.4</AssemblyVersion>
<AssemblyVersion>0.12.5</AssemblyVersion>
<Description>GZ::CTF $(VITE_APP_GIT_NAME)-$(VITE_APP_GIT_SHA) build at $(VITE_APP_BUILD_TIMESTAMP)</Description>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
Expand Down
6 changes: 3 additions & 3 deletions GZCTF/ClientApp/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "gzctf-client",
"version": "0.12.4",
"version": "0.12.5",
"private": true,
"scripts": {
"dev": "vite",
Expand All @@ -24,7 +24,7 @@
"@mdi/react": "^1.6.1",
"@microsoft/signalr": "^6.0.9",
"dayjs": "^1.11.5",
"echarts": "^5.3.3",
"echarts": "^5.4.0",
"echarts-for-react": "^3.0.2",
"embla-carousel": "7.0.3",
"embla-carousel-autoplay": "^7.0.3",
Expand All @@ -37,7 +37,7 @@
"react-router": "^6.4.1",
"react-router-dom": "^6.4.1",
"swr": "^1.3.0",
"vite-tsconfig-paths": "^3.5.0"
"vite-tsconfig-paths": "^3.5.1"
},
"resolutions": {
"typescript": "4.7.4"
Expand Down
40 changes: 20 additions & 20 deletions GZCTF/ClientApp/pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion GZCTF/ClientApp/src/components/ScoreboardTable.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import {
Title,
Select,
Tooltip,
Center,
} from '@mantine/core'
import { Icon } from '@mdi/react'
import { useTooltipStyles } from '@Utils/ThemeOverride'
Expand Down Expand Up @@ -227,7 +228,7 @@ const TableRow: FC<{
</Stack>
}
>
{icon}
<Center>{icon}</Center>
</Tooltip>
</td>
)
Expand Down
4 changes: 2 additions & 2 deletions GZCTF/ClientApp/src/components/TimeLine.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ const TimeLine: FC = () => {
feature: {
dataZoom: {},
restore: {},
saveAsImage: {}
}
saveAsImage: {},
},
},
xAxis: {
type: 'time',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ const Submissions: FC = () => {
]}
/>
<Group position="right">
<Tooltip label="下载全部提交" position='left'>
<Tooltip label="下载全部提交" position="left">
<ActionIcon
size="lg"
onClick={() => window.open(`/api/game/${numId}/submissionsheet`, '_blank')}
Expand Down
5 changes: 4 additions & 1 deletion GZCTF/ClientApp/src/utils/ThemeOverride.ts
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,10 @@ export const useTooltipStyles = createStyles((theme) => ({
export const useIsMobile = (limit?: number) => {
const view = useViewportSize()
const theme = useMantineTheme()
return { loaded: view.width > 0, isMobile: view.width > 0 && view.width < (limit ?? theme.breakpoints.xs) }
return {
loaded: view.width > 0,
isMobile: view.width > 0 && view.width < (limit ?? theme.breakpoints.xs),
}
}

export const ACCEPT_IMAGE_MIME_TYPE = [
Expand Down

0 comments on commit 9e85f0e

Please sign in to comment.