From be7c4cdab9044da044ac785533588601141db2b0 Mon Sep 17 00:00:00 2001 From: Patrik Oldsberg Date: Fri, 30 Dec 2022 15:05:27 +0100 Subject: [PATCH] theme: move pageTheme to root Signed-off-by: Patrik Oldsberg --- packages/theme/src/index.ts | 1 + packages/theme/src/{v4 => }/pageTheme.ts | 2 +- packages/theme/src/v4/baseTheme.ts | 2 +- packages/theme/src/v4/index.ts | 1 - packages/theme/src/v4/themes.ts | 2 +- 5 files changed, 4 insertions(+), 4 deletions(-) rename packages/theme/src/{v4 => }/pageTheme.ts (99%) diff --git a/packages/theme/src/index.ts b/packages/theme/src/index.ts index 5a07f66536..c9f0ebd289 100644 --- a/packages/theme/src/index.ts +++ b/packages/theme/src/index.ts @@ -22,6 +22,7 @@ export * from './v4'; export * from './v5'; +export { colorVariants, genPageTheme, pageTheme, shapes } from './pageTheme'; export type { BackstagePaletteAdditions, PageTheme, diff --git a/packages/theme/src/v4/pageTheme.ts b/packages/theme/src/pageTheme.ts similarity index 99% rename from packages/theme/src/v4/pageTheme.ts rename to packages/theme/src/pageTheme.ts index 93eb2be0e3..12a73b6089 100644 --- a/packages/theme/src/v4/pageTheme.ts +++ b/packages/theme/src/pageTheme.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { PageTheme } from '../types'; +import { PageTheme } from './types'; /** * The default predefined burst shapes. diff --git a/packages/theme/src/v4/baseTheme.ts b/packages/theme/src/v4/baseTheme.ts index b326018e87..1dcd2cf7d7 100644 --- a/packages/theme/src/v4/baseTheme.ts +++ b/packages/theme/src/v4/baseTheme.ts @@ -18,7 +18,7 @@ import { createTheme as createMuiTheme } from '@material-ui/core/styles'; import { Theme, ThemeOptions } from '@material-ui/core'; import { darken, lighten } from '@material-ui/core/styles/colorManipulator'; import { Overrides } from '@material-ui/core/styles/overrides'; -import { pageTheme as defaultPageThemes } from './pageTheme'; +import { pageTheme as defaultPageThemes } from '../pageTheme'; import { SimpleV4ThemeOptions } from './types'; const DEFAULT_HTML_FONT_SIZE = 16; diff --git a/packages/theme/src/v4/index.ts b/packages/theme/src/v4/index.ts index f897070f0e..331e0e4c1e 100644 --- a/packages/theme/src/v4/index.ts +++ b/packages/theme/src/v4/index.ts @@ -27,4 +27,3 @@ export type { BackstageThemeOptions, SimpleV4ThemeOptions, } from './types'; -export { colorVariants, genPageTheme, pageTheme, shapes } from './pageTheme'; diff --git a/packages/theme/src/v4/themes.ts b/packages/theme/src/v4/themes.ts index 9432aa2b57..4aa1902f4a 100644 --- a/packages/theme/src/v4/themes.ts +++ b/packages/theme/src/v4/themes.ts @@ -15,7 +15,7 @@ */ import { createV4Theme } from './baseTheme'; -import { pageTheme } from './pageTheme'; +import { pageTheme } from '../pageTheme'; import { yellow } from '@material-ui/core/colors'; /**