Skip to content
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

fix(public-docsite): Changing crossplatform urls to use 'cross' instead of 'crossplatform' #25437

Merged
merged 2 commits into from
Oct 31, 2022
Merged

fix(public-docsite): Changing crossplatform urls to use 'cross' instead of 'crossplatform' #25437

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
8c950e1
updating related links for crossplatform controls
sopranopillow Oct 28, 2022
5386d68
updating crossplatform urls to use 'cross' instead of 'crossplatform'
sopranopillow Oct 30, 2022
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
12 changes: 6 additions & 6 deletions apps/public-docsite/src/SiteDefinition/SiteDefinition.pages/Controls/cross.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { INavPage, LoadingComponent } from '@fluentui/react-docsite-components/l
export const controlsPagesCrossPlatform: INavPage[] = [
{
title: 'Controls',
url: '#/controls/crossplatform',
url: '#/controls/cross',
isHiddenFromMainNav: true,
component: () => <LoadingComponent title="Controls" />,
getComponent: cb =>
Expand All @@ -18,14 +18,14 @@ export const controlsPagesCrossPlatform: INavPage[] = [
pages: [
{
title: 'Button',
url: '#/controls/crossplatform/button',
url: '#/controls/cross/button',
component: () => <LoadingComponent title="Button" />,
getComponent: cb =>
require.ensure([], require => cb(require<any>('../../../pages/Controls/ButtonPage/ButtonPage').ButtonPage)),
},
{
title: 'Link',
url: '#/controls/crossplatform/link',
url: '#/controls/cross/link',
component: () => <LoadingComponent title="Link" />,
getComponent: cb =>
require.ensure([], require => cb(require<any>('../../../pages/Controls/LinkPage/LinkPage').LinkPage)),
Expand All @@ -38,7 +38,7 @@ export const controlsPagesCrossPlatform: INavPage[] = [
pages: [
{
title: 'Persona',
url: '#/controls/crossplatform/persona',
url: '#/controls/cross/persona',
component: () => <LoadingComponent title="Persona" />,
getComponent: cb =>
require.ensure([], require =>
Expand All @@ -53,14 +53,14 @@ export const controlsPagesCrossPlatform: INavPage[] = [
pages: [
{
title: 'Text',
url: '#/controls/crossplatform/text',
url: '#/controls/cross/text',
component: () => <LoadingComponent title="Text" />,
getComponent: cb =>
require.ensure([], require => cb(require<any>('../../../pages/Controls/TextPage/TextPage').TextPage)),
},
{
title: 'Separator',
url: '#/controls/crossplatform/separator',
url: '#/controls/cross/separator',
component: () => <LoadingComponent title="Separator" />,
getComponent: cb =>
require.ensure([], require =>
Expand Down
2 changes: 1 addition & 1 deletion apps/public-docsite/src/SiteDefinition/SiteDefinition.pages/GetStarted/GetStarted.pages.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ export const GetStartedPages: INavPage = {
cross: [
{
title: 'Get started',
url: '#/get-started/crossplatform',
url: '#/get-started/cross',
isHiddenFromMainNav: true,
component: () => <LoadingComponent title="Get started" />,
getComponent: cb =>
Expand Down
2 changes: 1 addition & 1 deletion apps/public-docsite/src/pages/Controls/PersonaPage/PersonaPage.doc.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ const related: ISideRailLink[] = [
{ text: 'iOS Persona', url: '#/controls/ios/persona' },
{ text: 'Android Persona', url: '#/controls/android/persona' },
{ text: 'macOS Avatar', url: '#/controls/mac/avatar' },
{ text: 'Cross-platform Persona', url: '#/controls/crossplatform/persona' },
{ text: 'Cross-platform Persona', url: '#/controls/cross/persona' },
];
const componentUrl =
'https://github.com/microsoft/fluentui/tree/master/apps/public-docsite/src/pages/Controls/PersonaPage';
Expand Down
2 changes: 1 addition & 1 deletion apps/public-docsite/src/pages/Controls/SeparatorPage/SeparatorPage.doc.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ const related: ISideRailLink[] = [
{ text: 'Android Separator', url: '#/controls/android/separator' },
{ text: 'Android ListItemDivider', url: '#/controls/android/listcells' },
{ text: 'macOS Separator', url: '#/controls/mac/separator' },
{ text: 'Cross-platform Separator', url: '#/controls/crossplatform/separator' },
{ text: 'Cross-platform Separator', url: '#/controls/cross/separator' },
];
const componentUrl =
'https://github.com/microsoft/fluentui/tree/master/apps/public-docsite/src/pages/Controls/SeparatorPage';
Expand Down
2 changes: 1 addition & 1 deletion apps/public-docsite/src/pages/Controls/TextPage/TextPage.doc.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ const related: ISideRailLink[] = [
{ text: 'Web Text', url: '#/controls/web/text' },
{ text: 'iOS Text', url: '#/controls/ios/text' },
{ text: 'Android Text', url: '#/controls/android/text' },
{ text: 'Cross-platform Text', url: '#/controls/crossplatform/text' },
{ text: 'Cross-platform Text', url: '#/controls/cross/text' },
];
const componentUrl =
'https://github.com/microsoft/fluentui/tree/master/apps/public-docsite/src/pages/Controls/TextPage';
Expand Down
4 changes: 2 additions & 2 deletions apps/public-docsite/src/pages/HomePage/HomePage.base.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,10 +315,10 @@ export class HomePageBase extends React.Component<IHomePageProps, IHomePageState
</TitleStack>
<ul className={classNames.cardList}>
<li className={classNames.cardListItem}>
{this._renderLink('#/controls/crossplatform', 'Controls', { ariaLabel: 'Controls: Cross-platform' })}
{this._renderLink('#/controls/cross', 'Controls', { ariaLabel: 'Controls: Cross-platform' })}
</li>
<li className={classNames.cardListItem}>
{this._renderLink('#/get-started/crossplatform', 'Get started', {
{this._renderLink('#/get-started/cross', 'Get started', {
ariaLabel: 'Get started: Cross-platform',
})}
</li>
Expand Down