提交 cf6efa68 编写于 作者: J João Moreno

SCM UX exploration #101103

上级 8d699df7
......@@ -15,9 +15,6 @@
.scm-view .count {
display: flex;
}
.scm-view .count {
margin-left: 6px;
}
......@@ -39,6 +36,10 @@
overflow: hidden;
}
.scm-view .scm-provider > .label > .name {
font-weight: bold;
}
.scm-view .scm-provider > .label > .description {
opacity: 0.7;
margin-left: 0.5em;
......
......@@ -6,7 +6,7 @@
import 'vs/css!./media/scm';
import { Event, Emitter } from 'vs/base/common/event';
import { basename, dirname, isEqual } from 'vs/base/common/resources';
import { IDisposable, Disposable, DisposableStore, combinedDisposable, toDisposable } from 'vs/base/common/lifecycle';
import { IDisposable, Disposable, DisposableStore, combinedDisposable } from 'vs/base/common/lifecycle';
import { ViewPane, IViewPaneOptions } from 'vs/workbench/browser/parts/views/viewPaneContainer';
import { append, $, addClass, toggleClass, removeClass, Dimension } from 'vs/base/browser/dom';
import { IListVirtualDelegate, IIdentityProvider } from 'vs/base/browser/ui/list/list';
......@@ -176,10 +176,7 @@ class RepositoryRenderer implements ICompressibleTreeRenderer<ISCMRepository, Fu
renderTemplate(container: HTMLElement): RepositoryTemplate {
// hack
const row = container.parentElement!.parentElement!;
addClass(row.querySelector('.monaco-tl-twistie')! as HTMLElement, 'force-twistie');
addClass(row, 'scm-provider-row');
const rowDisposable = toDisposable(() => removeClass(row, 'scm-provider-row'));
addClass(container.parentElement!.parentElement!.querySelector('.monaco-tl-twistie')! as HTMLElement, 'force-twistie');
const provider = append(container, $('.scm-provider'));
const label = append(provider, $('.label'));
......@@ -193,7 +190,7 @@ class RepositoryRenderer implements ICompressibleTreeRenderer<ISCMRepository, Fu
const visibilityDisposable = toolBar.onDidChangeDropdownVisibility(e => toggleClass(provider, 'active', e));
const disposable = Disposable.None;
const templateDisposable = combinedDisposable(rowDisposable, visibilityDisposable, toolBar, badgeStyler);
const templateDisposable = combinedDisposable(visibilityDisposable, toolBar, badgeStyler);
return { name, description, countContainer, count, toolBar, disposable, templateDisposable };
}
......@@ -1885,9 +1882,4 @@ registerThemingParticipant((theme, collector) => {
if (repositoryStatusActionsBorderColor) {
collector.addRule(`.scm-view .scm-provider > .status > .monaco-action-bar > .actions-container { border-color: ${repositoryStatusActionsBorderColor}; }`);
}
const providerSeparatorBorderColor = theme.getColor(scmProviderSeparatorBorderColor);
if (providerSeparatorBorderColor) {
collector.addRule(`.scm-view .scm-provider-row:not([data-index="0"]) { border-top: 1px dashed ${providerSeparatorBorderColor}; }`);
}
});
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册