From 639cbb16e8c3d1bc2f91bbcb554f549bdbbd812e Mon Sep 17 00:00:00 2001 From: kuzhelov Date: Thu, 11 Apr 2019 01:14:40 +0200 Subject: [PATCH 1/2] move to base theme --- packages/react/src/themes/base/componentStyles.ts | 9 +++++++++ packages/react/src/themes/base/componentVariables.ts | 9 +++++++++ .../{teams => base}/components/Flex/flexItemStyles.ts | 0 .../{teams => base}/components/Flex/flexItemVariables.ts | 0 .../themes/{teams => base}/components/Flex/flexStyles.ts | 0 .../{teams => base}/components/Flex/flexVariables.ts | 0 .../src/themes/{teams => base}/components/Flex/utils.ts | 0 packages/react/src/themes/teams/componentStyles.ts | 3 --- packages/react/src/themes/teams/componentVariables.ts | 3 --- 9 files changed, 18 insertions(+), 6 deletions(-) rename packages/react/src/themes/{teams => base}/components/Flex/flexItemStyles.ts (100%) rename packages/react/src/themes/{teams => base}/components/Flex/flexItemVariables.ts (100%) rename packages/react/src/themes/{teams => base}/components/Flex/flexStyles.ts (100%) rename packages/react/src/themes/{teams => base}/components/Flex/flexVariables.ts (100%) rename packages/react/src/themes/{teams => base}/components/Flex/utils.ts (100%) diff --git a/packages/react/src/themes/base/componentStyles.ts b/packages/react/src/themes/base/componentStyles.ts index e38042871d..4190dd23cf 100644 --- a/packages/react/src/themes/base/componentStyles.ts +++ b/packages/react/src/themes/base/componentStyles.ts @@ -1,7 +1,16 @@ export { default as Dialog } from './components/Dialog/dialogStyles' + +export { default as Flex } from './components/Flex/flexStyles' +export { default as FlexItem } from './components/Flex/flexItemStyles' + export { default as Icon } from './components/Icon/iconStyles' + export { default as Loader } from './components/Loader/loaderStyles' + export { default as ProviderBox } from './components/Provider/providerBoxStyles' + export { default as Text } from './components/Text/textStyles' + export { default as Grid } from './components/Grid/gridStyles' + export { default as Image } from './components/Image/imageStyles' diff --git a/packages/react/src/themes/base/componentVariables.ts b/packages/react/src/themes/base/componentVariables.ts index 3cbfc2d493..0f3024b079 100644 --- a/packages/react/src/themes/base/componentVariables.ts +++ b/packages/react/src/themes/base/componentVariables.ts @@ -1,7 +1,16 @@ export { default as Dialog } from './components/Dialog/dialogVariables' + +export { default as Flex } from './components/Flex/flexVariables' +export { default as FlexItem } from './components/Flex/flexItemVariables' + export { default as Icon } from './components/Icon/iconVariables' + export { default as Loader } from './components/Loader/loaderVariables' + export { default as ProviderBox } from './components/Provider/providerBoxVariables' + export { default as Text } from './components/Text/textVariables' + export { default as Grid } from './components/Grid/gridVariables' + export { default as Image } from './components/Image/imageVariables' diff --git a/packages/react/src/themes/teams/components/Flex/flexItemStyles.ts b/packages/react/src/themes/base/components/Flex/flexItemStyles.ts similarity index 100% rename from packages/react/src/themes/teams/components/Flex/flexItemStyles.ts rename to packages/react/src/themes/base/components/Flex/flexItemStyles.ts diff --git a/packages/react/src/themes/teams/components/Flex/flexItemVariables.ts b/packages/react/src/themes/base/components/Flex/flexItemVariables.ts similarity index 100% rename from packages/react/src/themes/teams/components/Flex/flexItemVariables.ts rename to packages/react/src/themes/base/components/Flex/flexItemVariables.ts diff --git a/packages/react/src/themes/teams/components/Flex/flexStyles.ts b/packages/react/src/themes/base/components/Flex/flexStyles.ts similarity index 100% rename from packages/react/src/themes/teams/components/Flex/flexStyles.ts rename to packages/react/src/themes/base/components/Flex/flexStyles.ts diff --git a/packages/react/src/themes/teams/components/Flex/flexVariables.ts b/packages/react/src/themes/base/components/Flex/flexVariables.ts similarity index 100% rename from packages/react/src/themes/teams/components/Flex/flexVariables.ts rename to packages/react/src/themes/base/components/Flex/flexVariables.ts diff --git a/packages/react/src/themes/teams/components/Flex/utils.ts b/packages/react/src/themes/base/components/Flex/utils.ts similarity index 100% rename from packages/react/src/themes/teams/components/Flex/utils.ts rename to packages/react/src/themes/base/components/Flex/utils.ts diff --git a/packages/react/src/themes/teams/componentStyles.ts b/packages/react/src/themes/teams/componentStyles.ts index e9fefb22b9..9a92c697cc 100644 --- a/packages/react/src/themes/teams/componentStyles.ts +++ b/packages/react/src/themes/teams/componentStyles.ts @@ -24,9 +24,6 @@ export { default as DropdownItem } from './components/Dropdown/dropdownItemStyle export { default as Embed } from './components/Embed/embedStyles' -export { default as Flex } from './components/Flex/flexStyles' -export { default as FlexItem } from './components/Flex/flexItemStyles' - export { default as Form } from './components/Form/formStyles' export { default as FormField } from './components/Form/formFieldStyles' diff --git a/packages/react/src/themes/teams/componentVariables.ts b/packages/react/src/themes/teams/componentVariables.ts index b1651a08b6..82a6706dd6 100644 --- a/packages/react/src/themes/teams/componentVariables.ts +++ b/packages/react/src/themes/teams/componentVariables.ts @@ -24,9 +24,6 @@ export { export { default as Embed } from './components/Embed/embedVariables' -export { default as Flex } from './components/Flex/flexVariables' -export { default as FlexItem } from './components/Flex/flexItemVariables' - export { default as Header } from './components/Header/headerVariables' export { default as HeaderDescription } from './components/Header/headerDescriptionVariables' From 66e794ecd9f30b173128c6359584451b4891e6fe Mon Sep 17 00:00:00 2001 From: kuzhelov Date: Sun, 14 Apr 2019 22:16:35 +0200 Subject: [PATCH 2/2] update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0bbbda4c1b..aba34a37f2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm ### Features - Add `Embed` and `Video` components @stuartlong ([#1108](https://github.com/stardust-ui/react/pull/1108)) +- Move `Flex` styles to `base` theme @kuzhelov ([#1206](https://github.com/stardust-ui/react/pull/1206)) ## [v0.27.0](https://github.com/stardust-ui/react/tree/v0.27.0) (2019-04-10)