Skip to content

Commit 99c7133

Browse files
committed
Merge branch 'develop' into main
2 parents ae9f896 + 9326436 commit 99c7133

File tree

4 files changed

+13
-7
lines changed

4 files changed

+13
-7
lines changed

packages/demo/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"@codemirror/language": "^6.1.0",
2828
"@ui-schema/dictionary": "~0.0.10",
2929
"@ui-schema/ds-material": "~0.4.0-alpha.5",
30-
"@ui-schema/kit-codemirror": "~0.1.0",
30+
"@ui-schema/kit-codemirror": "~0.1.0-alpha.1",
3131
"@ui-schema/material-code": "~0.4.0",
3232
"@ui-schema/ui-schema": "~0.4.1",
3333
"immutable": "^4.0.0",

packages/material-code/package-lock.json

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/material-code/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@ui-schema/material-code",
3-
"version": "0.4.1",
3+
"version": "0.4.2",
44
"description": "Code editor widgets using CodeMirror, with Material-UI styling for UI-Schema",
55
"homepage": "https://ui-schema.bemit.codes/docs/material-code/material-code",
66
"author": {
@@ -50,7 +50,7 @@
5050
"@codemirror/state": "^6.0.0",
5151
"@codemirror/view": "^6.0.0",
5252
"@codemirror/language": "^6.1.0",
53-
"@ui-schema/kit-codemirror": "~0.1.0",
53+
"@ui-schema/kit-codemirror": "~0.1.0-alpha.1",
5454
"@ui-schema/ds-material": "~0.4.0-alpha",
5555
"@ui-schema/ui-schema": "~0.4.0-alpha",
5656
"immutable": "^4.0.0",
@@ -63,7 +63,7 @@
6363
"@codemirror/state": "^6.0.0",
6464
"@codemirror/view": "^6.0.0",
6565
"@codemirror/language": "^6.1.0",
66-
"@ui-schema/kit-codemirror": "~0.1.0",
66+
"@ui-schema/kit-codemirror": "~0.1.0-alpha.1",
6767
"@ui-schema/ds-material": "~0.4.0-alpha",
6868
"@ui-schema/ui-schema": "~0.4.0-alpha",
6969
"immutable": "^4.0.0",

packages/material-code/src/useEditorTheme/useEditorTheme.ts

+6
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,12 @@ export const useEditorTheme = (
146146
'& .cm-gutters .cm-lineNumbers .cm-gutterElement': {
147147
paddingLeft: spacing(1),
148148
},
149+
'&.cm-editor .cm-foldPlaceholder': {
150+
padding: '0 ' + spacing(0.5),
151+
backgroundColor: palette.mode === 'light' ? palette.background.default : palette.background.paper,
152+
borderColor: palette.divider,
153+
color: palette.primary.main,
154+
},
149155
},
150156
{dark: palette.mode === 'dark'},
151157
),

0 commit comments

Comments
 (0)