瀏覽代碼

update remark abnormal bold

master
jason.lam 1 年之前
父節點
當前提交
abdcbe403d
共有 4 個檔案被更改,包括 14 行新增9 行删除
  1. +3
    -3
      src/pages/PublicNotice/ListPanel/BaseGrid.js
  2. +3
    -3
      src/pages/PublicNotice/ListPanel/PendingPaymentTab.js
  3. +3
    -3
      src/pages/PublicNotice/ListPanel/SearchPublicNoticeTable.js
  4. +5
    -0
      src/themes/typography.js

+ 3
- 3
src/pages/PublicNotice/ListPanel/BaseGrid.js 查看文件

@@ -80,13 +80,13 @@ export default function BaseGrid({rows}) {
renderCell: (params) => ( renderCell: (params) => (
isORGLoggedIn()? isORGLoggedIn()?
<div> <div>
<Typography>Care Of: {params.row.careOf}</Typography>
<Typography variant="pnspsNormalText">Care Of: {params.row.careOf}</Typography>
<Typography> <Typography>
<FormattedMessage id="myRemarks"/>: {params.row.remarks}
<FormattedMessage variant="pnspsNormalText" id="myRemarks"/>: {params.row.remarks}
</Typography> </Typography>
</div>: </div>:
<div> <div>
<Typography>{params.row.remarks}</Typography>
<Typography variant="pnspsNormalText">{params.row.remarks}</Typography>
</div> </div>
) )
}, },


+ 3
- 3
src/pages/PublicNotice/ListPanel/PendingPaymentTab.js 查看文件

@@ -166,12 +166,12 @@ export default function SubmittedTab({ rows }) {
renderCell: (params) => ( renderCell: (params) => (
isORGLoggedIn() ? isORGLoggedIn() ?
<div> <div>
<Typography>Care Of: {params.row.careOf}</Typography>
<Typography>
<Typography variant="pnspsNormalText">Care Of: {params.row.careOf}</Typography>
<Typography variant="pnspsNormalText">
<FormattedMessage id="myRemarks"/>: {params.row.remarks}</Typography> <FormattedMessage id="myRemarks"/>: {params.row.remarks}</Typography>
</div> : </div> :
<div> <div>
<Typography>{params.row.remarks}</Typography>
<Typography variant="pnspsNormalText">{params.row.remarks}</Typography>
</div> </div>
) )
}, },


+ 3
- 3
src/pages/PublicNotice/ListPanel/SearchPublicNoticeTable.js 查看文件

@@ -83,13 +83,13 @@ export default function SearchPublicNoticeTable({ recordList }) {
renderCell: (params) => ( renderCell: (params) => (
isORGLoggedIn()? isORGLoggedIn()?
<div> <div>
<Typography>Care Of: {params.row.careOf}</Typography>
<Typography>
<Typography variant="pnspsNormalText">Care Of: {params.row.careOf}</Typography>
<Typography variant="pnspsNormalText">
<FormattedMessage id="myRemarks"/>: {params.row.remarks} <FormattedMessage id="myRemarks"/>: {params.row.remarks}
</Typography> </Typography>
</div>: </div>:
<div> <div>
<Typography>{params.row.remarks}</Typography>
<Typography variant="pnspsNormalText">{params.row.remarks}</Typography>
</div> </div>
) )
}, },


+ 5
- 0
src/themes/typography.js 查看文件

@@ -32,6 +32,11 @@ const Typography = (fontFamily) => ({
fontSize: '1.1rem', fontSize: '1.1rem',
lineHeight: 1 lineHeight: 1
}, },
pnspsNormalText: {
fontWeight: 600,
fontSize: '1.0rem',
lineHeight: 1.0
},
h1: { h1: {
fontWeight: 600, fontWeight: 600,
fontSize: '2.5rem', fontSize: '2.5rem',


Loading…
取消
儲存