Skip to content

Commit 206f178

Browse files
haraldschillyharaldschilly
committed
Merge remote-tracking branch 'origin/master' into cocalc-api-20250927
2 parents 9f74c33 + d02f60c commit 206f178

File tree

140 files changed

+7779
-2354
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

140 files changed

+7779
-2354
lines changed

‎src/.claude/settings.json‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
"Bash(../node_modules/.bin/tsc:*)",
55
"Bash(NODE_OPTIONS=--max-old-space-size=8192 ../node_modules/.bin/tsc --noEmit)",
66
"Bash(bash:*)",
7+
"Bash(cat:*)",
78
"Bash(chmod:*)",
89
"Bash(coffee:*)",
910
"Bash(curl:*)",
@@ -15,8 +16,10 @@
1516
"Bash(git branch:*)",
1617
"Bash(git checkout:*)",
1718
"Bash(git commit:*)",
19+
"Bash(git diff:*)",
1820
"Bash(git push:*)",
1921
"Bash(grep:*)",
22+
"Bash(ln:*)",
2023
"Bash(make:*)",
2124
"Bash(node:*)",
2225
"Bash(npm show:*)",
@@ -30,11 +33,12 @@
3033
"Bash(pnpm build:*)",
3134
"Bash(pnpm exec tsc:*)",
3235
"Bash(pnpm i18n:*)",
36+
"Bash(pnpm i18n:*:*)",
3337
"Bash(pnpm i18n:compile:*)",
3438
"Bash(pnpm i18n:download:*)",
3539
"Bash(pnpm i18n:extract:*)",
3640
"Bash(pnpm i18n:upload:*)",
37-
"Bash(pnpm i18n:*:*)",
41+
"Bash(pnpm i18n:update:*)",
3842
"Bash(pnpm info:*)",
3943
"Bash(pnpm list:*)",
4044
"Bash(pnpm remove:*)",
@@ -48,8 +52,12 @@
4852
"Bash(prettier -w:*)",
4953
"Bash(psql:*)",
5054
"Bash(python3:*)",
55+
<<<<<<< HEAD
5156
"Bash(uv:*)",
5257
"Bash(timeout:*)",
58+
=======
59+
"Bash(uv sync:*)",
60+
>>>>>>> origin/master
5361
"WebFetch",
5462
"WebSearch",
5563
"mcp__cclsp__find_definition",

‎src/packages/cdn/cm-custom-theme/cocalc-dark.css‎

