Skip to content

Breadcrumb: File rename to make the 6.0 merge diff more readable. #4394

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
dzearing merged 3 commits into from
Mar 30, 2018
Merged

Breadcrumb: File rename to make the 6.0 merge diff more readable. #4394

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7c4b4db
File rename to make the 6.0 merge diff more readable.
dzearing Mar 28, 2018
cddbcb3
Adding checkbox.
dzearing Mar 28, 2018
2e1afe6
Also moving a few more.
dzearing Mar 29, 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
0 .../src/components/Breadcrumb/Breadcrumb.tsx → ...components/Breadcrumb/Breadcrumb.base.tsx
View file
Open in desktop
File renamed without changes.
4 changes: 1 addition & 3 deletions packages/office-ui-fabric-react/src/components/Breadcrumb/Breadcrumb.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@ import * as React from 'react';
import * as ReactDOM from 'react-dom';
import * as ReactTestUtils from 'react-dom/test-utils';
import * as renderer from 'react-test-renderer';

import { Breadcrumb } from './Breadcrumb';
import { IBreadcrumbItem } from './Breadcrumb.types';
import { Breadcrumb, IBreadcrumbItem } from './index';

describe('Breadcrumb', () => {
it('renders breadcumb correctly', () => {
Expand Down
2 changes: 1 addition & 1 deletion packages/office-ui-fabric-react/src/components/Breadcrumb/Breadcrumb.types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* tslint:disable:no-unused-variable */
import * as React from 'react';
/* tslint:enable:no-unused-variable */
import { Breadcrumb, IBreadCrumbData } from './Breadcrumb';
import { Breadcrumb, IBreadCrumbData } from './Breadcrumb.base';
import { IRenderFunction } from '../../Utilities';

export interface IBreadcrumb {
Expand Down
2 changes: 1 addition & 1 deletion packages/office-ui-fabric-react/src/components/Breadcrumb/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
export * from './Breadcrumb';
export * from './Breadcrumb.base';
export * from './Breadcrumb.types';
0 ...eact/src/components/Checkbox/Checkbox.tsx → ...src/components/Checkbox/Checkbox.base.tsx
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion packages/office-ui-fabric-react/src/components/Checkbox/Checkbox.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as React from 'react';
import * as renderer from 'react-test-renderer';

import { Checkbox } from './Checkbox';
import { Checkbox } from './index';

describe('Checkbox', () => {
it('renders Checkbox correctly', () => {
Expand Down
2 changes: 1 addition & 1 deletion packages/office-ui-fabric-react/src/components/Checkbox/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
export * from './Checkbox';
export * from './Checkbox.base';
export * from './Checkbox.types';
0 ...fabric-react/src/components/Icon/Icon.tsx → ...c-react/src/components/Icon/Icon.base.tsx
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion packages/office-ui-fabric-react/src/components/Icon/Icon.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as React from 'react';
import * as renderer from 'react-test-renderer';

import { Icon } from './Icon';
import { Icon } from './index';

describe('Icon', () => {
it('renders Icon correctly', () => {
Expand Down
2 changes: 1 addition & 1 deletion packages/office-ui-fabric-react/src/components/Icon/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
export * from './Icon';
export * from './Icon.base';
export * from './Icon.types';
0 ...bric-react/src/components/Label/Label.tsx → ...react/src/components/Label/Label.base.tsx
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion packages/office-ui-fabric-react/src/components/Label/Label.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import * as ReactDOM from 'react-dom';
import * as ReactTestUtils from 'react-dom/test-utils';
import * as renderer from 'react-test-renderer';

import { Label } from './Label';
import { Label } from './index';

describe('Label', () => {

Expand Down
2 changes: 1 addition & 1 deletion packages/office-ui-fabric-react/src/components/Label/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
export * from './Label';
export * from './Label.base';
export * from './Label.types';