Skip to content

Commit 22d313d

Browse files
committed
WOrk on editor
1 parent 3761780 commit 22d313d

File tree

3 files changed

+15
-89
lines changed

3 files changed

+15
-89
lines changed

src/assets/styles/e_header_footer.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
display: grid;
55
grid-template-rows: var(--header-height) 1fr;
66
height: 100vh;
7-
background: linear-gradient(135deg, var(--bg-primary) 0%, var(--bg-secondary) 100%);
7+
background: var(--bg-primary);
88
}
99
.main-content.sidebar-hidden { grid-template-columns: 0 1fr; }
1010

src/assets/styles/editor.css

Lines changed: 12 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -30,86 +30,34 @@ html, body {
3030
display: flex;
3131
flex: 1;
3232
overflow: hidden;
33-
position: relative;
34-
width: 100%;
35-
margin: 0;
36-
padding: 0;
37-
min-height: 0;
38-
flex-direction: row; /* added this line */
3933
}
4034

41-
.editor-container {
42-
flex: 1;
35+
.editor-area {
4336
display: flex;
4437
flex-direction: column;
45-
overflow: hidden;
46-
position: relative;
47-
}
48-
49-
/* CodeMirror 6 */
50-
.cm-editor {
5138
flex: 1;
52-
height: 100%;
53-
font-family: var(--font-mono);
54-
font-size: var(--editor-font-size);
55-
line-height: var(--editor-line-height);
39+
min-width: 0;
5640
background: var(--bg-primary);
57-
color: var(--text-primary);
58-
width: 100%;
59-
margin: 0;
60-
padding: 0;
61-
outline: none;
62-
}
63-
64-
.cm-editor.cm-focused {
65-
outline: none;
6641
}
6742

68-
.cm-scroller {
43+
.editor-container {
6944
flex: 1;
70-
height: 100%;
71-
overflow: auto;
72-
scrollbar-width: none; /* Firefox */
73-
-ms-overflow-style: none; /* IE and Edge */
45+
display: flex;
46+
flex-direction: column;
47+
overflow: hidden;
48+
position: relative;
49+
border-left: 1px solid var(--border-primary);
7450
}
7551

76-
.cm-scroller::-webkit-scrollbar {
52+
::-webkit-scrollbar {
7753
display: none;
78-
width: 0;
79-
height: 0;
8054
}
81-
82-
.cm-content {
83-
padding: var(--space-md) 0;
84-
min-height: 100%;
85-
}
86-
87-
.cm-gutters {
88-
background: var(--bg-secondary);
89-
border-right: 1px solid var(--border-primary);
90-
}
91-
92-
.cm-lineNumbers .cm-gutterElement {
93-
color: var(--text-muted);
94-
padding: 0 var(--space-sm);
95-
font-size: var(--text-sm);
55+
html {
56+
-ms-overflow-style: none;
57+
scrollbar-width: none;
9658
}
9759

9860

99-
100-
/* ===== EDITOR AREA ===== */
101-
.editor-area {
102-
display: flex;
103-
flex-direction: column;
104-
flex: 1;
105-
min-width: 0;
106-
margin: 0;
107-
padding: 0;
108-
background: var(--bg-primary);
109-
position: relative;
110-
overflow: hidden;
111-
}
112-
11361
.editor-toolbar {
11462
display: flex;
11563
align-items: center;
@@ -228,25 +176,7 @@ html, body {
228176
display: block;
229177
}
230178

231-
/* ===== CUSTOM SCROLLBAR ===== */
232-
::-webkit-scrollbar {
233-
width: var(--scrollbar-width);
234-
height: var(--scrollbar-width);
235-
}
236-
237-
::-webkit-scrollbar-track {
238-
background: var(--scrollbar-track);
239-
}
240179

241-
::-webkit-scrollbar-thumb {
242-
background: var(--scrollbar-thumb);
243-
border-radius: var(--radius-full);
244-
transition: var(--transition-colors);
245-
}
246-
247-
::-webkit-scrollbar-thumb:hover {
248-
background: var(--scrollbar-thumb-hover);
249-
}
250180

251181
.help-tabs {
252182
display: flex;

src/editor/editor_settings.js

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { javascript } from "@codemirror/lang-javascript";
55
import { defaultKeymap, indentWithTab } from "@codemirror/commands";
66
import { parseUserScriptMetadata } from '../utils/metadataParser.js';
77
import { autocompletion, closeBrackets } from "@codemirror/autocomplete";
8-
import { bracketMatching, foldGutter } from "@codemirror/language";
8+
import { bracketMatching } from "@codemirror/language";
99
import { linter, lintGutter } from "@codemirror/lint";
1010
import { showMinimap } from '@replit/codemirror-minimap';
1111
import { oneDark } from '@codemirror/theme-one-dark';
@@ -72,7 +72,7 @@ export class CodeEditorManager {
7272

7373
// Settings compartments
7474
this.tabSize.of(EditorState.tabSize.of(this.currentSettings.tabSize)),
75-
this.lineNumbers.of(this.currentSettings.lineNumbers ? [lineNumbers(), foldGutter(), gutter({class: "cm-gutters"})] : []),
75+
this.lineNumbers.of(this.currentSettings.lineNumbers ? [lineNumbers()] : []),
7676
this.lineWrapping.of(this.currentSettings.lineWrapping ? EditorView.lineWrapping : []),
7777
this.matchBrackets.of(this.currentSettings.matchBrackets ? bracketMatching() : []),
7878
this.minimap.of(this.currentSettings.minimap ? showMinimap.compute(['doc'], () => {
@@ -233,10 +233,6 @@ export class CodeEditorManager {
233233
if (settings.tabSize) {
234234
effects.push(this.tabSize.reconfigure(EditorState.tabSize.of(settings.tabSize)));
235235
}
236-
237-
if (settings.lineNumbers !== undefined) {
238-
effects.push(this.lineNumbers.reconfigure(settings.lineNumbers ? [lineNumbers(), foldGutter(), gutter({class: "cm-gutters"})] : []));
239-
}
240236

241237
if (settings.lineWrapping !== undefined) {
242238
effects.push(this.lineWrapping.reconfigure(settings.lineWrapping ? EditorView.lineWrapping : []));

0 commit comments

Comments
 (0)