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

[#1771] DefaultButton a11y styling fixes #1927

Merged
merged 2 commits into from
Oct 15, 2019
Merged

[#1771] DefaultButton a11y styling fixes #1927

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
57d1abf
DefaultButton styling fixes
corinagum Oct 14, 2019
0a0716e
Update CHANGELOG.md
corinagum Oct 14, 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
3 changes: 2 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- [1921](https://github.com/microsoft/BotFramework-Emulator/pull/1921)
- [1923](https://github.com/microsoft/BotFramework-Emulator/pull/1923)
- [1924](https://github.com/microsoft/BotFramework-Emulator/pull/1924)
- [1924](https://github.com/microsoft/BotFramework-Emulator/pull/1925)
- [1925](https://github.com/microsoft/BotFramework-Emulator/pull/1925)
- [1927](https://github.com/microsoft/BotFramework-Emulator/pull/1927)

- [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
14 changes: 7 additions & 7 deletions packages/app/client/src/ui/styles/themes/dark.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,15 +125,15 @@ html {
/* secondary button */
--s-button-color: var(--neutral-15);
--s-button-color-disabled: var(--neutral-3);
--s-button-border: 1px solid transparent;
--s-button-border-focused: var(--p-button-border-focus);
--s-button-border-hover: 1px solid transparent;
--s-button-border-active: 1px solid transparent;
--s-button-border: 1px solid #8A8886;
--s-button-border-focused: 1px solid transparent;
--s-button-border-hover: 1px solid #8A8886;
--s-button-border-active: 1px solid #8A8886;
--s-button-border-disabled: 1px solid transparent;
--s-button-opacity-disabled: 1;
--s-button-bg: var(--neutral-3);
--s-button-bg-focus: var(--neutral-3);
--s-button-bg-hover: var(--neutral-4);
--s-button-bg: var(--neutral-1);
--s-button-bg-focus: var(--neutral-1);
--s-button-bg-hover: #F3F2F1;
--s-button-bg-active: var(--neutral-5);
--s-button-bg-disabled: var(--neutral-2);

Expand Down
2 changes: 1 addition & 1 deletion packages/app/client/src/ui/styles/themes/high-contrast.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ html {
--p-button-color: var(--neutral-2);
--p-button-border: 1px solid #72C3DF;
--p-button-border-focus: 1px solid #F38518;
--p-button-border-hover: 1px solid rgb(2, 2, 2);
--p-button-border-hover: 1px dashed #F38518;
--p-button-border-active: var(--p-button-border);
--p-button-border-disabled: var(--p-button-border);
--p-button-opacity-disabled: .4;
Expand Down
14 changes: 7 additions & 7 deletions packages/app/client/src/ui/styles/themes/light.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,15 +123,15 @@ html {
/* secondary button */
--s-button-color: var(--neutral-15);
--s-button-color-disabled: var(--neutral-3);
--s-button-border: 1px solid transparent;
--s-button-border-focused: var(--p-button-border-focus);
--s-button-border-hover: 1px solid transparent;
--s-button-border-active: 1px solid transparent;
--s-button-border: 1px solid #8A8886;
--s-button-border-focused: 1px solid transparent;
--s-button-border-hover: 1px solid #8A8886;
--s-button-border-active: 1px solid #8A8886;
--s-button-border-disabled: 1px solid transparent;
--s-button-opacity-disabled: 1;
--s-button-bg: var(--neutral-3);
--s-button-bg-focus: var(--neutral-3);
--s-button-bg-hover: var(--neutral-4);
--s-button-bg: var(--neutral-1);
--s-button-bg-focus: var(--neutral-1);
--s-button-bg-hover: #F3F2F1;
--s-button-bg-active: var(--neutral-5);
--s-button-bg-disabled: var(--neutral-2);

Expand Down
2 changes: 1 addition & 1 deletion packages/sdk/ui-react/src/widget/button/button.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
background-color: var(--s-button-bg);

&::after {
border: var(--p-button-border);
border: var(--s-button-border);
}

&[disabled], &[aria-disabled] {
Expand Down