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.

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

[#1965] Fixed link color contrast issue in several dialogs. #2018

Merged
merged 2 commits into from
Dec 9, 2019
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- [2009](https://github.com/microsoft/BotFramework-Emulator/pull/2009)
- [2010](https://github.com/microsoft/BotFramework-Emulator/pull/2010)
- [2012](https://github.com/microsoft/BotFramework-Emulator/pull/2012)
- [2018](https://github.com/microsoft/BotFramework-Emulator/pull/2018)

- [main] Increased ngrok spawn timeout to 15 seconds to be more forgiving to slower networks in PR [1998](https://github.com/microsoft/BotFramework-Emulator/pull/1998)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -114,13 +114,15 @@ export class ConnectServicePromptDialog extends Component<ConnectServicePromptDi
<>
<p role="presentation">
{`Sign in to your Azure account to select the LUIS applications you'd like to associate with this bot. `}
<LinkButton linkRole={true} onClick={this.onLuisDocsClick}>
<LinkButton className={styles.dialogLink} linkRole={true} onClick={this.onLuisDocsClick}>
Learn more about LUIS.
</LinkButton>
</p>
<p role="presentation">
{`Alternatively, you can `}
<LinkButton onClick={this.props.addServiceManually}>add a LUIS app manually</LinkButton>
<LinkButton className={styles.dialogLink} onClick={this.props.addServiceManually}>
add a LUIS app manually
</LinkButton>
{` with the app ID, version, and authoring key.`}
</p>
</>
Expand All @@ -133,13 +135,13 @@ export class ConnectServicePromptDialog extends Component<ConnectServicePromptDi
<p role="presentation">
{'Sign in to your Azure account to select the QnA ' +
"Maker knowledge bases you'd like to associate with this bot. "}
<LinkButton linkRole={true} onClick={this.onQnADocsClick}>
<LinkButton className={styles.dialogLink} linkRole={true} onClick={this.onQnADocsClick}>
Learn more about QnA Maker.
</LinkButton>
</p>
<p role="presentation">
{`Alternatively, you can `}{' '}
<LinkButton onClick={this.props.addServiceManually}>
<LinkButton className={styles.dialogLink} onClick={this.props.addServiceManually}>
connect to a QnA Maker knowledge base manually
</LinkButton>
{' with the app ID, version, and authoring key.'}
Expand All @@ -153,13 +155,15 @@ export class ConnectServicePromptDialog extends Component<ConnectServicePromptDi
<>
<p role="presentation">
{`Sign in to your Azure account to select the Dispatch model you'd like to associate with this bot. `}
<LinkButton linkRole={true} onClick={this.onDispatchDocsClick}>
<LinkButton className={styles.dialogLink} linkRole={true} onClick={this.onDispatchDocsClick}>
Learn more about Dispatch models.
</LinkButton>
</p>
<p role="presentation">
{`Alternatively, you can `}
<LinkButton onClick={this.props.addServiceManually}>connect to a Dispatch model manually</LinkButton>
<LinkButton className={styles.dialogLink} onClick={this.props.addServiceManually}>
connect to a Dispatch model manually
</LinkButton>
{` with the app ID, version, and authoring key.`}
</p>
</>
Expand All @@ -172,13 +176,13 @@ export class ConnectServicePromptDialog extends Component<ConnectServicePromptDi
<p role="presentation">
{'Sign in to your Azure account to select the Azure Application ' +
"Insights you'd like to associate with this bot. "}
<LinkButton linkRole={true} onClick={this.onAppInsightsClick}>
<LinkButton className={styles.dialogLink} linkRole={true} onClick={this.onAppInsightsClick}>
Learn more about Azure Application Insights.
</LinkButton>
</p>
<p role="presentation">
{`Alternatively, you can `}
<LinkButton onClick={this.props.addServiceManually}>
<LinkButton className={styles.dialogLink} onClick={this.props.addServiceManually}>
connect to a Azure Application Insights manually
</LinkButton>
{` with the app ID, version, and authoring key.`}
Expand All @@ -193,13 +197,15 @@ export class ConnectServicePromptDialog extends Component<ConnectServicePromptDi
<p role="presentation">
{'Sign in to your Azure account to select the Azure Storage ' +
"accounts you'd like to associate with this bot. "}
<LinkButton linkRole={true} onClick={this.onAzureStorageDocsClick}>
<LinkButton className={styles.dialogLink} linkRole={true} onClick={this.onAzureStorageDocsClick}>
Learn more about Azure Storage.
</LinkButton>
</p>
<p role="presentation">
{`Alternatively, you can `}
<LinkButton onClick={this.props.addServiceManually}>connect to a Azure Storage account manually.</LinkButton>
<LinkButton className={styles.dialogLink} onClick={this.props.addServiceManually}>
connect to a Azure Storage account manually.
</LinkButton>
</p>
</>
);
Expand All @@ -211,13 +217,13 @@ export class ConnectServicePromptDialog extends Component<ConnectServicePromptDi
<p role="presentation">
{'Sign in to your Azure account to select the Azure Cosmos DB ' +
"accounts you'd like to associate with this bot. "}
<LinkButton linkRole={true} onClick={this.onAzureCosmosDbDocsClick}>
<LinkButton className={styles.dialogLink} linkRole={true} onClick={this.onAzureCosmosDbDocsClick}>
Learn more about Azure Cosmos DB.
</LinkButton>
</p>
<p role="presentation">
{`Alternatively, you can `}
<LinkButton onClick={this.props.addServiceManually}>
<LinkButton className={styles.dialogLink} onClick={this.props.addServiceManually}>
connect to a Azure Cosmos DB account manually.
</LinkButton>
</p>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ export class DataCollectionDialog extends Component<DataCollectionDialogProps, {
</p>
<p>You can turn data collection on or off at any time in your Emulator Settings.</p>
<p>
<LinkButton linkRole={true} onClick={this.onPrivacyLinkClick}>
<LinkButton className={styles.dialogLink} linkRole={true} onClick={this.onPrivacyLinkClick}>
Privacy statement
</LinkButton>
</p>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ import * as React from 'react';
import { ChangeEvent, Component, MouseEvent, ReactNode } from 'react';
import { EmulatorMode } from '@bfemulator/sdk-shared';

import * as dialogStyles from '../dialogStyles.scss';

import * as openBotStyles from './openBotDialog.scss';

export interface OpenBotDialogProps {
Expand Down Expand Up @@ -177,6 +179,7 @@ export class OpenBotDialog extends Component<OpenBotDialogProps, OpenBotDialogSt
/>
<LinkButton
ariaLabel="Learn more about Azure for US Government"
className={dialogStyles.dialogLink}
linkRole={true}
onClick={this.onEmulatorAzureGovDocsClick}
>
Expand Down