From 1a129964ad2bb595f8d273ac705b95171de09fd1 Mon Sep 17 00:00:00 2001 From: Mike Wheaton Date: Thu, 10 May 2018 08:42:36 -0700 Subject: [PATCH 1/4] Fix color names --- .../components/fluent/theme/FluentTheme.ts | 22 +++++++++---------- .../fluent/theme/FluentThemePage.tsx | 6 ++++- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/packages/experiments/src/components/fluent/theme/FluentTheme.ts b/packages/experiments/src/components/fluent/theme/FluentTheme.ts index cc0b72eb3924e..13bfbb40d3904 100644 --- a/packages/experiments/src/components/fluent/theme/FluentTheme.ts +++ b/packages/experiments/src/components/fluent/theme/FluentTheme.ts @@ -4,17 +4,17 @@ import { GrayColors } from './FluentColors'; const FluentTheme: ITheme = createTheme({ palette: { black: GrayColors.black, - neutralDark: GrayColors.GrayColors190, - neutralPrimary: GrayColors.GrayColors160, - neutralPrimaryAlt: GrayColors.GrayColors150, - neutralSecondary: GrayColors.GrayColors130, - neutralTertiary: GrayColors.GrayColors90, - neutralTertiaryAlt: GrayColors.GrayColors60, - neutralQuaternary: GrayColors.GrayColors50, - neutralQuaternaryAlt: GrayColors.GrayColors40, - neutralLight: GrayColors.GrayColors30, - neutralLighter: GrayColors.GrayColors20, - neutralLighterAlt: GrayColors.GrayColors10, + neutralDark: GrayColors.gray190, + neutralPrimary: GrayColors.gray160, + neutralPrimaryAlt: GrayColors.gray150, + neutralSecondary: GrayColors.gray130, + neutralTertiary: GrayColors.gray90, + neutralTertiaryAlt: GrayColors.gray60, + neutralQuaternary: GrayColors.gray50, + neutralQuaternaryAlt: GrayColors.gray40, + neutralLight: GrayColors.gray30, + neutralLighter: GrayColors.gray20, + neutralLighterAlt: GrayColors.gray10, white: GrayColors.white } }); diff --git a/packages/experiments/src/components/fluent/theme/FluentThemePage.tsx b/packages/experiments/src/components/fluent/theme/FluentThemePage.tsx index bb5e023424a59..6ed50eb09adf1 100644 --- a/packages/experiments/src/components/fluent/theme/FluentThemePage.tsx +++ b/packages/experiments/src/components/fluent/theme/FluentThemePage.tsx @@ -5,7 +5,8 @@ import { ExampleCard } from '@uifabric/example-app-base'; -import { FluentThemeBasicExample } from '@uifabric/experiments/lib/components/fluent/theme/examples/FluentTheme.Basic.Example'; +import { FluentThemeBasicExample } from './examples/FluentTheme.Basic.Example'; +import FluentTheme from './FluentTheme'; const FluentThemeBasicExampleCode = require('!raw-loader!@uifabric/experiments/src/components/fluent/theme/examples/FluentTheme.Basic.Example.tsx') as string; @@ -14,6 +15,9 @@ export class FluentThemePage extends React.Component< {} > { public render(): JSX.Element { + + console.log(FluentTheme.palette); + return ( Date: Thu, 10 May 2018 08:43:57 -0700 Subject: [PATCH 2/4] Add change file --- ...iwhea-fluent-fix-color-names_2018-05-10-15-43.json | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 common/changes/@uifabric/experiments/miwhea-fluent-fix-color-names_2018-05-10-15-43.json diff --git a/common/changes/@uifabric/experiments/miwhea-fluent-fix-color-names_2018-05-10-15-43.json b/common/changes/@uifabric/experiments/miwhea-fluent-fix-color-names_2018-05-10-15-43.json new file mode 100644 index 0000000000000..fff8cbc04f89b --- /dev/null +++ b/common/changes/@uifabric/experiments/miwhea-fluent-fix-color-names_2018-05-10-15-43.json @@ -0,0 +1,11 @@ +{ + "changes": [ + { + "packageName": "@uifabric/experiments", + "comment": "Fix Fluent palette color names", + "type": "patch" + } + ], + "packageName": "@uifabric/experiments", + "email": "mike@mikewheaton.ca" +} \ No newline at end of file From 3bc25e218b05554c36a720311a0ae4ea9296d033 Mon Sep 17 00:00:00 2001 From: Mike Wheaton Date: Thu, 10 May 2018 08:46:46 -0700 Subject: [PATCH 3/4] Remove debug console.log --- .../src/components/fluent/theme/FluentThemePage.tsx | 3 --- 1 file changed, 3 deletions(-) diff --git a/packages/experiments/src/components/fluent/theme/FluentThemePage.tsx b/packages/experiments/src/components/fluent/theme/FluentThemePage.tsx index 6ed50eb09adf1..ce7e9a0ae1e35 100644 --- a/packages/experiments/src/components/fluent/theme/FluentThemePage.tsx +++ b/packages/experiments/src/components/fluent/theme/FluentThemePage.tsx @@ -15,9 +15,6 @@ export class FluentThemePage extends React.Component< {} > { public render(): JSX.Element { - - console.log(FluentTheme.palette); - return ( Date: Thu, 10 May 2018 08:47:53 -0700 Subject: [PATCH 4/4] Remove unused import --- .../experiments/src/components/fluent/theme/FluentThemePage.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/experiments/src/components/fluent/theme/FluentThemePage.tsx b/packages/experiments/src/components/fluent/theme/FluentThemePage.tsx index ce7e9a0ae1e35..b83efe0e3aebb 100644 --- a/packages/experiments/src/components/fluent/theme/FluentThemePage.tsx +++ b/packages/experiments/src/components/fluent/theme/FluentThemePage.tsx @@ -6,7 +6,7 @@ import { } from '@uifabric/example-app-base'; import { FluentThemeBasicExample } from './examples/FluentTheme.Basic.Example'; -import FluentTheme from './FluentTheme'; + const FluentThemeBasicExampleCode = require('!raw-loader!@uifabric/experiments/src/components/fluent/theme/examples/FluentTheme.Basic.Example.tsx') as string;