Skip to content

Commit 20063f5

Browse files
MichaelDeBoeyCompuIves
authored andcommitted
Fix pipeline (codesandbox#3122)
* Fix pipeline * Update snapshots
1 parent 3903655 commit 20063f5

File tree

4 files changed

+16
-1726
lines changed

4 files changed

+16
-1726
lines changed

packages/app/src/app/overmind/effects/vscode/initializers.ts

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import codeSandboxBlackTheme from '@codesandbox/common/lib/themes/codesandbox-black.json';
1+
import codeSandboxBlackTheme from '@codesandbox/common/lib/themes/codesandbox-black';
22
import codeSandboxTheme from '@codesandbox/common/lib/themes/codesandbox.json';
33

44
export function initializeThemeCache() {
@@ -46,8 +46,7 @@ export function initializeSettings() {
4646
}
4747

4848
export function initializeCodeSandboxTheme() {
49-
// @ts-ignore
50-
const fs = BrowserFS.BFSRequire('fs');
49+
const fs = window.BrowserFS.BFSRequire('fs');
5150

5251
fs.writeFileSync(
5352
'/extensions/ngryman.codesandbox-theme-0.0.1/themes/CodeSandbox-color-theme.json',
@@ -90,8 +89,7 @@ export function installCustomTheme(id: string, name: string, theme: string) {
9089
},
9190
};
9291

93-
// @ts-ignore
94-
const fs = BrowserFS.BFSRequire('fs');
92+
const fs = window.BrowserFS.BFSRequire('fs');
9593
const extName = `${id}-theme`;
9694
fs.mkdirSync(`/extensions/${extName}`);
9795
fs.writeFileSync(

packages/common/src/__snapshots__/theme.test.ts.snap

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,33 +35,41 @@ Object {
3535
"$schema": "vscode://schemas/color-theme",
3636
"colors": Object {
3737
"activityBar.background": "#1C2022",
38+
"activityBar.border": "#111518",
3839
"badge.background": "#374140",
3940
"button.background": "#40A9F3",
4041
"button.hoverBackground": "#66B9F4",
4142
"editor.background": "#1C2022",
4243
"editor.selectionBackground": "#40a8f348",
4344
"editorCursor.foreground": "#66b9f4",
4445
"editorGroup.border": "#111518",
46+
"editorGroup.dropBackground": "#ffd3991f",
4547
"editorGroupHeader.tabsBackground": "#111518",
4648
"editorHoverWidget.background": "#1C2022",
4749
"editorHoverWidget.border": "#111518",
4850
"editorSuggestWidget.background": "#111518",
4951
"editorSuggestWidget.border": "#111518",
5052
"editorSuggestWidget.selectedBackground": "#24282A",
53+
"editorWarning.foreground": "#FFD399",
5154
"focusBorder": "#66b9f4",
5255
"input.background": "#111518",
5356
"input.foreground": "#C0C0C0",
5457
"inputOption.activeBorder": "#66b9f4",
58+
"list.focusBackground": "#24282A",
5559
"list.hoverBackground": "#37414050",
56-
"menu.background": "#111518",
60+
"menu.background": "#1C2022",
61+
"menu.foreground": "#C0C0C0",
5762
"menu.selectionBackground": "#24282A",
58-
"menu.selectionForeground": "#40A9F3",
63+
"menu.selectionForeground": "#ffffff",
64+
"menubar.selectionBackground": "#ffffff10",
65+
"menubar.selectionForeground": "#ffffff",
5966
"peekViewEditor.background": "#111518",
6067
"scrollbarSlider.activeBackground": "#374140",
6168
"scrollbarSlider.background": "#37414050",
6269
"sideBar.background": "#191d1f",
6370
"sideBar.border": "#111518",
64-
"statusBar.background": "#242424",
71+
"statusBar.background": "#1C2022",
72+
"statusBar.border": "#111518",
6573
"tab.activeBackground": "#1C2022",
6674
"tab.border": "#111518",
6775
"tab.inactiveBackground": "#111518",

packages/common/src/themes/codesandbox-black.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ const colors = {
3535
},
3636
editor: {
3737
background: tokens.grays[700],
38-
foreground: tokens.white,
38+
foreground: tokens.grays[300],
3939
hoverHighlightBackground: tokens.grays[600],
4040
inactiveSelectionBackground: tokens.grays[600],
4141
lineHighlightBackground: tokens.grays[500],
@@ -208,7 +208,7 @@ const colors = {
208208
background: tokens.grays[700],
209209
hoverBackground: tokens.green,
210210
border: tokens.grays[500],
211-
foreground: tokens.white,
211+
foreground: tokens.grays[300],
212212
},
213213
sideBarSectionHeader: {
214214
background: tokens.grays[700],

0 commit comments

Comments
 (0)