From 357b64e9a030ed551a56326039ff6aa12164e5e2 Mon Sep 17 00:00:00 2001 From: Tunglies <77394545+Tunglies@users.noreply.github.com> Date: Wed, 18 Jun 2025 18:49:48 +0800 Subject: [PATCH] feat: enhance pre-push hook to include remote URL check and improve format check messaging --- .husky/pre-push | 12 ++++++++++-- src/components/layout/use-custom-theme.ts | 18 ++++++++++++++---- src/pages/_layout.tsx | 2 +- 3 files changed, 25 insertions(+), 7 deletions(-) diff --git a/.husky/pre-push b/.husky/pre-push index e6e72ff1..0c95cbfd 100644 --- a/.husky/pre-push +++ b/.husky/pre-push @@ -8,12 +8,20 @@ if git diff --cached --name-only | grep -q '^src-tauri/'; then fi fi -if [[ "$(git rev-parse --show-toplevel)" == */clash-verge-rev/clash-verge-rev ]]; then +remote_name="$1" +remote_url=$(git remote get-url "$remote_name") + +if [[ "$remote_url" =~ github\.com[:/]+clash-verge-rev/clash-verge-rev(\.git)?$ ]]; then + echo "[pre-push] Detected push to clash-verge-rev/clash-verge-rev ($remote_url)" + echo "[pre-push] Running pnpm format:check..." + pnpm format:check if [ $? -ne 0 ]; then - echo "Code format check failed. Please fix formatting before pushing." + echo "❌ Code format check failed. Please fix formatting before pushing." exit 1 fi +else + echo "[pre-push] Not pushing to target repo. Skipping format check." fi exit 0 diff --git a/src/components/layout/use-custom-theme.ts b/src/components/layout/use-custom-theme.ts index fbcb702a..4e474cbc 100644 --- a/src/components/layout/use-custom-theme.ts +++ b/src/components/layout/use-custom-theme.ts @@ -165,7 +165,8 @@ export const useCustomTheme = () => { const rootEle = document.documentElement; if (rootEle) { - const backgroundColor = mode === "light" ? "#ECECEC" : dt.background_color; + const backgroundColor = + mode === "light" ? "#ECECEC" : dt.background_color; const selectColor = mode === "light" ? "#f5f5f5" : "#3E3E3E"; const scrollColor = mode === "light" ? "#90939980" : "#555555"; const dividerColor = @@ -184,9 +185,18 @@ export const useCustomTheme = () => { alpha(muiTheme.palette.primary.main, 0.1), ); // 添加CSS变量 - rootEle.style.setProperty("--window-border-color", mode === "light" ? "#cccccc" : "#1E1E1E"); - rootEle.style.setProperty("--scrollbar-bg", mode === "light" ? "#f1f1f1" : "#2E303D"); - rootEle.style.setProperty("--scrollbar-thumb", mode === "light" ? "#c1c1c1" : "#555555"); + rootEle.style.setProperty( + "--window-border-color", + mode === "light" ? "#cccccc" : "#1E1E1E", + ); + rootEle.style.setProperty( + "--scrollbar-bg", + mode === "light" ? "#f1f1f1" : "#2E303D", + ); + rootEle.style.setProperty( + "--scrollbar-thumb", + mode === "light" ? "#c1c1c1" : "#555555", + ); } let styleElement = document.querySelector("style#verge-theme"); diff --git a/src/pages/_layout.tsx b/src/pages/_layout.tsx index c50c59c0..5be8eb4c 100644 --- a/src/pages/_layout.tsx +++ b/src/pages/_layout.tsx @@ -502,7 +502,7 @@ const Layout = () => { className={`${OS} layout`} style={{ borderTopLeftRadius: "0px", - borderTopRightRadius: "0px" + borderTopRightRadius: "0px", }} onContextMenu={(e) => { if (