Skip to content

Commit 98e2c86

Browse files
committed
fix sidebar formatting
1 parent e41db47 commit 98e2c86

File tree

2 files changed

+62
-51
lines changed

2 files changed

+62
-51
lines changed

app/styles/main.css

Lines changed: 60 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -275,6 +275,7 @@
275275
}
276276

277277
@layer components {
278+
/* TODO RR7: do I need this? */
278279
/* @import "./_typography.css"; */
279280

280281
body {
@@ -305,167 +306,175 @@
305306
color: inherit;
306307
}
307308

309+
.ͼ2 {
310+
.cm-gutters-before {
311+
background-color: inherit;
312+
}
313+
.cm-gutters {
314+
background-color: none !important;
315+
}
316+
308317
.cm-gutters .errors {
309-
/*@apply bg-white text-red-500;*/
318+
@apply bg-white text-red-500;
310319
@apply w-6;
311320
background-color: inherit;
312321
}
313322

314-
/*.cm-scroller {*/
315-
/*min-height: 40vh;*/
316-
/*}*/
323+
.cm-scroller {
324+
min-height: 40vh;
325+
}
317326

318-
.cm-s-material.mc-editor {
319-
/*background-color: #263238;*/
327+
.mc-editor {
328+
background-color: #263238;
320329
@apply font-mono;
321330
/*py-8;*/
322331
}
323332

324-
.cm-s-material .cm-gutters {
325-
/*@apply text-gray-80;*/
333+
.cm-gutters {
334+
@apply text-gray-80;
326335
border: none;
327336
background-color: inherit;
328337
color: inherit;
329338
}
330339

331-
/*.CodeMirror pre.cm-line,*/
332-
/*.CodeMirror pre.cm-line-like {*/
333-
/*}*/
340+
.CodeMirror pre.cm-line,
341+
.CodeMirror pre.cm-line-like {
342+
}
334343

335-
.cm-s-material .cm-guttermarker,
336-
.cm-s-material .cm-guttermarker-subtle,
337-
.cm-s-material .cm-linenumber {
344+
.cm-guttermarker,
345+
.cm-guttermarker-subtle,
346+
.cm-linenumber {
338347
@apply text-gray-80;
339348
}
340349

341-
.cm-s-material .cm-cursor {
350+
.cm-cursor {
342351
border-left: 1px solid #ffcc00;
343352
}
344353

345-
.cm-s-material div.cm-selected {
354+
div.cm-selected {
346355
background: rgba(128, 203, 196, 0.2);
347356
}
348357

349-
.cm-s-material.cm-focused div.cm-selected {
358+
.cm-focused div.cm-selected {
350359
background: rgba(128, 203, 196, 0.2);
351360
}
352361

353-
.cm-s-material .cm-line::selection,
354-
.cm-s-material .cm-line > span::selection,
355-
.cm-s-material .cm-line > span > span::selection {
362+
.cm-line::selection,
363+
.cm-line > span::selection,
364+
.cm-line > span > span::selection {
356365
background: rgba(128, 203, 196, 0.2);
357366
}
358367

359-
.cm-s-material .cm-line::-moz-selection,
360-
.cm-s-material .cm-line > span::-moz-selection,
361-
.cm-s-material .cm-line > span > span::-moz-selection {
368+
.cm-line::-moz-selection,
369+
.cm-line > span::-moz-selection,
370+
.cm-line > span > span::-moz-selection {
362371
background: rgba(128, 203, 196, 0.2);
363372
}
364373

365-
.cm-s-material .cm-activeline-background {
374+
.cm-activeline-background {
366375
background: rgba(0, 0, 0, 0.5);
367376
}
368377

369-
.cm-s-material .cm-keyword {
378+
.cm-keyword {
370379
@apply text-berry-dark-50;
371380
}
372381

373-
.cm-s-material .cm-keyword2 {
382+
.cm-keyword2 {
374383
@apply text-water-dark;
375384
}
376385

377-
.cm-s-material .cm-variant-constructor {
386+
.cm-variant-constructor {
378387
@apply text-orange-dark;
379388
}
380389

381-
.cm-s-material .cm-module {
390+
.cm-module {
382391
@apply text-water-dark;
383392
}
384393

385-
.cm-s-material .cm-operator {
394+
.cm-operator {
386395
@apply text-berry-dark-50;
387396
}
388397

389-
.cm-s-material .cm-variable-2 {
398+
.cm-variable-2 {
390399
color: #eeffff;
391400
}
392401

393-
.cm-s-material .cm-variable-3,
394-
.cm-s-material .cm-type {
402+
.cm-variable-3,
403+
.cm-type {
395404
color: #f07178;
396405
}
397406

398-
.cm-s-material .cm-builtin {
407+
.cm-builtin {
399408
@apply text-orange-dark;
400409
}
401410

402-
.cm-s-material .cm-decorator {
411+
.cm-decorator {
403412
@apply text-water-dark;
404413
}
405414

406-
.cm-s-material .cm-type-annotation {
415+
.cm-type-annotation {
407416
@apply text-gray-40;
408417
}
409418

410-
.cm-s-material .cm-atom {
419+
.cm-atom {
411420
@apply text-orange-dark;
412421
}
413422

414-
.cm-s-material .cm-number {
423+
.cm-number {
415424
@apply text-turtle-dark;
416425
}
417426

418-
.cm-s-material .cm-def {
427+
.cm-def {
419428
@apply text-gray-30;
420429
}
421430

422-
.cm-s-material .cm-string {
431+
.cm-string {
423432
@apply text-turtle-dark;
424433
}
425434

426-
.cm-s-material .cm-string-2 {
435+
.cm-string-2 {
427436
@apply text-turtle-dark;
428437
}
429438

430-
.cm-s-material .cm-comment {
439+
.cm-comment {
431440
@apply text-gray-60;
432441
}
433442

434-
.cm-s-material .cm-variable {
443+
.cm-variable {
435444
@apply text-gray-30;
436445
}
437446

438447
.cm-tag {
439448
color: #ff5370;
440449
}
441450

442-
.cm-s-material .cm-meta {
451+
.cm-meta {
443452
color: #ffcb6b;
444453
}
445454

446-
.cm-s-material .cm-attribute {
455+
.cm-attribute {
447456
color: #c792ea;
448457
}
449458

450-
.cm-s-material .cm-property {
459+
.cm-property {
451460
color: #c792ea;
452461
}
453462

454-
.cm-s-material .cm-qualifier {
463+
.cm-qualifier {
455464
color: #decb6b;
456465
}
457466

458-
.cm-s-material .cm-variable-3,
459-
.cm-s-material .cm-type {
467+
.cm-variable-3,
468+
.cm-type {
460469
color: #decb6b;
461470
}
462471

463-
.cm-s-material .cm-error {
472+
.cm-error {
464473
color: rgba(255, 255, 255, 1);
465474
background-color: #ff5370;
466475
}
467476

468-
.cm-s-material .cm-matchingbracket {
477+
.cm-matchingbracket {
469478
text-decoration: underline;
470479
color: white !important;
471480
}
@@ -549,7 +558,7 @@
549558
right: 0;
550559
width: 100%;
551560
}
552-
561+
}
553562
.wrapper {
554563
position: relative;
555564
display: inline-block;

src/components/CodeMirror.res

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -329,6 +329,8 @@ let createEditor = (config: editorConfig): editorInstance => {
329329
| _ => CM6.JavaScript.javascript()
330330
}
331331

332+
Console.log(language)
333+
332334
// Setup compartments for dynamic config
333335
let languageConf = CM6.Compartment.create()
334336
let readOnlyConf = CM6.Compartment.create()

0 commit comments

Comments
 (0)