Skip to content

Commit e9df060

Browse files
committed
White theme syntax highlighting improvements
1 parent 74a1ff8 commit e9df060

File tree

4 files changed

+39
-59
lines changed

4 files changed

+39
-59
lines changed

web/ec.config.mjs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ const hybridLightTheme = {
3232

3333
export default {
3434
themes: [hybridDarkTheme, hybridLightTheme],
35+
minSyntaxHighlightingColorContrast: 4.5,
3536
shiki: {
3637
langs: [
3738
{

web/src/styles/custom.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
--color-type-shared: rgba(47, 135, 212, 1);
44
--color-type-shared-background: rgba(117, 117, 255, 0.05);
55
--color-type-shared-background-high: rgba(117, 117, 255, 0.5);
6-
--color-type-client: rgba(255, 50, 50, 1);
6+
--color-type-client: rgba(221, 91, 91, 1);
77
--color-type-client-background: rgba(255, 50, 50, 0.05);
88
--color-type-client-background-high: rgba(255, 50, 50, 0.5);
99
--color-type-server: rgba(212, 154, 47, 1);

web/src/themes/mtasa_lua-theme_dark.json

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -197,13 +197,6 @@
197197
"foreground": "#d7ba7d"
198198
}
199199
},
200-
{
201-
"scope": "entity.name.class.lua",
202-
"settings": {
203-
"foreground": "#4ec9b0",
204-
"fontStyle": "bold"
205-
}
206-
},
207200
{
208201
"scope": "entity.other.attribute.lua",
209202
"settings": {

web/src/themes/mtasa_lua-theme_light.json

Lines changed: 37 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,21 @@
33
"type": "light",
44
"colors": {
55
"editor.foreground": "#333333",
6-
"editor.background": "#fafafa"
6+
"editor.background": "#DDD"
77
},
88

99
"tokenColors": [
1010
{
1111
"scope": "support.function",
1212
"settings": {
13-
"foreground": "#16f756",
13+
"foreground": "#3f9d87",
1414
"fontStyle": "bold"
1515
}
1616
},
1717
{
1818
"scope": "entity.name.function.lua",
1919
"settings": {
20-
"foreground": "#16f756",
20+
"foreground": "#3f9d87",
2121
"fontStyle": "bold"
2222
}
2323
},
@@ -31,7 +31,7 @@
3131
{
3232
"scope": "support.function.mta-server",
3333
"settings": {
34-
"foreground": "#db9c42",
34+
"foreground": "#FFA000",
3535
"fontStyle": "bold"
3636
}
3737
},
@@ -46,15 +46,15 @@
4646
{
4747
"scope": "keyword.mta",
4848
"settings": {
49-
"foreground": "#6edb9a",
49+
"foreground": "#0aa9aa",
5050
"fontStyle": "bold"
5151
}
5252
},
5353

5454
{
5555
"scope": "meta.function.lua",
5656
"settings": {
57-
"foreground": "#16f756"
57+
"foreground": "#3f9d87"
5858
}
5959
},
6060
{
@@ -72,26 +72,26 @@
7272
{
7373
"scope": "meta.parameter.lua",
7474
"settings": {
75-
"foreground": "#4a90e2"
75+
"foreground": "#4ab3d1"
7676
}
7777
},
7878
{
7979
"scope": "variable.parameter.function.lua",
8080
"settings": {
81-
"foreground": "#4a90e2",
81+
"foreground": "#4ab3d1",
8282
"fontStyle": "italic"
8383
}
8484
},
8585
{
8686
"scope": "punctuation.separator.arguments.lua",
8787
"settings": {
88-
"foreground": "#333333"
88+
"foreground": "#e4b849"
8989
}
9090
},
9191
{
9292
"scope": "entity.name.class.lua",
9393
"settings": {
94-
"foreground": "#3a9f8a",
94+
"foreground": "#334ebb",
9595
"fontStyle": "bold"
9696
}
9797
},
@@ -103,27 +103,27 @@
103103
"constant.numeric.integer.lua"
104104
],
105105
"settings": {
106-
"foreground": "#6a8f6b",
106+
"foreground": "#e49f4d",
107107
"fontStyle": ""
108108
}
109109
},
110110
{
111111
"scope": "string.lua",
112112
"settings": {
113-
"foreground": "#a67c32"
113+
"foreground": "#080"
114114
}
115115
},
116116
{
117117
"scope": "comment.line.shebang.lua",
118118
"settings": {
119-
"foreground": "#4a7a32",
119+
"foreground": "#6f6f6e",
120120
"fontStyle": "italic"
121121
}
122122
},
123123
{
124124
"scope": "comment.lua",
125125
"settings": {
126-
"foreground": "#4a7a32",
126+
"foreground": "#6f6f6e",
127127
"fontStyle": "italic"
128128
}
129129
},
@@ -137,53 +137,53 @@
137137
{
138138
"scope": "string.tag.lua",
139139
"settings": {
140-
"foreground": "#f01adb"
140+
"foreground": "#a974bf"
141141
}
142142
},
143143
{
144144
"scope": "storage.type.attribute.lua",
145145
"settings": {
146-
"foreground": "#3a9f8a"
146+
"foreground": "#2610bf"
147147
}
148148
},
149149
{
150150
"scope": "storage.type.generic.lua",
151151
"settings": {
152-
"foreground": "#4a90e2"
152+
"foreground": "#b912a5"
153153
}
154154
},
155155
{
156156
"scope": "keyword.control.lua",
157157
"settings": {
158-
"foreground": "#f01adb",
158+
"foreground": "#a974bf",
159159
"fontStyle": "bold"
160160
}
161161
},
162162
{
163163
"scope": "keyword.local.lua",
164164
"settings": {
165-
"foreground": "#f01adb",
165+
"foreground": "#a974bf",
166166
"fontStyle": "bold"
167167
}
168168
},
169169
{
170170
"scope": "constant.language.lua",
171171
"settings": {
172-
"foreground": "#a83259",
172+
"foreground": "#c6555f",
173173
"fontStyle": "italic"
174174
}
175175
},
176176
{
177177
"scope": "variable.language.self.lua",
178178
"settings": {
179-
"foreground": "#4a90e2",
179+
"foreground": "#c6555f",
180180
"fontStyle": "italic"
181181
}
182182
},
183183
{
184184
"scope": "entity.name.tag.lua",
185185
"settings": {
186-
"foreground": "#f01adb",
186+
"foreground": "#a974bf",
187187
"fontStyle": "bold"
188188
}
189189
},
@@ -193,24 +193,10 @@
193193
"foreground": "#a67c32"
194194
}
195195
},
196-
{
197-
"scope": "keyword.operator.lua",
198-
"settings": {
199-
"foreground": "#f01adb",
200-
"fontStyle": "bold"
201-
}
202-
},
203-
{
204-
"scope": "entity.name.class.lua",
205-
"settings": {
206-
"foreground": "#3a9f8a",
207-
"fontStyle": "bold"
208-
}
209-
},
210196
{
211197
"scope": "entity.other.attribute.lua",
212198
"settings": {
213-
"foreground": "#4a90e2"
199+
"foreground": "#4ab3d1"
214200
}
215201
},
216202
{
@@ -222,46 +208,46 @@
222208
{
223209
"scope": "keyword.operator.lua",
224210
"settings": {
225-
"foreground": "#f01adb"
211+
"foreground": "#d46f4e"
226212
}
227213
},
228214
{
229215
"scope": "punctuation.whitespace.comment.leading.lua",
230216
"settings": {
231-
"foreground": "#4a7a32"
217+
"foreground": "#6f6f6e"
232218
}
233219
},
234220
{
235221
"scope": "punctuation.whitespace.comment.trailing.lua",
236222
"settings": {
237-
"foreground": "#4a7a32"
223+
"foreground": "#6f6f6e"
238224
}
239225
},
240226
{
241227
"scope": "punctuation.definition.comment.begin.lua",
242228
"settings": {
243-
"foreground": "#4a7a20",
229+
"foreground": "#6f6f6e",
244230
"fontStyle": "bold"
245231
}
246232
},
247233
{
248234
"scope": "punctuation.definition.comment.end.lua",
249235
"settings": {
250-
"foreground": "#4a7a20",
236+
"foreground": "#6f6f6e",
251237
"fontStyle": "bold"
252238
}
253239
},
254240
{
255241
"scope": "comment.block.lua",
256242
"settings": {
257-
"foreground": "#4a7a32",
243+
"foreground": "#6f6f6e",
258244
"fontStyle": "italic"
259245
}
260246
},
261247
{
262248
"scope": "comment.line.double-dash.lua",
263249
"settings": {
264-
"foreground": "#4a7a32"
250+
"foreground": "#6f6f6e"
265251
}
266252
},
267253
{
@@ -287,13 +273,13 @@
287273
{
288274
"scope": "support.type.lua",
289275
"settings": {
290-
"foreground": "#4a90e2"
276+
"foreground": "#4ab3d1"
291277
}
292278
},
293279
{
294280
"scope": "entity.name.variable.lua",
295281
"settings": {
296-
"foreground": "#4a90e2"
282+
"foreground": "#4ab3d1"
297283
}
298284
},
299285
{
@@ -349,31 +335,31 @@
349335
{
350336
"scope": "string.quoted.single.lua",
351337
"settings": {
352-
"foreground": "#67994d"
338+
"foreground": "#7fb078"
353339
}
354340
},
355341
{
356342
"scope": "string.quoted.double.lua",
357343
"settings": {
358-
"foreground": "#67994d"
344+
"foreground": "#7fb078"
359345
}
360346
},
361347
{
362348
"scope": "string.quoted.other.multiline.lua",
363349
"settings": {
364-
"foreground": "#67994d"
350+
"foreground": "#7fb078"
365351
}
366352
},
367353
{
368354
"scope": "punctuation.definition.string.begin.lua",
369355
"settings": {
370-
"foreground": "#a37543"
356+
"foreground": "#389c9c"
371357
}
372358
},
373359
{
374360
"scope": "punctuation.definition.string.end.lua",
375361
"settings": {
376-
"foreground": "#a37543"
362+
"foreground": "#389c9c"
377363
}
378364
},
379365
{

0 commit comments

Comments
 (0)