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

[ISSUE#1899][MAS2.4.6] [Headings and Labels - Open Bot Dialog] Heading should be defined for the pop-up or dialog #1936

Merged
merged 5 commits into from
Oct 23, 2019
Merged

[ISSUE#1899][MAS2.4.6] [Headings and Labels - Open Bot Dialog] Heading should be defined for the pop-up or dialog #1936

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c71cb81
Add h tag to dialog headers
santgr11 Oct 18, 2019
e97da00
Update dialog component to use h1 tag for heading
Bill7zz Oct 22, 2019
6fa14a7
Merge branch 'master' into fix/define-header-in-dialogs
denscollo Oct 22, 2019
a84ef21
Update changelog with solve PR
denscollo Oct 22, 2019
35dda87
Added newline
tonyanziano Oct 23, 2019
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- [1933](https://github.com/microsoft/BotFramework-Emulator/pull/1933)
- [1934](https://github.com/microsoft/BotFramework-Emulator/pull/1934)
- [1935](https://github.com/microsoft/BotFramework-Emulator/pull/1935)
- [1936](https://github.com/microsoft/BotFramework-Emulator/pull/1936)

- [client] Fixed an issue with the transcripts path input inside of the resource settings dialog in PR [1836](https://github.com/microsoft/BotFramework-Emulator/pull/1836)
- [client] Implemented HTML app menu for Windows in PR [1893](https://github.com/microsoft/BotFramework-Emulator/pull/1893)
Expand Down
8 changes: 8 additions & 0 deletions packages/sdk/ui-react/src/widget/dialog/dialog.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,3 +90,11 @@
outline-color: var(--global-focus-outline-color);
}
}

.dialog-header {
font-family: var(--default-font-family);
font-size: 22px;
font-weight: 200;
margin: 0px 4px 0px 0px;
padding: 0;
}
1 change: 1 addition & 0 deletions packages/sdk/ui-react/src/widget/dialog/dialog.scss.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ export const dialog: string;
export const footer: string;
export const cancelButton: string;
export const cancelButtonOutline: string;
export const dialogHeader: string;
6 changes: 3 additions & 3 deletions packages/sdk/ui-react/src/widget/dialog/dialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,11 @@ export class Dialog extends Component<ModalProps, {}> {
onKeyDown={this.bodyKeyDownHandler}
role="dialog"
>
<h1 id="dialog-heading" className={`${titleClassName} ${styles.dialogHeader}`}>
{title}
</h1>
<button className={styles.cancelButton} aria-label="Close" onClick={this.props.cancel} />
<div className={styles.cancelButtonOutline} role="presentation"></div>
<header className={`${titleClassName}`} id="dialog-heading">
{title}
</header>
{filterChildren(children, child => hmrSafeNameComparison(child.type, DialogFooter, true))}
{filterChildren(children, child => hmrSafeNameComparison(child.type, DialogFooter))}
</div>
Expand Down