Frontend color changes

4 files changed, 21 insertions, 10 deletions

diff --git a/language-web/src/main/css/index.scss b/language-web/src/main/css/index.scss
index 21a9c05b..9d6e0f6a 100644
--- a/language-web/src/main/css/index.scss
+++ b/language-web/src/main/css/index.scss
@@ -94,6 +94,11 @@ body {
       color: map.get($theme, 'delimiter');
     }
 
+    .cm-comment {
+      color: map.get($theme, 'comment');
+      font-style: italic;
+    }
+
     .problem-predicate, .problem-class, .problem-reference, .problem-enum {
       color: map.get($theme, 'predicate');
     }
diff --git a/language-web/src/main/css/themes.scss b/language-web/src/main/css/themes.scss
index 0118290d..a30f1de3 100644
--- a/language-web/src/main/css/themes.scss
+++ b/language-web/src/main/css/themes.scss
@@ -1,8 +1,8 @@
 $themes: (
   'dark': (
     'foreground': #abb2bf,
-    'background': #282c34,
-    'paper': #21252b,
+    'foregroundHighlight': #eeffff,
+    'background': #212121,
     'primary': #56b6c2,
     'secondary': #ff5370,
     'keyword': #56b6c2,
@@ -10,11 +10,12 @@ $themes: (
     'variable': #c8ae9d,
     'uniqueNode': #d6e9ff,
     'number': #6e88a6,
-    'delimiter': #6f7682,
+    'delimiter': #707787,
+    'comment': #5c6370,
     'cursor': #56b6c2,
     'selection': #3e4452,
-    'currentLine': #2c323c,
-    'lineNumber': #5c6340,
+    'currentLine': rgba(0, 0, 0, 0.2),
+    'lineNumber': #5c6370,
   ),
   'light': (
     'foreground': #abb2bf,
@@ -27,10 +28,11 @@ $themes: (
     'variable': #c8ae9d,
     'uniqueNode': #d6e9ff,
     'number': #6e88a6,
-    'delimiter': #6f7682,
+    'delimiter': #56606d,
+    'comment': #55606d,
     'cursor': #f3efe7,
     'selection': #3e4452,
     'currentLine': #2c323c,
-    'lineNumber': #5c6340,
+    'lineNumber': #5c6370,
   ),
 );
diff --git a/language-web/src/main/js/theme/EditorTheme.ts b/language-web/src/main/js/theme/EditorTheme.ts
index 9420dafa..957f2426 100644
--- a/language-web/src/main/js/theme/EditorTheme.ts
+++ b/language-web/src/main/js/theme/EditorTheme.ts
@@ -16,9 +16,9 @@ export class EditorThemeData {
 
   foreground!: string;
 
-  background!: string;
+  foregroundHighlight!: string;
 
-  paper!: string;
+  background!: string;
 
   primary!: string;
 
diff --git a/language-web/src/main/js/theme/ThemeStore.ts b/language-web/src/main/js/theme/ThemeStore.ts
index 0f283c98..0e4aeb23 100644
--- a/language-web/src/main/js/theme/ThemeStore.ts
+++ b/language-web/src/main/js/theme/ThemeStore.ts
@@ -34,7 +34,7 @@ export class ThemeStore {
         mode: themeData.paletteMode,
         background: {
           default: themeData.background,
-          paper: themeData.paper,
+          paper: themeData.background,
         },
         primary: {
           main: themeData.primary,
@@ -42,6 +42,10 @@ export class ThemeStore {
         secondary: {
           main: themeData.secondary,
         },
+        text: {
+          primary: themeData.foregroundHighlight,
+          secondary: themeData.foreground,
+        },
       },
     });
     return responsiveFontSizes(materialUiTheme);