Skip to content

Fluent theme: Fix imports to use relative paths #4831

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mikewheaton merged 2 commits into from
May 9, 2018
Merged

Fluent theme: Fix imports to use relative paths #4831

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4468b8d
Update to use relative imports
May 9, 2018
f45345d
Add change file
May 9, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions ...on/changes/@uifabric/experiments/miwhea-fluent-theme-update-imports_2018-05-09-20-02.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"changes": [
{
"packageName": "@uifabric/experiments",
"comment": "Update Fluent theme to use relative imports",
"type": "patch"
}
],
"packageName": "@uifabric/experiments",
"email": "[email protected]"
}
2 changes: 1 addition & 1 deletion packages/experiments/src/components/fluent/theme/FluentTheme.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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: {
Expand Down
14 changes: 7 additions & 7 deletions packages/experiments/src/components/fluent/theme/examples/FluentTheme.Basic.Example.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 (
<div>
<h2>Current theme</h2>
{this._renderComponents()}
{ this._renderComponents() }

<h2>Fluent theme</h2>
<Customizer settings={{ theme: FluentTheme }}>
{this._renderComponents()}
<Customizer settings={ { theme: FluentTheme } }>
{ this._renderComponents() }
</Customizer>
</div>
);
Expand All @@ -20,14 +20,14 @@ export class FluentThemeBasicExample extends React.Component<{}, {}> {
private _renderComponents(): JSX.Element {
return (
<div>
<Link disabled={true}>Disabled link</Link>
<Link disabled={ true }>Disabled link</Link>
<Breadcrumb
items={[
items={ [
{ text: 'Files', key: 'Files' },
{ text: 'This is folder 1', key: 'f1' },
{ text: 'This is folder 2', key: 'f2' },
{ text: 'This is folder 3', key: 'f3', isCurrentItem: true }
]}
] }
/>
</div>
);
Expand Down