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

Deni dev(pc)

See merge request !276

src/container/BudgetTahunan/BalanceSheet.js

@@ -2027,6 +2027,7 @@ export default class BalanceSheet extends Component {
                                         backgroundColor: 'transparent',
                                         cursor: 'pointer',
                                         borderColor: 'transparent',
+                                        outline: 'none'
                                     }}
                                 >
                                     <div style={{ backgroundColor: '#019ce5', width: 105, height: 25, borderRadius: 3, justifyContent: 'center', display: 'flex', alignItems: 'center' }}>
@@ -2035,9 +2036,23 @@ export default class BalanceSheet extends Component {
                                 </button>
                             </div>
                             <div className="col-2" style={{ display: 'flex', justifyContent: 'flex-end', maxWidth: '100%' }}>
+                                <button
+                                    className="button"
+                                    type="button"
+                                    style={{
+                                        backgroundColor: 'transparent',
+                                        cursor: 'pointer',
+                                        borderColor: 'transparent',
+                                        outline: 'none'
+                                    }}
+                                    onClick={() => {
+                                        this.props.onClickClose()
+                                    }}
+                                >
                                     <div style={{ backgroundColor: '#fff', width: 105, height: 25, borderRadius: 3, justifyContent: 'center', display: 'flex', alignItems: 'center', border: 'solid 1px #354960', marginRight: 20 }}>
                                         <Typography style={{ fontSize: '11px', color: '#354960', textAlign: 'center' }}>Cancel</Typography>
                                     </div>
+                                </button>
                                 <button
                                     type="button"
                                     onClick={() => this.backToMasterBudget('submitted')}
@@ -2045,6 +2060,7 @@ export default class BalanceSheet extends Component {
                                         backgroundColor: 'transparent',
                                         cursor: 'pointer',
                                         borderColor: 'transparent',
+                                        outline: 'none'
                                     }}
                                 >
                                     <div style={{ backgroundColor: '#354960', width: 105, height: 25, borderRadius: 3, justifyContent: 'center', display: 'flex', alignItems: 'center', marginRight: 20 }}>
@@ -2058,8 +2074,11 @@ export default class BalanceSheet extends Component {
                                         backgroundColor: 'transparent',
                                         cursor: 'pointer',
                                         borderColor: 'transparent',
+                                        outline: 'none'
+                                    }}
+                                    onClick={() => {
+                                        this.forceUpdate()
                                     }}
-                                    onClick={() => this.forceUpdate()}
                                 >
                                     <div style={{ backgroundColor: '#354960', width: 105, height: 25, borderRadius: 3, justifyContent: 'center', display: 'flex', alignItems: 'center' }}>
                                         <Typography style={{ fontSize: '11px', color: '#fff', textAlign: 'center' }}>Calculate</Typography>