From 4468b8d395729d4d9dac80346864a2358d242f08 Mon Sep 17 00:00:00 2001 From: Mike Wheaton Date: Wed, 9 May 2018 13:01:09 -0700 Subject: [PATCH 1/2] Update to use relative imports --- .../src/components/fluent/theme/FluentTheme.ts | 2 +- .../theme/examples/FluentTheme.Basic.Example.tsx | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/experiments/src/components/fluent/theme/FluentTheme.ts b/packages/experiments/src/components/fluent/theme/FluentTheme.ts index f51f1fef0c4df5..cc0b72eb3924e6 100644 --- a/packages/experiments/src/components/fluent/theme/FluentTheme.ts +++ b/packages/experiments/src/components/fluent/theme/FluentTheme.ts @@ -1,5 +1,5 @@ import { createTheme, ITheme } from 'office-ui-fabric-react'; -import { GrayColors } from '@uifabric/experiments/lib/components/fluent/theme/FluentColors'; +import { GrayColors } from './FluentColors'; const FluentTheme: ITheme = createTheme({ palette: { diff --git a/packages/experiments/src/components/fluent/theme/examples/FluentTheme.Basic.Example.tsx b/packages/experiments/src/components/fluent/theme/examples/FluentTheme.Basic.Example.tsx index 7f51b8f380ffc3..5da2744a012700 100644 --- a/packages/experiments/src/components/fluent/theme/examples/FluentTheme.Basic.Example.tsx +++ b/packages/experiments/src/components/fluent/theme/examples/FluentTheme.Basic.Example.tsx @@ -1,17 +1,17 @@ import * as React from 'react'; import { Link, Customizer, Breadcrumb } from 'office-ui-fabric-react'; -import FluentTheme from '@uifabric/experiments/lib/components/fluent/theme/FluentTheme'; +import FluentTheme from '../FluentTheme'; export class FluentThemeBasicExample extends React.Component<{}, {}> { public render(): JSX.Element { return (

Current theme

- {this._renderComponents()} + { this._renderComponents() }

Fluent theme

- - {this._renderComponents()} + + { this._renderComponents() }
); @@ -20,14 +20,14 @@ export class FluentThemeBasicExample extends React.Component<{}, {}> { private _renderComponents(): JSX.Element { return (
- Disabled link + Disabled link
); From f45345d66714c7b747a17cccef73d22807bcb356 Mon Sep 17 00:00:00 2001 From: Mike Wheaton Date: Wed, 9 May 2018 13:02:11 -0700 Subject: [PATCH 2/2] Add change file --- ...-fluent-theme-update-imports_2018-05-09-20-02.json | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 common/changes/@uifabric/experiments/miwhea-fluent-theme-update-imports_2018-05-09-20-02.json diff --git a/common/changes/@uifabric/experiments/miwhea-fluent-theme-update-imports_2018-05-09-20-02.json b/common/changes/@uifabric/experiments/miwhea-fluent-theme-update-imports_2018-05-09-20-02.json new file mode 100644 index 00000000000000..921803af8896e6 --- /dev/null +++ b/common/changes/@uifabric/experiments/miwhea-fluent-theme-update-imports_2018-05-09-20-02.json @@ -0,0 +1,11 @@ +{ + "changes": [ + { + "packageName": "@uifabric/experiments", + "comment": "Update Fluent theme to use relative imports", + "type": "patch" + } + ], + "packageName": "@uifabric/experiments", + "email": "mike@mikewheaton.ca" +} \ No newline at end of file