Skip to content

Commit 791df2a

Browse files
committed
IRSA-636: remove border
1 parent 15ed830 commit 791df2a

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

src/firefly/js/templates/lightcurve/LcUtil.jsx

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -216,20 +216,21 @@ export function getMissionInfo(missionEntries, tblModel){
216216
}
217217

218218

219-
export function renderMissionView(generalEntries,missionEntries,missionBands,tblModel, wrapperStyle,labelWidth,callback ){
219+
export function renderMissionView({generalEntries,missionEntries,missionBands,tblModel, wrapperStyle, imageEntriesStyle, labelWidth,callback}){
220220

221221
//const wrapperStyle = {margin: '3px 0'};
222222
const tblColumns = get(tblModel, ['tableData', 'columns'], []);
223223
const groupKey = getViewerGroupKey(missionEntries);
224224
const {allCommonEntries, missionInputs} = getMissionEntries(generalEntries, missionEntries,tblColumns ,wrapperStyle);
225+
const imageStyle = imageEntriesStyle || { padding: '0 6px 0 6px', border: '1px solid #a3aeb9', marginLeft: '54px'};
225226

226227
const {missionName, period, title, uploadedFileName} = getMissionInfo(missionEntries, tblModel);
227228
return (
228229
<FieldGroup groupKey={groupKey}
229230
reducerFunc={callback(missionEntries, generalEntries)} keepState={true}>
230231

231232
<div >
232-
<div style={{ with:{labelWidth}, fontWeight:'bold', display:'inline-block', margin: '3px 0 6px 0'}} > Column Selection</div>
233+
<div style={{ width:{labelWidth}, fontWeight:'bold', display:'inline-block', margin: '3px 0 6px 0'}} > Column Selection</div>
233234
<label style = {{width: '170px', paddingLeft: '10px', display:'inline-block'}} title={title}>{uploadedFileName}</label>
234235
<div style = {{fontWeight:'bold',paddingLeft:'13px', display:'inline-block'}}>Images</div>
235236
</div>
@@ -240,7 +241,7 @@ export function renderMissionView(generalEntries,missionEntries,missionBands,tbl
240241
labelWidth={labelWidth} wrapperStyle={{margin: '3px 0 6px 0'}}/>
241242
{missionInputs}
242243
</div>
243-
<div style={{ padding: '0 6px 0 6px', border: '1px solid #a3aeb9', marginLeft: '54px'}}>
244+
<div style={imageStyle}>
244245
{missionBands}
245246
{allCommonEntries}
246247
</div>

src/firefly/js/templates/lightcurve/ptf/PTFMissionOptions.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ export class PTFSettingBox extends PureComponent {
2222
const tblModel = getTblById(LC.RAW_TABLE);
2323
const wrapperStyle = {margin: '3px 0'};
2424

25-
var missionFilters = ( <div style={{ with:{labelWidth}, display:'inline-block', margin: '3px 0 6px 0'}} >
25+
var missionFilters = ( <div style={{ width:{labelWidth}, display:'inline-block', margin: '3px 0 6px 0'}} >
2626
<br /> </div>);
2727

28-
29-
return renderMissionView(generalEntries,missionEntries,missionFilters,tblModel,wrapperStyle,labelWidth , ptfOptionsReducer);
28+
const imageStyle = { padding: '0 6px 0 6px', marginLeft: '54px'};
29+
return renderMissionView({generalEntries,missionEntries,missionFilters,tblModel,wrapperStyle, imageEntriesStyle:imageStyle, labelWidth , callback:ptfOptionsReducer});
3030

3131

3232
}

src/firefly/js/templates/lightcurve/wise/WiseMissionOptions.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ export class WiseSettingBox extends PureComponent {
3232
{label: 'W4', value: 'w4'}
3333
]}/>);
3434

35-
return renderMissionView(generalEntries,missionEntries,missionBands,tblModel,wrapperStyle,labelWidth, wiseOptionsReducer );
35+
return renderMissionView({generalEntries,missionEntries,missionBands,tblModel,wrapperStyle,labelWidth, callback:wiseOptionsReducer });
3636

3737

3838
}

0 commit comments

Comments
 (0)