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

Status bar spinner is white in light themes and hard to see #46083

Merged
merged 1 commit into from
Mar 19, 2018
Merged

Status bar spinner is white in light themes and hard to see #46083

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
2 changes: 1 addition & 1 deletion src/vs/workbench/browser/parts/editor/editorPart.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -550,7 +550,7 @@ export class EditorPart extends Part implements IEditorPart, IEditorGroupService
if (this.partService.isCreated() && !errors.isPromiseCanceledError(error)) {
const actions: INotificationActions = { primary: [] };
if (errors.isErrorWithActions(error)) {
actions.primary = error.actions;
actions.primary = (error as errors.IErrorWithActions).actions;
}

const handle = this.notificationService.notify({
Expand Down
2 changes: 1 addition & 1 deletion src/vs/workbench/services/configuration/node/configuration.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ export class FolderConfiguration extends Disposable {
for (let i = 0, len = events.length; i < len; i++) {
const resource = events[i].resource;
const isJson = paths.extname(resource.fsPath) === '.json';
const isDeletedSettingsFolder = (events[i].type === FileChangeType.DELETED && paths.isEqual(paths.basename(resource.fsPath), this.configFolderRelativePath));
const isDeletedSettingsFolder = (events[i].type === FileChangeType.DELETED && paths.basename(resource.fsPath) === this.configFolderRelativePath);
if (!isJson && !isDeletedSettingsFolder) {
continue; // only JSON files or the actual settings folder
}
Expand Down
31 changes: 0 additions & 31 deletions src/vs/workbench/services/progress/browser/media/progress.svg
View file
Open in desktop

This file was deleted.

10 changes: 5 additions & 5 deletions src/vs/workbench/services/progress/browser/media/progressService2.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
*--------------------------------------------------------------------------------------------*/

.monaco-workbench > .part.statusbar > .statusbar-item.progress {
background-image: url(progress.svg);
background-repeat: no-repeat;
background-position: left;
padding-left: 14px;
display: inline;
padding-left: 5px;
}

.monaco-workbench > .part.statusbar > .statusbar-item.progress .spinner-container {
padding-right: 5px;
}

.monaco-workbench .progress-badge > .badge-content {
Expand Down
18 changes: 17 additions & 1 deletion src/vs/workbench/services/progress/browser/progressService2.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,25 @@ class WindowProgressItem implements IStatusbarItem {

render(element: HTMLElement): IDisposable {
this._element = element;
this._label = new OcticonLabel(this._element);
this._element.classList.add('progress');

const container = document.createElement('span');
this._element.appendChild(container);

const spinnerContainer = document.createElement('span');
spinnerContainer.classList.add('spinner-container');
container.appendChild(spinnerContainer);

const spinner = new OcticonLabel(spinnerContainer);
spinner.text = '$(sync~spin)';

const labelContainer = document.createElement('span');
container.appendChild(labelContainer);

this._label = new OcticonLabel(labelContainer);

this.hide();

return null;
}

Expand Down