diff options
Diffstat (limited to 'subprojects')
-rw-r--r-- | subprojects/frontend/package.json | 50 | ||||
-rw-r--r-- | subprojects/frontend/src/editor/EditorTheme.ts | 8 |
2 files changed, 30 insertions, 28 deletions
diff --git a/subprojects/frontend/package.json b/subprojects/frontend/package.json index a203a66d..1146a4c5 100644 --- a/subprojects/frontend/package.json +++ b/subprojects/frontend/package.json | |||
@@ -24,22 +24,22 @@ | |||
24 | "homepage": "https://refinery.tools", | 24 | "homepage": "https://refinery.tools", |
25 | "dependencies": { | 25 | "dependencies": { |
26 | "@codemirror/autocomplete": "^6.4.0", | 26 | "@codemirror/autocomplete": "^6.4.0", |
27 | "@codemirror/commands": "^6.1.2", | 27 | "@codemirror/commands": "^6.2.0", |
28 | "@codemirror/language": "^6.3.2", | 28 | "@codemirror/language": "^6.4.0", |
29 | "@codemirror/lint": "^6.1.0", | 29 | "@codemirror/lint": "^6.1.0", |
30 | "@codemirror/search": "^6.2.3", | 30 | "@codemirror/search": "^6.2.3", |
31 | "@codemirror/state": "^6.1.4", | 31 | "@codemirror/state": "^6.2.0", |
32 | "@codemirror/view": "^6.7.1", | 32 | "@codemirror/view": "^6.7.3", |
33 | "@emotion/react": "^11.10.5", | 33 | "@emotion/react": "^11.10.5", |
34 | "@emotion/styled": "^11.10.5", | 34 | "@emotion/styled": "^11.10.5", |
35 | "@fontsource/inter": "^4.5.14", | 35 | "@fontsource/inter": "^4.5.15", |
36 | "@fontsource/jetbrains-mono": "^4.5.11", | 36 | "@fontsource/jetbrains-mono": "^4.5.12", |
37 | "@lezer/common": "^1.0.2", | 37 | "@lezer/common": "^1.0.2", |
38 | "@lezer/highlight": "^1.1.3", | 38 | "@lezer/highlight": "^1.1.3", |
39 | "@lezer/lr": "^1.2.5", | 39 | "@lezer/lr": "^1.3.1", |
40 | "@material-icons/svg": "^1.0.33", | 40 | "@material-icons/svg": "^1.0.33", |
41 | "@mui/icons-material": "5.11.0", | 41 | "@mui/icons-material": "5.11.0", |
42 | "@mui/material": "5.11.1", | 42 | "@mui/material": "5.11.6", |
43 | "@vitejs/plugin-react-swc": "^3.0.1", | 43 | "@vitejs/plugin-react-swc": "^3.0.1", |
44 | "ansi-styles": "^6.2.1", | 44 | "ansi-styles": "^6.2.1", |
45 | "escape-string-regexp": "^5.0.0", | 45 | "escape-string-regexp": "^5.0.0", |
@@ -53,42 +53,42 @@ | |||
53 | "notistack": "^2.0.8", | 53 | "notistack": "^2.0.8", |
54 | "react": "^18.2.0", | 54 | "react": "^18.2.0", |
55 | "react-dom": "^18.2.0", | 55 | "react-dom": "^18.2.0", |
56 | "xstate": "^4.35.1", | 56 | "xstate": "^4.35.3", |
57 | "zod": "^3.20.2" | 57 | "zod": "^3.20.2" |
58 | }, | 58 | }, |
59 | "devDependencies": { | 59 | "devDependencies": { |
60 | "@lezer/generator": "^1.1.3", | 60 | "@lezer/generator": "^1.2.2", |
61 | "@tsconfig/node18-strictest-esm": "^1.0.1", | 61 | "@tsconfig/node18-strictest-esm": "^1.0.1", |
62 | "@types/eslint": "^8.4.10", | 62 | "@types/eslint": "^8.4.10", |
63 | "@types/html-minifier-terser": "^7.0.0", | 63 | "@types/html-minifier-terser": "^7.0.0", |
64 | "@types/lodash-es": "^4.17.6", | 64 | "@types/lodash-es": "^4.17.6", |
65 | "@types/micromatch": "^4.0.2", | 65 | "@types/micromatch": "^4.0.2", |
66 | "@types/ms": "^0.7.31", | 66 | "@types/ms": "^0.7.31", |
67 | "@types/node": "^18.11.17", | 67 | "@types/node": "^18.11.18", |
68 | "@types/prettier": "^2.7.2", | 68 | "@types/prettier": "^2.7.2", |
69 | "@types/react": "^18.0.26", | 69 | "@types/react": "^18.0.27", |
70 | "@types/react-dom": "^18.0.9", | 70 | "@types/react-dom": "^18.0.10", |
71 | "@typescript-eslint/eslint-plugin": "^5.47.0", | 71 | "@typescript-eslint/eslint-plugin": "^5.49.0", |
72 | "@typescript-eslint/parser": "^5.47.0", | 72 | "@typescript-eslint/parser": "^5.49.0", |
73 | "@xstate/cli": "^0.4.1", | 73 | "@xstate/cli": "^0.4.2", |
74 | "cross-env": "^7.0.3", | 74 | "cross-env": "^7.0.3", |
75 | "eslint": "^8.30.0", | 75 | "eslint": "^8.32.0", |
76 | "eslint-config-airbnb": "^19.0.4", | 76 | "eslint-config-airbnb": "^19.0.4", |
77 | "eslint-config-airbnb-typescript": "^17.0.0", | 77 | "eslint-config-airbnb-typescript": "^17.0.0", |
78 | "eslint-config-prettier": "^8.5.0", | 78 | "eslint-config-prettier": "^8.6.0", |
79 | "eslint-import-resolver-typescript": "^3.5.2", | 79 | "eslint-import-resolver-typescript": "^3.5.3", |
80 | "eslint-plugin-import": "^2.26.0", | 80 | "eslint-plugin-import": "^2.27.5", |
81 | "eslint-plugin-jsx-a11y": "^6.6.1", | 81 | "eslint-plugin-jsx-a11y": "^6.7.1", |
82 | "eslint-plugin-mobx": "^0.0.9", | 82 | "eslint-plugin-mobx": "^0.0.9", |
83 | "eslint-plugin-prettier": "^4.2.1", | 83 | "eslint-plugin-prettier": "^4.2.1", |
84 | "eslint-plugin-react": "^7.31.11", | 84 | "eslint-plugin-react": "^7.32.1", |
85 | "eslint-plugin-react-hooks": "^4.6.0", | 85 | "eslint-plugin-react-hooks": "^4.6.0", |
86 | "html-minifier-terser": "^7.1.0", | 86 | "html-minifier-terser": "^7.1.0", |
87 | "micromatch": "^4.0.5", | 87 | "micromatch": "^4.0.5", |
88 | "prettier": "^2.8.1", | 88 | "prettier": "^2.8.3", |
89 | "typescript": "4.9.4", | 89 | "typescript": "4.9.4", |
90 | "vite": "^4.0.3", | 90 | "vite": "^4.0.4", |
91 | "vite-plugin-pwa": "^0.14.0", | 91 | "vite-plugin-pwa": "^0.14.1", |
92 | "workbox-window": "^6.5.4" | 92 | "workbox-window": "^6.5.4" |
93 | } | 93 | } |
94 | } | 94 | } |
diff --git a/subprojects/frontend/src/editor/EditorTheme.ts b/subprojects/frontend/src/editor/EditorTheme.ts index 3f2a3bff..01b65a7e 100644 --- a/subprojects/frontend/src/editor/EditorTheme.ts +++ b/subprojects/frontend/src/editor/EditorTheme.ts | |||
@@ -148,6 +148,7 @@ export default styled('div', { | |||
148 | '.cm-gutters': { | 148 | '.cm-gutters': { |
149 | background: theme.palette.background.default, | 149 | background: theme.palette.background.default, |
150 | border: 'none', | 150 | border: 'none', |
151 | marginRight: 1, | ||
151 | }, | 152 | }, |
152 | '.cm-content': { | 153 | '.cm-content': { |
153 | ...editorFontStyle, | 154 | ...editorFontStyle, |
@@ -161,6 +162,7 @@ export default styled('div', { | |||
161 | background: 'transparent', | 162 | background: 'transparent', |
162 | }, | 163 | }, |
163 | '.cm-cursor, .cm-cursor-primary': { | 164 | '.cm-cursor, .cm-cursor-primary': { |
165 | marginLeft: -1, | ||
164 | borderLeft: `2px solid ${theme.palette.info.main}`, | 166 | borderLeft: `2px solid ${theme.palette.info.main}`, |
165 | }, | 167 | }, |
166 | '.cm-selectionBackground': { | 168 | '.cm-selectionBackground': { |
@@ -450,11 +452,11 @@ export default styled('div', { | |||
450 | 452 | ||
451 | const foldStyle = { | 453 | const foldStyle = { |
452 | '.cm-foldGutter': { | 454 | '.cm-foldGutter': { |
453 | width: 18, | 455 | width: 17, |
454 | }, | 456 | }, |
455 | '.problem-editor-foldMarker': { | 457 | '.problem-editor-foldMarker': { |
456 | display: 'block', | 458 | display: 'block', |
457 | margin: '4px 2px 4px 0', | 459 | margin: '4px 1px 4px 0', |
458 | padding: 0, | 460 | padding: 0, |
459 | maskImage: svgURL(expandMoreSVG), | 461 | maskImage: svgURL(expandMoreSVG), |
460 | maskSize: '16px 16px', | 462 | maskSize: '16px 16px', |
@@ -465,7 +467,7 @@ export default styled('div', { | |||
465 | cursor: 'pointer', | 467 | cursor: 'pointer', |
466 | WebkitTapHighlightColor: 'transparent', | 468 | WebkitTapHighlightColor: 'transparent', |
467 | [theme.breakpoints.down('sm')]: { | 469 | [theme.breakpoints.down('sm')]: { |
468 | margin: '2px 2px 2px 0', | 470 | margin: '2px 1px 2px 0', |
469 | }, | 471 | }, |
470 | }, | 472 | }, |
471 | '.problem-editor-foldMarker-open': { | 473 | '.problem-editor-foldMarker-open': { |