Skip to content

Merge master again into ds/custom_editor #10295

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

Merged
Don Jayamanne (DonJayamanne) merged 12 commits into from
Feb 24, 2020
Merged

Merge master again into ds/custom_editor #10295

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
97f9fd5
fixing a typo in CONTRIBUTING.md (#10044)
panpan-lin Feb 20, 2020
348e85a
fix for button backgrounds (#10234)
IanMatthewHuff Feb 20, 2020
2a8c475
add kernel connection sys info string (#10236)
IanMatthewHuff Feb 21, 2020
ae86ae4
Fix to return env variables of interpreter that is not current interp…
DonJayamanne Feb 21, 2020
8e67028
Support jupyter output in the remote scenario too (#10241)
rchiodo Feb 21, 2020
3f1fb0a
Skip flaky FS test (#10244)
DonJayamanne Feb 21, 2020
7d4995d
Switch experiments settings scope to machine (#10237)
karthiknadig Feb 21, 2020
e60bdc1
Show quickfixes for launch.json (#10245)
Feb 21, 2020
71ba3bb
Reduce the number of build agents used by CI. (#10221)
Feb 21, 2020
d084c47
Improve the perf of functional tests running with real jupyter (#10242)
rchiodo Feb 21, 2020
4883cff
Merge release branch into master (#10258)
karthiknadig Feb 24, 2020
eee1d49
Merge branch 'master' into mergeMasterAgain
DonJayamanne Feb 24, 2020
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
Prev Previous commit
Next Next commit
fix for button backgrounds (#10234)
  • Loading branch information
@IanMatthewHuff
IanMatthewHuff authored Feb 20, 2020
commit 348e85a2e91cd15b7665b280033ab781212e67ca
1 change: 1 addition & 0 deletions news/2 Fixes/10154.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Correct image backgrounds for notebook editor.
2 changes: 1 addition & 1 deletion src/datascience-ui/native-editor/nativeEditor.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@

.native-button {
margin-top: 3px;
background: var(--override-background, var(--vscode-editor-background));
background: transparent;
z-index: 10;
}

Expand Down
2 changes: 1 addition & 1 deletion src/datascience-ui/react-common/imageButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export class ImageButton extends React.Component<IImageButtonProps> {

public render() {
const classNames = `image-button image-button-${this.props.baseTheme} ${this.props.hidden ? 'hide' : ''} ${
this.props.className
this.props.className ? this.props.className : ''
}`;
const innerFilter = this.props.disabled ? 'image-button-inner-disabled-filter' : '';
const ariaDisabled = this.props.disabled ? 'true' : 'false';
Expand Down