From 1b9e527b68ce4097d296dd8ce3b3a91d6162f060 Mon Sep 17 00:00:00 2001 From: FatttSnake Date: Fri, 15 Mar 2024 14:01:54 +0800 Subject: [PATCH] Style: all - change page padding to 20px --- package.json | 3 +- src/assets/css/common.scss | 2 +- src/assets/css/components/common/card.scss | 2 +- .../css/components/common/hide-scrollbar.scss | 2 +- .../css/components/common/indicator.scss | 2 +- src/assets/css/components/common/sidebar.scss | 2 +- src/assets/css/pages/sign.scss | 2 +- src/assets/css/pages/system-framework.scss | 2 +- src/assets/css/pages/system/index.scss | 4 +- src/assets/css/pages/system/settings.scss | 4 +- src/assets/css/pages/system/statistics.scss | 4 +- src/assets/css/pages/system/tools/base.scss | 4 +- src/assets/css/pages/system/tools/code.scss | 4 +- .../css/pages/system/tools/execute.scss | 4 +- src/assets/css/pages/tools-framework.scss | 2 +- src/assets/css/pages/tools/create.scss | 2 +- src/assets/css/pages/tools/edit.scss | 27 ++++--- src/assets/css/pages/tools/index.scss | 2 +- src/assets/css/pages/tools/source.scss | 4 +- src/assets/css/pages/tools/store.scss | 4 +- src/assets/css/pages/tools/user.scss | 8 +- src/assets/css/pages/tools/view.scss | 4 +- src/assets/css/pages/user-framework.scss | 2 +- src/assets/css/pages/user/index.scss | 8 +- src/pages/System/Group.tsx | 2 +- src/pages/System/Log.tsx | 2 +- src/pages/System/Role.tsx | 2 +- src/pages/System/Tools/Category.tsx | 2 +- src/pages/System/Tools/index.tsx | 2 +- src/pages/System/User.tsx | 2 +- src/pages/Tools/Edit.tsx | 73 ++++++++++--------- 31 files changed, 100 insertions(+), 89 deletions(-) diff --git a/package.json b/package.json index 46ac778..122f9ac 100644 --- a/package.json +++ b/package.json @@ -6,8 +6,9 @@ "scripts": { "dev": "vite", "dev-host": "vite --host 0.0.0.0", - "build": "vite build", + "build": "vite build && npm run typecheck", "build-test": "vite build --mode testing", + "typecheck": "tsc", "clean": "rimraf dist .eslintrc-auto-import.json auto-imports.d.ts", "lint": "eslint src --ext ts,tsx --report-unused-disable-directives --max-warnings 0", "format": "prettier --write src/", diff --git a/src/assets/css/common.scss b/src/assets/css/common.scss index d6a24a7..3b85b09 100644 --- a/src/assets/css/common.scss +++ b/src/assets/css/common.scss @@ -115,4 +115,4 @@ .flex-vertical { display: flex; flex-direction: column; -} \ No newline at end of file +} diff --git a/src/assets/css/components/common/card.scss b/src/assets/css/components/common/card.scss index 8daf288..46a6be4 100644 --- a/src/assets/css/components/common/card.scss +++ b/src/assets/css/components/common/card.scss @@ -5,4 +5,4 @@ border-radius: 8px; overflow: hidden; box-shadow: 5px 5px 15px 0 rgba(0,0,0,0.1); -} \ No newline at end of file +} diff --git a/src/assets/css/components/common/hide-scrollbar.scss b/src/assets/css/components/common/hide-scrollbar.scss index 427964a..32fcf8d 100644 --- a/src/assets/css/components/common/hide-scrollbar.scss +++ b/src/assets/css/components/common/hide-scrollbar.scss @@ -90,4 +90,4 @@ height: 8px; } } -} \ No newline at end of file +} diff --git a/src/assets/css/components/common/indicator.scss b/src/assets/css/components/common/indicator.scss index 1af0d13..be5054f 100644 --- a/src/assets/css/components/common/indicator.scss +++ b/src/assets/css/components/common/indicator.scss @@ -31,4 +31,4 @@ .active > * { background-color: constants.$font-secondary-color !important; } -} \ No newline at end of file +} diff --git a/src/assets/css/components/common/sidebar.scss b/src/assets/css/components/common/sidebar.scss index ca67fd6..42190cd 100644 --- a/src/assets/css/components/common/sidebar.scss +++ b/src/assets/css/components/common/sidebar.scss @@ -319,4 +319,4 @@ } } } -} \ No newline at end of file +} diff --git a/src/assets/css/pages/sign.scss b/src/assets/css/pages/sign.scss index ad54058..62748e0 100644 --- a/src/assets/css/pages/sign.scss +++ b/src/assets/css/pages/sign.scss @@ -146,4 +146,4 @@ } } } -} \ No newline at end of file +} diff --git a/src/assets/css/pages/system-framework.scss b/src/assets/css/pages/system-framework.scss index 6966464..4f8ea07 100644 --- a/src/assets/css/pages/system-framework.scss +++ b/src/assets/css/pages/system-framework.scss @@ -11,4 +11,4 @@ width: 0; background-color: constants.$background-color; } -} \ No newline at end of file +} diff --git a/src/assets/css/pages/system/index.scss b/src/assets/css/pages/system/index.scss index 1cf03d1..f41fad8 100644 --- a/src/assets/css/pages/system/index.scss +++ b/src/assets/css/pages/system/index.scss @@ -2,7 +2,7 @@ [data-component=system] { .root-content { - padding: 30px; + padding: 20px; gap: 20px; flex-wrap: wrap; justify-content: flex-start; @@ -38,4 +38,4 @@ } } } -} \ No newline at end of file +} diff --git a/src/assets/css/pages/system/settings.scss b/src/assets/css/pages/system/settings.scss index 032a7dc..839e7dd 100644 --- a/src/assets/css/pages/system/settings.scss +++ b/src/assets/css/pages/system/settings.scss @@ -2,7 +2,7 @@ [data-component=system-settings] { .root-content { - padding: 30px; + padding: 20px; gap: 20px; .root-col { @@ -43,4 +43,4 @@ } } } -} \ No newline at end of file +} diff --git a/src/assets/css/pages/system/statistics.scss b/src/assets/css/pages/system/statistics.scss index 7d67e24..8c7230c 100644 --- a/src/assets/css/pages/system/statistics.scss +++ b/src/assets/css/pages/system/statistics.scss @@ -2,7 +2,7 @@ [data-component=system-statistics] { .root-content { - padding: 30px; + padding: 20px; gap: 20px; flex-wrap: wrap; justify-content: center; @@ -87,4 +87,4 @@ } } } -} \ No newline at end of file +} diff --git a/src/assets/css/pages/system/tools/base.scss b/src/assets/css/pages/system/tools/base.scss index 358c38b..d8dc5ca 100644 --- a/src/assets/css/pages/system/tools/base.scss +++ b/src/assets/css/pages/system/tools/base.scss @@ -2,7 +2,7 @@ [data-component=system-tools-base] { .root-content { - padding: 30px; + padding: 20px; gap: 10px; height: 100%; width: 100%; @@ -39,4 +39,4 @@ cursor: pointer; } } -} \ No newline at end of file +} diff --git a/src/assets/css/pages/system/tools/code.scss b/src/assets/css/pages/system/tools/code.scss index 69ffc34..7908a36 100644 --- a/src/assets/css/pages/system/tools/code.scss +++ b/src/assets/css/pages/system/tools/code.scss @@ -1,5 +1,5 @@ [data-component=system-tools-code] { - padding: 30px; + padding: 20px; .card-box { width: 100%; @@ -17,4 +17,4 @@ inset-block-end: 0; } } -} \ No newline at end of file +} diff --git a/src/assets/css/pages/system/tools/execute.scss b/src/assets/css/pages/system/tools/execute.scss index c831c75..4beeb74 100644 --- a/src/assets/css/pages/system/tools/execute.scss +++ b/src/assets/css/pages/system/tools/execute.scss @@ -1,8 +1,8 @@ [data-component=system-tools-execute] { - padding: 30px; + padding: 20px; .card-box { width: 100%; height: 100%; } -} \ No newline at end of file +} diff --git a/src/assets/css/pages/tools-framework.scss b/src/assets/css/pages/tools-framework.scss index 5652c7d..79d055f 100644 --- a/src/assets/css/pages/tools-framework.scss +++ b/src/assets/css/pages/tools-framework.scss @@ -11,4 +11,4 @@ width: 0; background-color: constants.$background-color; } -} \ No newline at end of file +} diff --git a/src/assets/css/pages/tools/create.scss b/src/assets/css/pages/tools/create.scss index dea6b9a..a01a5ae 100644 --- a/src/assets/css/pages/tools/create.scss +++ b/src/assets/css/pages/tools/create.scss @@ -45,4 +45,4 @@ } } } -} \ No newline at end of file +} diff --git a/src/assets/css/pages/tools/edit.scss b/src/assets/css/pages/tools/edit.scss index 2693826..2671d2c 100644 --- a/src/assets/css/pages/tools/edit.scss +++ b/src/assets/css/pages/tools/edit.scss @@ -1,22 +1,29 @@ [data-component=tools-edit] { - .root-content { - width: 100%; + padding: 20px; + + .card-box { height: 100%; + width: 100%; - > * { - width: 0; - } - - .draggable-mask { - position: absolute; + .root-content { width: 100%; height: 100%; + + > * { + width: 0; + } + + .draggable-mask { + position: absolute; + width: 100%; + height: 100%; + } } } .draggable-content { position: fixed; - inset-inline-end: 32px; + inset-inline-end: 48px; inset-block-end: 48px; > * { @@ -25,4 +32,4 @@ inset-block-end: 0; } } -} \ No newline at end of file +} diff --git a/src/assets/css/pages/tools/index.scss b/src/assets/css/pages/tools/index.scss index 000ce1e..6bba3c3 100644 --- a/src/assets/css/pages/tools/index.scss +++ b/src/assets/css/pages/tools/index.scss @@ -3,7 +3,7 @@ [data-component=tools] { .root-content { - padding: 30px; + padding: 20px; gap: 20px; flex-wrap: wrap; justify-content: flex-start; diff --git a/src/assets/css/pages/tools/source.scss b/src/assets/css/pages/tools/source.scss index eba55ab..6a358a5 100644 --- a/src/assets/css/pages/tools/source.scss +++ b/src/assets/css/pages/tools/source.scss @@ -1,8 +1,8 @@ [data-component=tools-source] { - padding: 30px; + padding: 20px; .card-box { width: 100%; height: 100%; } -} \ No newline at end of file +} diff --git a/src/assets/css/pages/tools/store.scss b/src/assets/css/pages/tools/store.scss index 2028cec..ffc4ab0 100644 --- a/src/assets/css/pages/tools/store.scss +++ b/src/assets/css/pages/tools/store.scss @@ -21,7 +21,7 @@ } .root-content { - padding: 30px; + padding: 20px; gap: 20px; flex-wrap: wrap; justify-content: center; @@ -141,4 +141,4 @@ color: constants.$font-secondary-color; } } -} \ No newline at end of file +} diff --git a/src/assets/css/pages/tools/user.scss b/src/assets/css/pages/tools/user.scss index be5635e..f0d02a1 100644 --- a/src/assets/css/pages/tools/user.scss +++ b/src/assets/css/pages/tools/user.scss @@ -3,9 +3,9 @@ [data-component=tools-store-user] .root-content { padding: { top: 80px; - left: 30px; - right: 30px; - bottom: 30px; + left: 20px; + right: 20px; + bottom: 20px; }; .root-box { @@ -185,4 +185,4 @@ } } } -} \ No newline at end of file +} diff --git a/src/assets/css/pages/tools/view.scss b/src/assets/css/pages/tools/view.scss index df4f6a6..c5cb6a9 100644 --- a/src/assets/css/pages/tools/view.scss +++ b/src/assets/css/pages/tools/view.scss @@ -1,8 +1,8 @@ [data-component=tools-view] { - padding: 30px; + padding: 20px; .card-box { height: 100%; width: 100%; } -} \ No newline at end of file +} diff --git a/src/assets/css/pages/user-framework.scss b/src/assets/css/pages/user-framework.scss index 3523793..cd21ab7 100644 --- a/src/assets/css/pages/user-framework.scss +++ b/src/assets/css/pages/user-framework.scss @@ -11,4 +11,4 @@ width: 0; background-color: constants.$background-color; } -} \ No newline at end of file +} diff --git a/src/assets/css/pages/user/index.scss b/src/assets/css/pages/user/index.scss index ca80775..6bcce1d 100644 --- a/src/assets/css/pages/user/index.scss +++ b/src/assets/css/pages/user/index.scss @@ -3,9 +3,9 @@ [data-component=user] .root-content { padding: { top: 80px; - left: 30px; - right: 30px; - bottom: 30px; + left: 20px; + right: 20px; + bottom: 20px; }; .card-box { @@ -132,4 +132,4 @@ } } } -} \ No newline at end of file +} diff --git a/src/pages/System/Group.tsx b/src/pages/System/Group.tsx index 529cf43..2a82ac7 100644 --- a/src/pages/System/Group.tsx +++ b/src/pages/System/Group.tsx @@ -634,7 +634,7 @@ const Group = () => { <> diff --git a/src/pages/System/Log.tsx b/src/pages/System/Log.tsx index 86f4294..d665c00 100644 --- a/src/pages/System/Log.tsx +++ b/src/pages/System/Log.tsx @@ -285,7 +285,7 @@ const Log = () => { <> diff --git a/src/pages/System/Role.tsx b/src/pages/System/Role.tsx index 989f7cb..5462f44 100644 --- a/src/pages/System/Role.tsx +++ b/src/pages/System/Role.tsx @@ -641,7 +641,7 @@ const Role = () => { <> diff --git a/src/pages/System/Tools/Category.tsx b/src/pages/System/Tools/Category.tsx index 625e287..802065a 100644 --- a/src/pages/System/Tools/Category.tsx +++ b/src/pages/System/Tools/Category.tsx @@ -286,7 +286,7 @@ const Category = () => { <> diff --git a/src/pages/System/Tools/index.tsx b/src/pages/System/Tools/index.tsx index 40d5004..851c390 100644 --- a/src/pages/System/Tools/index.tsx +++ b/src/pages/System/Tools/index.tsx @@ -568,7 +568,7 @@ const Tools = () => { <> diff --git a/src/pages/System/User.tsx b/src/pages/System/User.tsx index 02b5c02..5efb44b 100644 --- a/src/pages/System/User.tsx +++ b/src/pages/System/User.tsx @@ -1010,7 +1010,7 @@ const User = () => { <> diff --git a/src/pages/Tools/Edit.tsx b/src/pages/Tools/Edit.tsx index 01d63d4..6a56e0e 100644 --- a/src/pages/Tools/Edit.tsx +++ b/src/pages/Tools/Edit.tsx @@ -21,6 +21,7 @@ import Playground from '@/components/Playground' import FitFullscreen from '@/components/common/FitFullscreen' import FlexBox from '@/components/common/FlexBox' import LoadingMask from '@/components/common/LoadingMask' +import Card from '@/components/common/Card' const Edit = () => { const navigate = useNavigate() @@ -403,41 +404,43 @@ const Edit = () => { return ( <> - - - {showDraggableMask &&
} - + + + + {showDraggableMask &&
} + + setShowDraggableMask(true)} onStop={() => setShowDraggableMask(false)}