Skip to content

Commit

Permalink
Fixed some minor styling issues with the JSON inspector. (#1691)
Browse files Browse the repository at this point in the history
  • Loading branch information
tonyanziano authored and cwhitten committed Jul 17, 2019
1 parent d4ea424 commit fc36309
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 80 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## Unreleased

## Fixed
- [client] Fixed some minor styling issues with the JSON inspector in PR [1691](https://github.com/microsoft/BotFramework-Emulator/pull/1691)
- [client] Fixed issue where html errors were being displayed incorrectly in PR [1687](https://github.com/microsoft/BotFramework-Emulator/pull/1687/files)
- [client] Fixed an issue where webSpeechFactories in store were being set to null in PR [1685](https://github.com/microsoft/BotFramework-Emulator/pull/1685)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
background-color: transparent;
font-weight: normal;

&:hover:not([disabled]), &[selected], &[aria-selected] {
&:hover:not([disabled]), &[selected], &[aria-selected], &[name="json"] {
background-color: transparent;
position: relative;

Expand Down Expand Up @@ -61,13 +61,15 @@
}

.left-arrow {
background-image: url('../../../../media/ic_next_copy.svg');
background-image: url('../../../../media/ic_next.svg');
background-position: 50% 50%;
transform: rotate(180deg);
}

.left-arrow-selected {
background-image: url('../../../../media/ic_next_copy.svg');
background-image: url('../../../../media/ic_next.svg');
background-position: 50% 50%;
transform: rotate(180deg);
}

.right-arrow {
Expand Down
48 changes: 12 additions & 36 deletions packages/app/client/src/ui/media/ic_next.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
37 changes: 0 additions & 37 deletions packages/app/client/src/ui/media/ic_next_copy.svg

This file was deleted.

8 changes: 4 additions & 4 deletions packages/extensions/json/bf-extension.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@
"id": "json",
"states": {
"default": {
"label": "Json"
"label": "JSON"
},
"selected": {
"label": "Json",
"label": "JSON",
"aria-selected": true
}
}
Expand Down Expand Up @@ -71,10 +71,10 @@
"id": "diff",
"states": {
"default": {
"label": "Show Diff"
"label": "Show diff"
},
"selected": {
"label": "Hide Diff",
"label": "Hide diff",
"aria-selected": true
},
"disabled": {
Expand Down

0 comments on commit fc36309

Please sign in to comment.