Lines changed: 118 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,118 @@
1+
/*
2+
* This file is part of CoCalc: Copyright © 2025 Sagemath, Inc.
3+
* License: MS-RSL – see LICENSE.md for details
4+
*
5+
* CoCalc Dark theme for CodeMirror
6+
* Based on CoCalc's dark color scheme
7+
*/
8+
9+
.cm-s-cocalc-dark.CodeMirror {
10+
background: #434343;
11+
color: #c0d4f0;
12+
}
13+
14+
.cm-s-cocalc-dark div.CodeMirror-selected {
15+
background: #5a5a5a;
16+
}
17+
18+
.cm-s-cocalc-dark .CodeMirror-line::selection,
19+
.cm-s-cocalc-dark .CodeMirror-line > span::selection,
20+
.cm-s-cocalc-dark .CodeMirror-line > span > span::selection {
21+
background: #5a5a5a;
22+
}
23+
24+
.cm-s-cocalc-dark .CodeMirror-line::-moz-selection,
25+
.cm-s-cocalc-dark .CodeMirror-line > span::-moz-selection,
26+
.cm-s-cocalc-dark .CodeMirror-line > span > span::-moz-selection {
27+
background: #5a5a5a;
28+
}
29+
30+
.cm-s-cocalc-dark .CodeMirror-gutters {
31+
background: #3a3a3a;
32+
border-right: 1px solid #505050;
33+
}
34+
35+
.cm-s-cocalc-dark .CodeMirror-guttermarker {
36+
color: #ff9966;
37+
}
38+
39+
.cm-s-cocalc-dark .CodeMirror-guttermarker-subtle {
40+
color: #707070;
41+
}
42+
43+
.cm-s-cocalc-dark .CodeMirror-linenumber {
44+
color: #808080;
45+
}
46+
47+
.cm-s-cocalc-dark .CodeMirror-cursor {
48+
border-left: 1px solid #c0d4f0;
49+
}
50+
51+
.cm-s-cocalc-dark span.cm-comment {
52+
color: #909090;
53+
font-style: italic;
54+
}
55+
56+
.cm-s-cocalc-dark span.cm-atom {
57+
color: #ffb380;
58+
}
59+
60+
.cm-s-cocalc-dark span.cm-number {
61+
color: #ffb380;
62+
}
63+
64+
.cm-s-cocalc-dark span.cm-property,
65+
.cm-s-cocalc-dark span.cm-attribute {
66+
color: #c0d4f0;
67+
}
68+
69+
.cm-s-cocalc-dark span.cm-keyword {
70+
color: #ff9966;
71+
}
72+
73+
.cm-s-cocalc-dark span.cm-string {
74+
color: #88c070;
75+
}
76+
77+
.cm-s-cocalc-dark span.cm-variable {
78+
color: #c0d4f0;
79+
}
80+
81+
.cm-s-cocalc-dark span.cm-variable-2 {
82+
color: #80afff;
83+
}
84+
85+
.cm-s-cocalc-dark span.cm-def {
86+
color: #b89dd8;
87+
}
88+
89+
.cm-s-cocalc-dark span.cm-bracket {
90+
color: #c0d4f0;
91+
}
92+
93+
.cm-s-cocalc-dark span.cm-tag {
94+
color: #66cccc;
95+
}
96+
97+
.cm-s-cocalc-dark span.cm-link {
98+
color: #80afff;
99+
}
100+
101+
.cm-s-cocalc-dark span.cm-error {
102+
background: #ff9966;
103+
color: #1a1a1a;
104+
}
105+
106+
.cm-s-cocalc-dark .CodeMirror-activeline-background {
107+
background: #4a4a4a;
108+
}
109+
110+
.cm-s-cocalc-dark .CodeMirror-matchingbracket {
111+
color: #434343 !important;
112+
background-color: #80afff !important;
113+
}
114+
115+
.cm-s-cocalc-dark .CodeMirror-nonmatchingbracket {
116+
color: #434343 !important;
117+
background-color: #ff9966 !important;
118+
}

‎src/packages/cdn/cm-custom-theme/cocalc-light.css‎

