diff --git a/package-lock.json b/package-lock.json index 9d9dd420..1b4d69b1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,7 +16,7 @@ "@railmapgen/rmg-palette-resources": "^3.0.1", "@railmapgen/rmg-runtime": "^12.0.0", "@railmapgen/rmg-translate": "^3.4.1", - "@railmapgen/svg-assets": "^6.1.4", + "@railmapgen/svg-assets": "^7.0.0", "@reduxjs/toolkit": "^2.7.0", "ag-grid-community": "^33.2.4", "ag-grid-react": "^33.2.4", @@ -2812,9 +2812,9 @@ "license": "GPL-3.0-only" }, "node_modules/@railmapgen/svg-assets": { - "version": "6.1.4", - "resolved": "https://registry.npmjs.org/@railmapgen/svg-assets/-/svg-assets-6.1.4.tgz", - "integrity": "sha512-mGX4bANjWY9k0B8Wu6M6K6I04CMaj/hVQWCo6d0ATMA25HP1k/D67OUzcfyiNT7yV7Ox7TnhN1mR2kvL+G/tUQ==", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/@railmapgen/svg-assets/-/svg-assets-7.0.0.tgz", + "integrity": "sha512-DZv+lBE7euEWrlY3M83nYr9VfNyTu6ZpGAWjAAG5fXhDOwHh9JrDpvPi4LE5/WT1lAPhx9Dec0R3I70BZH9nVA==", "license": "GPL-3.0-only", "dependencies": { "@railmapgen/rmg-palette-resources": "^3.0.1" @@ -11384,9 +11384,9 @@ "integrity": "sha512-WliNlAv8YIF6BXLfSwFdNGIPzvoRz7KL0CYTC/eTznSnLGqNnwbGsI+MpcwnkJMaq/KpqGVRPCzqhN+eZgZkng==" }, "@railmapgen/svg-assets": { - "version": "6.1.4", - "resolved": "https://registry.npmjs.org/@railmapgen/svg-assets/-/svg-assets-6.1.4.tgz", - "integrity": "sha512-mGX4bANjWY9k0B8Wu6M6K6I04CMaj/hVQWCo6d0ATMA25HP1k/D67OUzcfyiNT7yV7Ox7TnhN1mR2kvL+G/tUQ==", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/@railmapgen/svg-assets/-/svg-assets-7.0.0.tgz", + "integrity": "sha512-DZv+lBE7euEWrlY3M83nYr9VfNyTu6ZpGAWjAAG5fXhDOwHh9JrDpvPi4LE5/WT1lAPhx9Dec0R3I70BZH9nVA==", "requires": { "@railmapgen/rmg-palette-resources": "^3.0.1" } diff --git a/package.json b/package.json index 16b22768..028ee5dc 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "@railmapgen/rmg-palette-resources": "^3.0.1", "@railmapgen/rmg-runtime": "^12.0.0", "@railmapgen/rmg-translate": "^3.4.1", - "@railmapgen/svg-assets": "^6.1.4", + "@railmapgen/svg-assets": "^7.0.0", "@reduxjs/toolkit": "^2.7.0", "ag-grid-community": "^33.2.4", "ag-grid-react": "^33.2.4", diff --git a/public/styles/share_gzmtr.css b/public/styles/share_gzmtr.css index 1d41fa51..28c14a01 100644 --- a/public/styles/share_gzmtr.css +++ b/public/styles/share_gzmtr.css @@ -1,12 +1,26 @@ +:root { + --font-family-zh: Arial, SimHei, STHeitiSC-Medium, 'PingFang SC'; + --font-family-en: Arial; +} + .rmg-name__zh { dominant-baseline: central; - font-family: Arial, SimHei, STHeitiSC-Medium, 'PingFang SC', sans-serif; + font-family: var(--font-family-zh), sans-serif; font-weight: normal; } .rmg-name__en { dominant-baseline: middle; - font-family: Arial, sans-serif; + font-family: var(--font-family-en), sans-serif; +} + +.rmg-font__zh { + font-family: var(--font-family-zh), sans-serif; + font-weight: normal; +} + +.rmg-font__en { + font-family: var(--font-family-en), sans-serif; } rect#strip_gz { diff --git a/src/svgs/gzmtr/station.tsx b/src/svgs/gzmtr/station.tsx index 3af5032b..8994559c 100644 --- a/src/svgs/gzmtr/station.tsx +++ b/src/svgs/gzmtr/station.tsx @@ -152,8 +152,8 @@ const IntBoxs = (props: IntGroupProps & React.SVGProps) => { enName={info.name[1]} foregroundColour={info.theme?.[3] ?? MonoColour.white} backgroundColour={info.theme?.[2] ?? '#aaaaaa'} - zhClassName="rmg-name__zh" - enClassName="rmg-name__en" + zhClassName="rmg-font__zh" + enClassName="rmg-font__en" passed={stnState === -1} spanDigits={spanDigits} />