diff --git a/src/assets/style/styles.css b/src/assets/style/styles.css index 0a6da19..b10e4ff 100644 --- a/src/assets/style/styles.css +++ b/src/assets/style/styles.css @@ -1,7 +1,20 @@ -body{ +@import url('https://fonts.googleapis.com/css2?family=Noto+Sans+HK|Noto+Sans+SC&display=swap'); +@import url('https://fonts.googleapis.com/css2?family=Noto+Sans+SC&display=swap'); + +html, +body, +#root, +.app, +.content { + height: 100%; + width: 100%; + font-family: "Noto Sans HK", "Noto Sans SC"; +} + +/* body{ padding-top: 53px; font-family: 微軟正黑體; -} +} */ /* main{ padding-top: 43px; } */ \ No newline at end of file diff --git a/src/index.js b/src/index.js index 4465d65..5efaa37 100644 --- a/src/index.js +++ b/src/index.js @@ -1,6 +1,7 @@ import { StrictMode } from 'react'; import { createRoot } from 'react-dom/client'; import { BrowserRouter } from 'react-router-dom'; +import "./assets/style/styles.css" // scroll bar import 'simplebar/src/simplebar.css'; diff --git a/src/pages/Proof/Search_GLD/SearchForm.js b/src/pages/Proof/Search_GLD/SearchForm.js index 4bbb7b6..d803a2c 100644 --- a/src/pages/Proof/Search_GLD/SearchForm.js +++ b/src/pages/Proof/Search_GLD/SearchForm.js @@ -91,7 +91,7 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss >
- + {/*row 1*/} @@ -282,7 +282,7 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss {/*last row*/} - + @@ -493,7 +494,6 @@ const ApplicationDetailCard = ( diff --git a/src/themes/index.js b/src/themes/index.js index 728f01a..22ee02a 100644 --- a/src/themes/index.js +++ b/src/themes/index.js @@ -17,7 +17,7 @@ export default function ThemeCustomization({ children }) { const theme = Palette('light', 'default'); // eslint-disable-next-line react-hooks/exhaustive-deps - const themeTypography = Typography(`微軟正黑體`); + const themeTypography = Typography(``); const themeCustomShadows = useMemo(() => CustomShadows(theme), [theme]); const themeOptions = useMemo(