Skip to content

Commit 94e2478

Browse files
authored
Merge pull request #4670 from Lihlu/lihlumise/b/4661
Fix enitity picker modal styling
2 parents 552546b + eee7bc8 commit 94e2478

File tree

2 files changed

+20
-4
lines changed

2 files changed

+20
-4
lines changed

shesha-reactjs/src/components/entityPicker/modal.tsx

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,18 @@ const EntityPickerModalInternal = (props: IEntityPickerModalProps): JSX.Element
231231
<TablePager />
232232
</div>
233233

234-
<DataTable onSelectRow={onSelectRow} onDblClick={onDblClick} options={{ omitClick: true }} striped rowDividers rowAlternateBackgroundColor={getTableDefaults().rowAlternateBackgroundColor} />
234+
<DataTable
235+
onSelectRow={onSelectRow}
236+
onDblClick={onDblClick}
237+
options={{ omitClick: true }}
238+
striped
239+
rowDividers
240+
rowAlternateBackgroundColor={getTableDefaults().rowAlternateBackgroundColor}
241+
headerBackgroundColor="#ffffff"
242+
headerFontSize={getTableDefaults().headerFontSize}
243+
headerFontWeight={getTableDefaults().headerFontWeight}
244+
headerFontFamily={getTableDefaults().headerFontFamily}
245+
/>
235246
</>
236247
</Modal>
237248
);

shesha-reactjs/src/components/entityPicker/styles/styles.ts

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,13 @@ export const useStyles = createStyles(({ css, cx, prefixCls, token }, { style }:
4747
}
4848
4949
.${shaReactTable} {
50-
margin: unset;
50+
margin: unset !important;
51+
width: 100% !important;
52+
display: block !important;
5153
overflow: auto;
54+
border: 1px solid #d9d9d9;
55+
border-radius: 6px;
56+
box-sizing: border-box;
5257
${sheshaStyles.thinScrollbars}
5358
}
5459
@@ -63,7 +68,7 @@ export const useStyles = createStyles(({ css, cx, prefixCls, token }, { style }:
6368
}
6469
6570
.${prefixCls}-modal-footer {
66-
padding: 12px 24px;
71+
padding: 12px 0 !important;
6772
display: flex;
6873
flex-direction: row;
6974
justify-content: space-between;
@@ -124,4 +129,4 @@ export const useStyles = createStyles(({ css, cx, prefixCls, token }, { style }:
124129
entityPickerModal,
125130
entitySelect,
126131
};
127-
});
132+
});

0 commit comments

Comments
 (0)