ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-01-21 01:25:37 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode c58aaab8a1cc22a7139b761166a0d4f37d41e998 (#7880)

Browse Source 
* Merge from vscode c58aaab8a1cc22a7139b761166a0d4f37d41e998

* fix pipelines

* fix strict-null-checks

* add missing files
This commit is contained in:
Anthony Dresser
2019-10-21 22:12:22 -07:00
committed by GitHub
parent 7c9be74970
commit 1e22f47304
913 changed files with 18898 additions and 16536 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/vs/base/browser/ui/selectBox/selectBoxCustom.ts
View File

@@ -381,22 +381,22 @@ export class SelectBoxList extends Disposable implements ISelectBoxDelegate, ILi
// Style parent select
// {{SQL CARBON EDIT}}
let background: Color | undefined = undefined;
let foreground: Color | undefined = undefined;
let border: Color | undefined = undefined;
let background = '';
let foreground = '';
let border = '';
if (this.selectElement) {
if (this.selectElement.disabled) {
background = (<any>this.styles).disabledSelectBackground;
foreground = (<any>this.styles).disabledSelectForeground;
background = (<any>this.styles).disabledSelectBackground ? (<any>this.styles).disabledSelectBackground.toString() : '';
foreground = (<any>this.styles).disabledSelectForeground ? (<any>this.styles).disabledSelectForeground.toString() : '';
} else {
background = this.styles.selectBackground;
foreground = this.styles.selectForeground;
border = this.styles.selectBorder;
background = this.styles.selectBackground ? this.styles.selectBackground.toString() : '';
foreground = this.styles.selectForeground ? this.styles.selectForeground.toString() : '';
border = this.styles.selectBorder ? this.styles.selectBorder.toString() : '';
}
this.selectElement.style.backgroundColor = background ? background.toString() : null;
this.selectElement.style.color = foreground ? foreground.toString() : null;
this.selectElement.style.borderColor = border ? border.toString() : null;
this.selectElement.style.backgroundColor = background;
this.selectElement.style.color = foreground;
this.selectElement.style.borderColor = border;
}
// Style drop down select list (non-native mode only)
@@ -408,10 +408,10 @@ export class SelectBoxList extends Disposable implements ISelectBoxDelegate, ILi
private styleList() {
if (this.selectList) {
let background = this.styles.selectBackground ? this.styles.selectBackground.toString() : null;
const background = this.styles.selectBackground ? this.styles.selectBackground.toString() : '';
this.selectList.style({});
let listBackground = this.styles.selectListBackground ? this.styles.selectListBackground.toString() : background;
const listBackground = this.styles.selectListBackground ? this.styles.selectListBackground.toString() : background;
this.selectDropDownListContainer.style.backgroundColor = listBackground;
this.selectionDetailsPane.style.backgroundColor = listBackground;
const optionsBorder = this.styles.focusBorder ? this.styles.focusBorder.toString() : '';