diff --git a/src/pages/Proof/Reply_Public/ApplicationDetails.js b/src/pages/Proof/Reply_Public/ApplicationDetails.js index de693e7..fa77bd7 100644 --- a/src/pages/Proof/Reply_Public/ApplicationDetails.js +++ b/src/pages/Proof/Reply_Public/ApplicationDetails.js @@ -79,7 +79,7 @@ const ApplicationDetailCard = ({ formData, }) => { - + : @@ -93,7 +93,7 @@ const ApplicationDetailCard = ({ formData, }) => { - + : @@ -112,7 +112,7 @@ const ApplicationDetailCard = ({ formData, }) => { - + : @@ -132,7 +132,7 @@ const ApplicationDetailCard = ({ formData, }) => { - + : @@ -149,7 +149,7 @@ const ApplicationDetailCard = ({ formData, }) => { - + : @@ -164,7 +164,7 @@ const ApplicationDetailCard = ({ formData, }) => { - + : @@ -181,7 +181,7 @@ const ApplicationDetailCard = ({ formData, }) => { - + : @@ -205,7 +205,7 @@ const ApplicationDetailCard = ({ formData, }) => { - + @@ -248,7 +248,7 @@ const ApplicationDetailCard = ({ formData, }) => { - + : @@ -259,9 +259,9 @@ const ApplicationDetailCard = ({ formData, }) => { { formik.values.groupType === "Private Bill" ? - ( {data.noOfPages} {intl.formatMessage({id: 'page'})} x $6,552 ) + ( {data.noOfPages} {intl.formatMessage({id: 'page'})} x $6,552 ) : - ( {data.length} cm x {data.colCount === 2 ? "$364 二格位" : "$182 一格位"} ) + ( {data.length} cm x {data.colCount === 2 ? "$364 二格位" : "$182 一格位"} ) } diff --git a/src/pages/PublicNotice/Details_Public/ApplicationDetailCard.js b/src/pages/PublicNotice/Details_Public/ApplicationDetailCard.js index 3c6e05d..f429f1a 100644 --- a/src/pages/PublicNotice/Details_Public/ApplicationDetailCard.js +++ b/src/pages/PublicNotice/Details_Public/ApplicationDetailCard.js @@ -190,7 +190,7 @@ const ApplicationDetailCard = ( - + : @@ -220,7 +220,7 @@ const ApplicationDetailCard = ( - + : @@ -236,11 +236,11 @@ const ApplicationDetailCard = ( - 原因: + 原因: - + {currentApplicationDetailData.reason} @@ -259,7 +259,7 @@ const ApplicationDetailCard = ( - + : @@ -306,7 +306,7 @@ const ApplicationDetailCard = ( - + : @@ -340,7 +340,7 @@ const ApplicationDetailCard = ( - + : @@ -370,7 +370,7 @@ const ApplicationDetailCard = ( - + : @@ -405,7 +405,7 @@ const ApplicationDetailCard = ( - + : @@ -454,13 +454,13 @@ const ApplicationDetailCard = ( - + (HK$): - {FormatUtils.currencyFormat(fee)} + {FormatUtils.currencyFormat(fee)} @@ -473,7 +473,7 @@ const ApplicationDetailCard = ( - + : @@ -524,7 +524,7 @@ const ApplicationDetailCard = ( - + : @@ -535,7 +535,7 @@ const ApplicationDetailCard = ( {fileDetail.filename} @@ -567,10 +567,10 @@ const ApplicationDetailCard = ( - Care Of: + Care Of: - {currentApplicationDetailData.careOf} + {currentApplicationDetailData.careOf} : null @@ -579,12 +579,12 @@ const ApplicationDetailCard = ( - + : - {currentApplicationDetailData.remarks} + {currentApplicationDetailData.remarks} @@ -619,14 +619,14 @@ const ApplicationDetailCard = ( onClick={() => setIsPopUp(false)} aria-label={intl.formatMessage({id: 'close'})} > - + @@ -648,7 +648,7 @@ const ApplicationDetailCard = ( onClick={() => setErrorPopUp(false)} aria-label={intl.formatMessage({id: 'close'})} > - + diff --git a/src/pages/User/DetailsPage_Individual/UserInformationCard_Individual_Pub.js b/src/pages/User/DetailsPage_Individual/UserInformationCard_Individual_Pub.js index 0cad3b4..3568388 100644 --- a/src/pages/User/DetailsPage_Individual/UserInformationCard_Individual_Pub.js +++ b/src/pages/User/DetailsPage_Individual/UserInformationCard_Individual_Pub.js @@ -217,7 +217,7 @@ const UserInformationCard_Individual_Pub = ({ formData, loadDataFun }) => { - + : diff --git a/src/themes/themeConst.js b/src/themes/themeConst.js index ce35db6..99c49b9 100644 --- a/src/themes/themeConst.js +++ b/src/themes/themeConst.js @@ -369,6 +369,13 @@ export const PNSPS_THEME = createTheme({ } } }, + MuiFormLabel: { + styleOverrides: { + root:{ + color: "#000000" + } + } + }, MuiTabPanel:{ styleOverrides:{ root:{ diff --git a/src/themes/typography.js b/src/themes/typography.js index 0b8b739..1202060 100644 --- a/src/themes/typography.js +++ b/src/themes/typography.js @@ -23,9 +23,14 @@ const Typography = (fontFamily) => ({ lineHeight: 1.5 }, pnspsFormParagraph: { - fontWeight: 400, + fontWeight: 500, fontSize: '1.1rem', - lineHeight: 0.8 + lineHeight: 1 + }, + pnspsFormParagraphBold: { + fontWeight: 600, + fontSize: '1.1rem', + lineHeight: 1 }, h1: { fontWeight: 600, diff --git a/src/utils/FieldUtils.js b/src/utils/FieldUtils.js index a1463f3..462cf1f 100644 --- a/src/utils/FieldUtils.js +++ b/src/utils/FieldUtils.js @@ -13,7 +13,7 @@ export const notNullFieldLabel = (label) => { export const getDateField = ({ label, valueName, form, disabled }) => { return - {label} + {label} {initField({ @@ -30,7 +30,7 @@ export const getTextField = ({ label, valueName, form, disabled }) => { return - {label} + {label} {initField({ @@ -47,7 +47,7 @@ export const getTextArea = ({ label, valueName, form, disabled, inputProps, ...p return - {label} + {label} {initField({ @@ -74,7 +74,7 @@ export const getPhoneField = ({ label, valueName, form, disabled }) => { return - {label} + {label} @@ -119,7 +119,7 @@ export const getAddressField = ({ label, valueName, form, disabled }) => { return - {label} + {label} @@ -154,7 +154,7 @@ export const getAddressField = ({ label, valueName, form, disabled }) => { export const getComboField = ({ label, dataList, valueName, form, disabled, getOptionLabel, onInputChange, onChange, filterOptions, ...props }) => { return - {label} + {label}