Merge branch 'deni-dev(pc)' into 'master'

Deni dev(pc)

See merge request !567

src/container/MonthlyReport.js

@@ -327,7 +327,7 @@ export default class MonthlyReport extends Component {
                                 <button
                                     style={{
                                         backgroundColor: 'transparent',
-                                        cursor: tableMeta.rowData[5] ? 'pointer' : null,
+                                        cursor: tableMeta.rowData[5] ? 'pointer' : 'default',
                                         borderColor: 'transparent'
                                     }}
                                     onClick={() =>

src/container/MonthlyReport/BalanceSheetMR.js

@@ -47,7 +47,7 @@ export default class BalanceSheetMR extends Component {
                 name: "Rolling Outlook (FY2021)",
                 options: {
                     customHeadRender: (columnMeta) => (
-                        <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#07a7d0', width: 96 }}>
+                        <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#07a7d0', width: 96, borderLeft: '1px #fff solid', borderRight: '1px #fff solid' }}>
                             <Typography style={{ color: 'white', fontSize: 12, fontWeight: 'bold', textAlign: 'center' }}>{columnMeta.name}</Typography>
                         </TableCell>
                     ),
@@ -69,7 +69,7 @@ export default class BalanceSheetMR extends Component {
                             {/* <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#1c71b8', width: 96 }}>
                                 <Typography style={{ color: 'white', fontSize: 12, fontWeight: 'bold', textAlign: 'center' }}>{columnMeta.name}</Typography>
                             </TableCell> */}
-                            <div style={{ borderBottom: "1px #fff solid", backgroundColor: '#1c71b8', textAlign: 'center', fontSize: 12, fontWeight: 'bold', padding: 5 }}>{columnMeta.name}</div>
+                            <div style={{ borderBottom: "1px #fff solid", backgroundColor: '#07a7d0', textAlign: 'center', fontSize: 12, fontWeight: 'bold', padding: 5 }}>{columnMeta.name}</div>
                             <div className="grid grid-3x" style={{ ...style2, color: '#fff', fontSize: 12, fontWeight: 'bold', position: "sticky" }}>
                                 <div className="column-1" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, borderRight: "1px #fff solid", backgroundColor: '#07a7d0' }}>
                                     <span>{"Master Budget (MB)"}</span>
@@ -77,7 +77,7 @@ export default class BalanceSheetMR extends Component {
                                 <div className="column-2" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, borderRight: "1px #fff solid", backgroundColor: '#07a7d0' }}>
                                     <span>{"Rolling Budget (RB)"}</span>
                                 </div>
-                                <div className="column-3" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, backgroundColor: '#37b5e6' }}>
+                                <div className="column-3" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, backgroundColor: '#07a7d0' }}>
                                     <span>{"Actual"}</span>
                                 </div>
                             </div>
@@ -113,7 +113,7 @@ export default class BalanceSheetMR extends Component {
                 name: "Actual Previous Month",
                 options: {
                     customHeadRender: (columnMeta) => (
-                        <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#37b5e6', width: 96 }}>
+                        <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#37b5e6', width: 96, borderRight: '1px #fff solid' }}>
                             <Typography style={{ color: 'white', fontSize: 12, fontWeight: 'bold', textAlign: 'center' }}>{columnMeta.name}</Typography>
                         </TableCell>
                     ),