Skip to content

Commit b6e2e7d

Browse files
Fixed CSS issue found during testing of issue 6510.
1 parent c6183c9 commit b6e2e7d

2 files changed

Lines changed: 43 additions & 6 deletions

File tree

web/pgadmin/static/js/Theme/overrides/jsoneditor.override.js

Lines changed: 41 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -165,16 +165,23 @@ export default function jsonEditorOverride(theme) {
165165
'--jse-svelte-select-background': theme.palette.background.default,
166166
'--list-background': theme.palette.background.default,
167167
'--item-is-active-color': theme.palette.primary.contrastText,
168-
'--item-hover-bg': theme.palette.primary.hoverMain,
168+
'--jse-hover-background-color': theme.palette.primary.hoverMain,
169+
},
170+
'.svelte-select .svelte-select-list .list-item:hover': {
171+
'--item-hover-bg': theme.palette.primary.main,
172+
'--item-hover-color': theme.palette.primary.contrastText,
169173
},
170-
171174
/* Body */
172175
'.jse-modal-contents': {
173176
'--jse-modal-background': theme.palette.background.default,
174177
},
175178

176179
'.jse-transform-modal-inner textarea': {
177-
' --jse-input-background': theme.palette.background.default,
180+
'--jse-input-background': theme.palette.background.default,
181+
},
182+
183+
'.jse-filter-value': {
184+
'--jse-input-background': theme.palette.background.default,
178185
},
179186

180187
'.jse-contextmenu': {
@@ -200,7 +207,37 @@ export default function jsonEditorOverride(theme) {
200207
'--jse-value-color-boolean': 'darkorange',
201208
'--jse-value-color-string': theme.otherVars.editor.string,
202209
'--jse-value-color-null': theme.otherVars.editor.keyword,
203-
'--jse-delimiter-color': theme.palette.text.primary
210+
'--jse-delimiter-color': theme.palette.text.primary,
211+
'--jse-font-family-mono': theme.typography.fontFamilySourceCode
212+
},
213+
'.jse-text-mode .jse-contents .cm-editor .cm-selectionBackground': {
214+
'--jse-selection-background-color': theme.otherVars.editor.selectionBg,
215+
},
216+
217+
'.jse-main:not(.jse-focus)': {
218+
'--jse-selection-background-inactive-color': theme.otherVars.editor.selectionBg,
219+
},
220+
221+
'.jse-table-mode .jse-contents table.jse-table-main .jse-table-row .jse-table-cell.jse-table-cell-header, .jse-table-mode.jse-contents table.jse-table-main .jse-table-row .jse-table-cell.jse-table-cell-gutter': {
222+
'--jse-table-header-background': theme.otherVars.editor.guttersBg,
223+
'--jse-text-readonly': theme.otherVars.editor.guttersFg,
224+
},
225+
226+
'.jse-table-mode .jse-contents table.jse-table-main .jse-table-row .jse-table-cell.jse-table-cell-gutter': {
227+
'--jse-table-header-background': theme.otherVars.editor.guttersBg,
228+
'--jse-text-readonly': theme.otherVars.editor.guttersFg,
229+
},
230+
231+
'.jse-column-header:hover': {
232+
'--jse-table-header-background-highlight': theme.palette.primary.hoverMain,
233+
},
234+
235+
'.jse-json-node.jse-selected-value .jse-value-outer, .jse-json-node.jse-selected-value .jse-meta, .jse-json-node.jse-selected-value .jse-items .jse-header, .jse-json-node.jse-selected-value .jse-items .jse-contents, .jse-json-node.jse-selected-value .jse-props .jse-header, .jse-json-node.jse-selected-value .jse-props .jse-contents, .jse-json-node.jse-selected-value .jse-footer': {
236+
'--jse-selection-background-color': theme.otherVars.editor.selectionBg,
237+
},
238+
239+
'.jse-json-node.jse-selected .jse-header, .jse-json-node.jse-selected .jse-contents, .jse-json-node.jse-selected .jse-footer': {
240+
'--jse-selection-background-color': theme.otherVars.editor.selectionBg,
204241
}
205242
};
206243
}

web/pgadmin/tools/sqleditor/static/js/components/QueryToolDataGrid/Editors.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,8 @@ const StyledEditorDiv = styled(Box)(({ theme }) => ({
8989
padding: '0.25rem',
9090
'& .jsoneditor-div': {
9191
fontSize: '12px',
92-
minWidth: '525px',
93-
minHeight: '300px',
92+
minWidth: '600px',
93+
minHeight: '500px',
9494
...theme.mixins.panelBorder.all,
9595
outline: 0,
9696
resize: 'both',

0 commit comments

Comments
 (0)