Skip to content

Commit

Permalink
fixup! fix webview theme styles
Browse files Browse the repository at this point in the history
  • Loading branch information
olexii4 committed Sep 11, 2019
1 parent 9d6a1b4 commit a7176be
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions packages/core/src/browser/theming.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ import { FrontendApplicationConfigProvider } from './frontend-application-config
import { MenuContribution, MenuModelRegistry } from '../common/';
import { CommonMenus } from './common-frontend-contribution';

require('../../src/browser/style/materialcolors.css').use();

export const ThemeServiceSymbol = Symbol('ThemeService');

export interface Theme {
Expand Down Expand Up @@ -196,7 +198,6 @@ export class BuiltinThemeProvider {
// Webpack converts these `require` in some Javascript object that wraps the `.css` files
static readonly darkCss = require('../../src/browser/style/variables-dark.useable.css');
static readonly lightCss = require('../../src/browser/style/variables-bright.useable.css');
static readonly materialColors = require('../../src/browser/style/materialcolors.css');

static readonly darkTheme = {
id: 'dark',
Expand All @@ -205,11 +206,9 @@ export class BuiltinThemeProvider {
editorTheme: 'dark-plus', // loaded in /packages/monaco/src/browser/textmate/monaco-theme-registry.ts
activate(): void {
BuiltinThemeProvider.darkCss.use();
BuiltinThemeProvider.materialColors.use();
},
deactivate(): void {
BuiltinThemeProvider.darkCss.unuse();
BuiltinThemeProvider.materialColors.unuse();
}
};

Expand All @@ -220,11 +219,9 @@ export class BuiltinThemeProvider {
editorTheme: 'light-plus', // loaded in /packages/monaco/src/browser/textmate/monaco-theme-registry.ts
activate(): void {
BuiltinThemeProvider.lightCss.use();
BuiltinThemeProvider.materialColors.use();
},
deactivate(): void {
BuiltinThemeProvider.lightCss.unuse();
BuiltinThemeProvider.materialColors.unuse();
}
};

Expand Down

0 comments on commit a7176be

Please sign in to comment.