Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

#1743 - Fix endpoint notify text color #1827

Merged
merged 8 commits into from
Sep 4, 2019
Merged

#1743 - Fix endpoint notify text color #1827

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
cf3cf5d
#1743 - Fix endpiont notify text color
corinagum Sep 4, 2019
2b02268
Update CHANGELOG.md
corinagum Sep 4, 2019
bcbf298
Fix endpoint warning color via themes
corinagum Sep 4, 2019
16d3b54
Merge branch 'master' into corinagum/1743
corinagum Sep 4, 2019
73090c7
Merge branch 'master' into corinagum/1743
corinagum Sep 4, 2019
039cfae
Merge branch 'master' into corinagum/1743
corinagum Sep 4, 2019
e13eaa1
Apply PR Feedback
corinagum Sep 4, 2019
f9dcda0
Merge branch 'corinagum/1743' of github.com:microsoft/BotFramework-Em…
corinagum Sep 4, 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 @@ -27,6 +27,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- [1787](https://github.com/microsoft/BotFramework-Emulator/pull/1787)
- [1790](https://github.com/microsoft/BotFramework-Emulator/pull/1790)
- [1791](https://github.com/microsoft/BotFramework-Emulator/pull/1791)
- [1827](https://github.com/microsoft/BotFramework-Emulator/pull/1827)
- [1828](https://github.com/microsoft/BotFramework-Emulator/pull/1828)

## v4.5.2 - 2019 - 07 - 17
Expand Down
2 changes: 1 addition & 1 deletion packages/app/client/src/ui/dialogs/botCreationDialog/botCreationDialog.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

.endpoint-warning {
height: 11px;
color: var(--warning-outline);
color: var(--endpoint-warning);
font-family: var(--default-font-family);
font-size: 11px;
line-height: 11px;
Expand Down
1 change: 1 addition & 0 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 @@ -25,6 +25,7 @@ html {
--error-text: #F48771;
--error-bg: #5A1D1D;
--error-outline: #BE1100;
--endpoint-warning: var(--neutral-14);

/* webchat overridden colors */
/* activity bubbles */
Expand Down
1 change: 1 addition & 0 deletions 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 @@ -25,6 +25,7 @@ html {
--error-text: #F48771;
--error-bg: #F2DEDE;
--error-outline: #BE1100;
--endpoint-warning: var(--neutral-1);

/* webchat overridden colors */
/* activity bubbles */
Expand Down
1 change: 1 addition & 0 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 @@ -23,6 +23,7 @@ html {
--error-text: #A1260D;
--error-bg: #F2DEDE;
--error-outline: #BE1100;
--endpoint-warning: var(--neutral-14);

/* webchat overridden colors */
/* activity bubbles */
Expand Down
2 changes: 1 addition & 1 deletion packages/sdk/ui-react/src/widget/autoComplete/autoComplete.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
position: absolute;
top: calc(100% + 2px);
left: 0;
color: var(--error-text);
color: var(--endpoint-warning);
corinagum marked this conversation as resolved.
Show resolved Hide resolved
}
}

Expand Down