Skip to content

Commit 8aca3c6

Browse files
committed
New themes
1 parent d0f9b09 commit 8aca3c6

File tree

9 files changed

+22
-18
lines changed

9 files changed

+22
-18
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "jderobot-ide-interface",
3-
"version": "0.2.65",
3+
"version": "0.2.66",
44
"main": "dist/main.js",
55
"typings": "dist/index.d.ts",
66
"files": [

src/components/Explorer/file_explorer/MoreActionsMenu.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ function MoreActionsMenu({
5050
return (
5151
<StyledExplorerExtraMenuBackdrop active={menuProps.isShown} ref={menuRef}>
5252
<StyledExplorerExtraMenu
53-
bgColor={theme.palette.background}
53+
bgColor={theme.palette.bg}
5454
borderColor={theme.palette.secondary}
5555
roundness={theme.roundness}
5656
top={menuProps.position.y}

src/components/FileEditor/TextEditor.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -134,15 +134,15 @@ const FileEditor = ({
134134
inherit: true,
135135
rules: [],
136136
colors: {
137-
"editor.background": theme.palette.background,
137+
"editor.background": theme.palette.bg,
138138
},
139139
});
140140
monacoRef.current.editor.defineTheme("light-theme", {
141141
base: "vs",
142142
inherit: true,
143143
rules: [],
144144
colors: {
145-
"editor.background": theme.palette.background,
145+
"editor.background": theme.palette.bg,
146146
},
147147
});
148148
}
@@ -154,15 +154,15 @@ const FileEditor = ({
154154
inherit: true,
155155
rules: [],
156156
colors: {
157-
"editor.background": theme.palette.background,
157+
"editor.background": theme.palette.bg,
158158
},
159159
});
160160
monaco.editor.defineTheme("light-theme", {
161161
base: "vs",
162162
inherit: true,
163163
rules: [],
164164
colors: {
165-
"editor.background": theme.palette.background,
165+
"editor.background": theme.palette.bg,
166166
},
167167
});
168168
};

src/components/Modals/EditorKeybindModal.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ const NewFolderModal = ({
4848
<StyledModalEditorKeybind
4949
lightText={theme.palette.text}
5050
darkText={theme.palette.darkText}
51-
bg={theme.palette.background}
51+
bg={theme.palette.bg}
5252
>
5353
<div> {keybind.description}</div>
5454
<div>

src/components/Modals/ErrorModal.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ const ErrorModal = () => {
8484
roundness: theme.roundness,
8585
error: theme.palette.error,
8686
errorBorder: theme.palette.border.error,
87-
info: theme.palette.background,
87+
info: theme.palette.bg,
8888
infoBorder: theme.palette.border.info,
8989
warning: theme.palette.warning,
9090
warningBorder: theme.palette.border.warning,

src/components/Modals/Modal.tsx

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ const Modal = ({
8080
id={id}
8181
ref={modalRef}
8282
onKeyDown={handleKeyDown}
83-
bgColor={theme.palette.background}
83+
bgColor={theme.palette.bg}
8484
borderColor={theme.palette.secondary}
8585
roundness={theme.roundness}
8686
>
@@ -119,7 +119,7 @@ export const ModalTitlebar = ({
119119
<StyledModalTitlebar
120120
color={theme.palette.text}
121121
altColor={theme.palette.darkText}
122-
bg={theme.palette.background}
122+
bg={theme.palette.bg}
123123
hoverColor={theme.palette.secondary}
124124
roundness={theme.roundness}
125125
>
@@ -132,7 +132,7 @@ export const ModalTitlebar = ({
132132
}}
133133
color={theme.palette.text}
134134
altColor={theme.palette.darkText}
135-
bg={theme.palette.background}
135+
bg={theme.palette.bg}
136136
/>
137137
)}
138138
<label htmlFor={htmlFor}>{title}</label>
@@ -145,7 +145,7 @@ export const ModalTitlebar = ({
145145
}}
146146
color={theme.palette.text}
147147
altColor={theme.palette.darkText}
148-
bg={theme.palette.background}
148+
bg={theme.palette.bg}
149149
/>
150150
)}
151151
</StyledModalTitlebar>
@@ -201,7 +201,7 @@ export const ModalRow = ({
201201
case "img":
202202
return (
203203
<StyledModalImageRow
204-
color={theme.palette.background}
204+
color={theme.palette.bg}
205205
roundness={theme.roundness}
206206
id={id}
207207
>
@@ -510,11 +510,11 @@ export const ModalInputDropArea = ({
510510
onDragLeave={() => setDropActive(false)}
511511
onDrop={(e) => onDrop(e)}
512512
text={theme.palette.text}
513-
bgColor={theme.palette.background}
513+
bgColor={theme.palette.bg}
514514
buttonColor={theme.palette.primary}
515515
hoverColor={theme.palette.secondary}
516516
borderColor={theme.palette.primary}
517-
hoverBorderColor={theme.palette.background}
517+
hoverBorderColor={theme.palette.bg}
518518
roundness={theme.roundness}
519519
active={dropActive}
520520
>

src/components/VncViewer/VncViewer.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ const VncViewer = ({
5858
};
5959

6060
return (
61-
<StyledVNCViewer bgColor={theme.palette.background}>
61+
<StyledVNCViewer bgColor={theme.palette.bg}>
6262
{enabled(state) ? (
6363
<StyledVNCScreen
6464
title="VNC viewer"

src/types/theme.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@ export interface Theme {
66
success?: string;
77
warning?: string;
88
error?: string;
9-
background: string;
9+
bgDark: string;
10+
bg: string;
11+
bgLight: string;
1012
primary?: string;
1113
secondary?: string;
1214
scrollbar?: string;

src/utils/themeProvider.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@ const defaultTheme: Theme = {
1414
success: "#29ac29",
1515
warning: "#f9e86d",
1616
error: "#802626",
17-
background: "#16161d",
17+
bgDark: "#0d0d0dff",
18+
bg: "#1a1a1aff",
19+
bgLight: "#262626ff",
1820
primary: "#134f53",
1921
secondary: "#1d777c",
2022
scrollbar: "#6f6f90",

0 commit comments

Comments
 (0)