diff options
author | Kristóf Marussy <marussy@mit.bme.hu> | 2021-09-19 18:24:52 +0200 |
---|---|---|
committer | Kristóf Marussy <marussy@mit.bme.hu> | 2021-09-19 18:24:52 +0200 |
commit | c8325e6e1a31598a4d4dc6a29834fdaefcb31181 (patch) | |
tree | 2bb1eee700e4185bb95ecfa8ceb0ca9fa8753e21 | |
parent | Frontend color theme (diff) | |
download | refinery-c8325e6e1a31598a4d4dc6a29834fdaefcb31181.tar.gz refinery-c8325e6e1a31598a4d4dc6a29834fdaefcb31181.tar.zst refinery-c8325e6e1a31598a4d4dc6a29834fdaefcb31181.zip |
Frontend color changes
-rw-r--r-- | language-web/src/main/css/index.scss | 5 | ||||
-rw-r--r-- | language-web/src/main/css/themes.scss | 16 | ||||
-rw-r--r-- | language-web/src/main/js/theme/EditorTheme.ts | 4 | ||||
-rw-r--r-- | language-web/src/main/js/theme/ThemeStore.ts | 6 |
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 { | |||
94 | color: map.get($theme, 'delimiter'); | 94 | color: map.get($theme, 'delimiter'); |
95 | } | 95 | } |
96 | 96 | ||
97 | .cm-comment { | ||
98 | color: map.get($theme, 'comment'); | ||
99 | font-style: italic; | ||
100 | } | ||
101 | |||
97 | .problem-predicate, .problem-class, .problem-reference, .problem-enum { | 102 | .problem-predicate, .problem-class, .problem-reference, .problem-enum { |
98 | color: map.get($theme, 'predicate'); | 103 | color: map.get($theme, 'predicate'); |
99 | } | 104 | } |
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 @@ | |||
1 | $themes: ( | 1 | $themes: ( |
2 | 'dark': ( | 2 | 'dark': ( |
3 | 'foreground': #abb2bf, | 3 | 'foreground': #abb2bf, |
4 | 'background': #282c34, | 4 | 'foregroundHighlight': #eeffff, |
5 | 'paper': #21252b, | 5 | 'background': #212121, |
6 | 'primary': #56b6c2, | 6 | 'primary': #56b6c2, |
7 | 'secondary': #ff5370, | 7 | 'secondary': #ff5370, |
8 | 'keyword': #56b6c2, | 8 | 'keyword': #56b6c2, |
@@ -10,11 +10,12 @@ $themes: ( | |||
10 | 'variable': #c8ae9d, | 10 | 'variable': #c8ae9d, |
11 | 'uniqueNode': #d6e9ff, | 11 | 'uniqueNode': #d6e9ff, |
12 | 'number': #6e88a6, | 12 | 'number': #6e88a6, |
13 | 'delimiter': #6f7682, | 13 | 'delimiter': #707787, |
14 | 'comment': #5c6370, | ||
14 | 'cursor': #56b6c2, | 15 | 'cursor': #56b6c2, |
15 | 'selection': #3e4452, | 16 | 'selection': #3e4452, |
16 | 'currentLine': #2c323c, | 17 | 'currentLine': rgba(0, 0, 0, 0.2), |
17 | 'lineNumber': #5c6340, | 18 | 'lineNumber': #5c6370, |
18 | ), | 19 | ), |
19 | 'light': ( | 20 | 'light': ( |
20 | 'foreground': #abb2bf, | 21 | 'foreground': #abb2bf, |
@@ -27,10 +28,11 @@ $themes: ( | |||
27 | 'variable': #c8ae9d, | 28 | 'variable': #c8ae9d, |
28 | 'uniqueNode': #d6e9ff, | 29 | 'uniqueNode': #d6e9ff, |
29 | 'number': #6e88a6, | 30 | 'number': #6e88a6, |
30 | 'delimiter': #6f7682, | 31 | 'delimiter': #56606d, |
32 | 'comment': #55606d, | ||
31 | 'cursor': #f3efe7, | 33 | 'cursor': #f3efe7, |
32 | 'selection': #3e4452, | 34 | 'selection': #3e4452, |
33 | 'currentLine': #2c323c, | 35 | 'currentLine': #2c323c, |
34 | 'lineNumber': #5c6340, | 36 | 'lineNumber': #5c6370, |
35 | ), | 37 | ), |
36 | ); | 38 | ); |
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 { | |||
16 | 16 | ||
17 | foreground!: string; | 17 | foreground!: string; |
18 | 18 | ||
19 | background!: string; | 19 | foregroundHighlight!: string; |
20 | 20 | ||
21 | paper!: string; | 21 | background!: string; |
22 | 22 | ||
23 | primary!: string; | 23 | primary!: string; |
24 | 24 | ||
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 { | |||
34 | mode: themeData.paletteMode, | 34 | mode: themeData.paletteMode, |
35 | background: { | 35 | background: { |
36 | default: themeData.background, | 36 | default: themeData.background, |
37 | paper: themeData.paper, | 37 | paper: themeData.background, |
38 | }, | 38 | }, |
39 | primary: { | 39 | primary: { |
40 | main: themeData.primary, | 40 | main: themeData.primary, |
@@ -42,6 +42,10 @@ export class ThemeStore { | |||
42 | secondary: { | 42 | secondary: { |
43 | main: themeData.secondary, | 43 | main: themeData.secondary, |
44 | }, | 44 | }, |
45 | text: { | ||
46 | primary: themeData.foregroundHighlight, | ||
47 | secondary: themeData.foreground, | ||
48 | }, | ||
45 | }, | 49 | }, |
46 | }); | 50 | }); |
47 | return responsiveFontSizes(materialUiTheme); | 51 | return responsiveFontSizes(materialUiTheme); |