Lines changed: 118 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,118 @@
1+
/*
2+
* This file is part of CoCalc: Copyright © 2025 Sagemath, Inc.
3+
* License: MS-RSL – see LICENSE.md for details
4+
*
5+
* CoCalc Light theme for CodeMirror
6+
* Based on CoCalc's light color scheme with strong contrast
7+
*/
8+
9+
.cm-s-cocalc-light.CodeMirror {
10+
background: #fbfbfb;
11+
color: #1a3a6b;
12+
}
13+
14+
.cm-s-cocalc-light div.CodeMirror-selected {
15+
background: #d9e8f5;
16+
}
17+
18+
.cm-s-cocalc-light .CodeMirror-line::selection,
19+
.cm-s-cocalc-light .CodeMirror-line > span::selection,
20+
.cm-s-cocalc-light .CodeMirror-line > span > span::selection {
21+
background: #d9e8f5;
22+
}
23+
24+
.cm-s-cocalc-light .CodeMirror-line::-moz-selection,
25+
.cm-s-cocalc-light .CodeMirror-line > span::-moz-selection,
26+
.cm-s-cocalc-light .CodeMirror-line > span > span::-moz-selection {
27+
background: #d9e8f5;
28+
}
29+
30+
.cm-s-cocalc-light .CodeMirror-gutters {
31+
background: #fbfbfb;
32+
border-right: 1px solid #e0e0e0;
33+
}
34+
35+
.cm-s-cocalc-light .CodeMirror-guttermarker {
36+
color: #c41c08;
37+
}
38+
39+
.cm-s-cocalc-light .CodeMirror-guttermarker-subtle {
40+
color: #b0b0b0;
41+
}
42+
43+
.cm-s-cocalc-light .CodeMirror-linenumber {
44+
color: #999999;
45+
}
46+
47+
.cm-s-cocalc-light .CodeMirror-cursor {
48+
border-left: 1px solid #1a3a6b;
49+
}
50+
51+
.cm-s-cocalc-light span.cm-comment {
52+
color: #7a7a7a;
53+
font-style: italic;
54+
}
55+
56+
.cm-s-cocalc-light span.cm-atom {
57+
color: #e65100;
58+
}
59+
60+
.cm-s-cocalc-light span.cm-number {
61+
color: #e65100;
62+
}
63+
64+
.cm-s-cocalc-light span.cm-property,
65+
.cm-s-cocalc-light span.cm-attribute {
66+
color: #1a3a6b;
67+
}
68+
69+
.cm-s-cocalc-light span.cm-keyword {
70+
color: #c41c08;
71+
}
72+
73+
.cm-s-cocalc-light span.cm-string {
74+
color: #3d6b2f;
75+
}
76+
77+
.cm-s-cocalc-light span.cm-variable {
78+
color: #1a3a6b;
79+
}
80+
81+
.cm-s-cocalc-light span.cm-variable-2 {
82+
color: #2a5aa6;
83+
}
84+
85+
.cm-s-cocalc-light span.cm-def {
86+
color: #663d99;
87+
}
88+
89+
.cm-s-cocalc-light span.cm-bracket {
90+
color: #1a3a6b;
91+
}
92+
93+
.cm-s-cocalc-light span.cm-tag {
94+
color: #0088a0;
95+
}
96+
97+
.cm-s-cocalc-light span.cm-link {
98+
color: #2a5aa6;
99+
}
100+
101+
.cm-s-cocalc-light span.cm-error {
102+
background: #c41c08;
103+
color: #fbfbfb;
104+
}
105+
106+
.cm-s-cocalc-light .CodeMirror-activeline-background {
107+
background: #f0f5fa;
108+
}
109+
110+
.cm-s-cocalc-light .CodeMirror-matchingbracket {
111+
color: #fbfbfb !important;
112+
background-color: #2a5aa6 !important;
113+
}
114+
115+
.cm-s-cocalc-light .CodeMirror-nonmatchingbracket {
116+
color: #fbfbfb !important;
117+
background-color: #c41c08 !important;
118+
}

‎src/packages/cdn/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
},
1414
"scripts": {
1515
"clean": "rm -rf build node_modules dist",
16-
"build": "rm -rf build dist && mkdir build && cp -rv *.json *.py *.js build/ && cd build && npm ci && mkdir dist && ./setup.py && mv dist .. && cd .. && rm -rf build ",
16+
"build": "rm -rf build dist && mkdir build && cp -rv *.json *.py *.js build/ && cp -rv cm-custom-theme build/ && cd build && npm ci && mkdir dist && ./setup.py && mv dist .. && cd .. && rm -rf build ",
1717
"postinstall": "./postinstall.js",
1818
"test": "../node_modules/.bin/jest",
1919
"prepublishOnly": "npm test"

‎src/packages/cdn/setup.py‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,13 @@
4141
os.symlink(name, dst)
4242
versions[name] = version
4343

44+
# copy custom codemirror themes
45+
custom_themes_src = join("..", "cm-custom-theme")
46+
if exists(custom_themes_src):
47+
custom_themes_dst = "cm-custom-theme"
48+
copytree(custom_themes_src, custom_themes_dst)
49+
print(f"copied custom themes from '{custom_themes_src}' to '{custom_themes_dst}'")
50+
4451
# finally, write the version info such that it can be loaded
4552
with open('index.js', 'w') as out:
4653
out.write(f"""

‎src/packages/comm/x11-apps.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
* License: MS-RSL – see LICENSE.md for details
44
*/
55

6-
//import { IconName } from "@cocalc/frontend/components/icon";
76
import { R_IDE } from "@cocalc/util/consts/ui";
87

98
type App = {

‎src/packages/frontend/_project_page.sass‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,3 +61,7 @@ dl.cc-project-settings-features
6161
padding: 5px !important
6262
code
6363
font-size: 90%
64+
65+
.cc-project-expanded-row
66+
.ant-table-expanded-row-cell
67+
padding: 0 !important

0 commit comments

Comments
 (0)