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

Jump to bottom

[#1976] Fixed color contrast issues with links and prev/next diff buttons. #2019

Merged
merged 1 commit into from
Dec 9, 2019
Merged

[#1976] Fixed color contrast issues with links and prev/next diff buttons. #2019

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
- [2010](https://github.com/microsoft/BotFramework-Emulator/pull/2010)
- [2012](https://github.com/microsoft/BotFramework-Emulator/pull/2012)
- [2017](https://github.com/microsoft/BotFramework-Emulator/pull/2017)
- [2019](https://github.com/microsoft/BotFramework-Emulator/pull/2019)

- [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
20 changes: 12 additions & 8 deletions packages/app/client/src/ui/editor/emulator/parts/inspector/inspector.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,23 +65,27 @@
}

.left-arrow {
background-image: url('../../../../media/ic_next.svg');
background-position: 50% 50%;
background-color: var(--accessory-button-icon-color);
-webkit-mask: url('../../../../media/ic_next.svg') no-repeat 50% 50%;
-webkit-mask-size: 16px;
transform: rotate(180deg);
}

.left-arrow-selected {
background-image: url('../../../../media/ic_next.svg');
background-position: 50% 50%;
background-color: var(--accessory-button-icon-color);
-webkit-mask: url('../../../../media/ic_next.svg') no-repeat 50% 50%;
-webkit-mask-size: 16px;
transform: rotate(180deg);
}

.right-arrow {
background-image: url('../../../../media/ic_next.svg');
background-position: 50% 50%;
background-color: var(--accessory-button-icon-color);
-webkit-mask: url('../../../../media/ic_next.svg') no-repeat 50% 50%;
-webkit-mask-size: 16px;
}

.right-arrow-selected {
background-image: url('../../../../media/ic_next.svg');
background-position: 50% 50%;
background-color: var(--accessory-button-icon-color);
-webkit-mask: url('../../../../media/ic_next.svg') no-repeat 50% 50%;
-webkit-mask-size: 16px;
}
2 changes: 1 addition & 1 deletion packages/app/client/src/ui/shell/explorer/botNotOpenExplorer/botNotOpenExplorer.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
}

.explorer-link {
color: var(--dialog-link-color);
color: var(--explorer-link-color);
}

.explorer-empty-state {
Expand Down
2 changes: 1 addition & 1 deletion packages/app/client/src/ui/shell/explorer/resourceExplorer/resourceExplorer.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ ul > li > input[type="text"] {
}

.explorer-link {
color: var(--dialog-link-color);
color: var(--explorer-link-color);
text-decoration: none;
line-height: 20px;
}
Expand Down
2 changes: 1 addition & 1 deletion packages/app/client/src/ui/shell/explorer/servicesExplorer/servicesExplorer.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ ul > li > svg {
}

.explorer-link {
color: var(--dialog-link-color);
color: var(--explorer-link-color);
text-decoration: none;
line-height: 20px;
}
Expand Down
4 changes: 3 additions & 1 deletion 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 @@ -164,6 +164,7 @@ html {
--explorer-panel-group-title-color: var(--neutral-4);
--explorer-panel-group-border: 1px solid transparent;
--explorer-panel-empty-message-color: var(--neutral-5);
--explorer-link-color: #40A6FF;

/* Explorer Bar */
--explorer-bar-header-bg: var(--neutral-14);
Expand Down Expand Up @@ -220,7 +221,7 @@ html {
--status-bar-color: #FFFFFF;

/* Links */
--link-color: #3062D6;
--link-color: #3794FF;
--link-color-disabled: #C8C8C8;
--inspector-link-color: #75BEFF;

Expand Down Expand Up @@ -249,6 +250,7 @@ html {

/* accessory buttons */
--accessory-button-color: var(--neutral-5);
--accessory-button-icon-color: var(--link-color);

/* Auto Complete */
--auto-complete-results-opacity: 0.9;
Expand Down
2 changes: 2 additions & 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 @@ -163,6 +163,7 @@ html {
--explorer-panel-group-title-color: var(--neutral-1);
--explorer-panel-group-border: 1px solid #72C3DF;
--explorer-panel-empty-message-color: var(--neutral-4);
--explorer-link-color: var(--link-color);

/* Explorer Bar */
--explorer-bar-header-bg: var(--neutral-16);
Expand Down Expand Up @@ -248,6 +249,7 @@ html {

/* Inspector accessory buttons */
--accessory-button-color: var(--neutral-5);
--accessory-button-icon-color: #72C3DF;

/* Auto Complete */
--auto-complete-results-opacity: 1;
Expand Down
2 changes: 2 additions & 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 @@ -163,6 +163,7 @@ html {
--explorer-panel-group-border: 1px solid transparent;
--explorer-panel-empty-message-color: var(--neutral-15);
--service-panescrollbar-color: var(--neutral-13);
--explorer-link-color: var(--dialog-link-color);

/* Explorer Bar */
--explorer-bar-header-bg: var(--neutral-3);
Expand Down Expand Up @@ -249,6 +250,7 @@ html {

/* Inspector accessory buttons */
--accessory-button-color: var(--s-button-color);
--accessory-button-icon-color: var(--link-color);

/* Auto Complete */
--auto-complete-results-opacity: 0.9;
Expand Down