Merge branch 'master' of http://103.44.149.204/d.arizona/tia-dev into riri

src/container/Laporan/SummaryFR.js

@@ -246,7 +246,7 @@ export default class SummaryFR extends Component {
                         <div style={{ borderBottom: "1px #fff solid", backgroundColor: '#1c71b8', textAlign: 'center', fontSize: 12, fontWeight: 'bold', padding: 5 }}>{columnMeta.name}</div>
                         <div className="grid grid-1x" style={{ ...style2, color: '#fff', fontSize: 12, fontWeight: 'bold', position: "sticky" }}>
                             <div className="column-1" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, backgroundColor: '#07a7d0' }}>
-                                <span>{"ForeCast"}</span>
+                                <span>{"Forecast"}</span>
                             </div>
                         </div>
                     </th>
@@ -291,7 +291,7 @@ export default class SummaryFR extends Component {
                         <div style={{ borderBottom: "1px #fff solid", backgroundColor: '#1c71b8', textAlign: 'center', fontSize: 12, fontWeight: 'bold', padding: 5 }}>{columnMeta.name}</div>
                         <div className="grid grid-1x" style={{ ...style2, color: '#fff', fontSize: 12, fontWeight: 'bold', position: "sticky" }}>
                             <div className="column-1" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, backgroundColor: '#07a7d0' }}>
-                                <span>{"ForeCast"}</span>
+                                <span>{"Forecast"}</span>
                             </div>
                         </div>
                     </th>

src/container/RollingOutlook/BalanceSheetRO.js

@@ -1049,7 +1049,7 @@ export default class BalanceSheetRO extends Component {
                             {this.props.isApprover === true ?
                                 <div className="col-2">
                                 </div> :
-                                <div className="col-2" style={{ display: 'flex', justifyContent: 'flex-end', maxWidth: '100%', paddingRight: 5 }}>
+                                <div className="" style={{ display: 'flex', justifyContent: 'flex-end', maxWidth: '100%', paddingRight: 5 }}>
                                     {this.state.get_for == 'view' && this.state.viewOnly && 
                                     <button
                                         className="button"
@@ -1059,7 +1059,7 @@ export default class BalanceSheetRO extends Component {
                                             cursor: 'pointer',
                                             borderColor: 'transparent',
                                             outline: 'none',
-                                            marginRight: 20
+                                            // marginRight: 20
                                         }}
                                         onClick={() => {
                                             this.setState({loading: true}, () => {