From 3ad7eb07f8c4a2411befe193605d7a9879dbb384 Mon Sep 17 00:00:00 2001 From: Miguel Solorio Date: Thu, 7 Nov 2019 09:53:23 -0800 Subject: [PATCH] Update Codicons: rename tree list modes, add filter funnel, center sync https://github.com/microsoft/vscode-codicons/commit/5131e329ebb7d7a0de10e9216da5c492115a41a1 --- cgmanifest.json | 2 +- .../ui/codiconLabel/codicon/codicon.css | 9 ++++++--- .../ui/codiconLabel/codicon/codicon.ttf | Bin 46104 -> 46340 bytes .../contrib/scm/browser/repositoryPanel.ts | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/cgmanifest.json b/cgmanifest.json index fb801c0b7cb..26d9aedc6f4 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -98,7 +98,7 @@ "git": { "name": "vscode-codicons", "repositoryUrl": "https://github.com/microsoft/vscode-codicons", - "commitHash": "1f8534396cda86d3fa199b0e45ce110b55d794d0" + "commitHash": "80ab77cb1b19c55cb7300bcb8f76fe43e5fbd427" } }, "license": "MIT and Creative Commons Attribution 4.0", diff --git a/src/vs/base/browser/ui/codiconLabel/codicon/codicon.css b/src/vs/base/browser/ui/codiconLabel/codicon/codicon.css index 1c899992d0b..d53e5205254 100644 --- a/src/vs/base/browser/ui/codiconLabel/codicon/codicon.css +++ b/src/vs/base/browser/ui/codiconLabel/codicon/codicon.css @@ -5,7 +5,7 @@ @font-face { font-family: "codicon"; - src: url("./codicon.ttf?f5d7d29fe5677c620f764a26698d7611") format("truetype"); + src: url("./codicon.ttf?be9fd17e767606dd03a4a6ea35903317") format("truetype"); } .codicon[class*='codicon-'] { @@ -336,7 +336,6 @@ .codicon-screen-full:before { content: "\eb4c" } .codicon-screen-normal:before { content: "\eb4d" } .codicon-search-stop:before { content: "\eb4e" } -.codicon-selection:before { content: "\eb4f" } .codicon-server:before { content: "\eb50" } .codicon-settings-gear:before { content: "\eb51" } .codicon-settings:before { content: "\eb52" } @@ -387,4 +386,8 @@ .codicon-window:before { content: "\eb7f" } .codicon-word-wrap:before { content: "\eb80" } .codicon-zoom-in:before { content: "\eb81" } -.codicon-zoom-out:before { content: "\f101" } +.codicon-zoom-out:before { content: "\eb82" } +.codicon-list-filter:before { content: "\eb83" } +.codicon-list-flat:before { content: "\eb84" } +.codicon-list-selection:before { content: "\eb85" } +.codicon-list-tree:before { content: "\eb85" } diff --git a/src/vs/base/browser/ui/codiconLabel/codicon/codicon.ttf b/src/vs/base/browser/ui/codiconLabel/codicon/codicon.ttf index 9726457a2352b92707a9e41ce0adfc809bc88945..8737b0d00d575b46894347649a47f3d374001a11 100644 GIT binary patch delta 3121 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 CUMyDt diff --git a/src/vs/workbench/contrib/scm/browser/repositoryPanel.ts b/src/vs/workbench/contrib/scm/browser/repositoryPanel.ts index a1c746e55cb..003c862a320 100644 --- a/src/vs/workbench/contrib/scm/browser/repositoryPanel.ts +++ b/src/vs/workbench/contrib/scm/browser/repositoryPanel.ts @@ -571,7 +571,7 @@ export class ToggleViewModeAction extends Action { } private onDidChangeMode(mode: ViewModelMode): void { - const iconClass = mode === ViewModelMode.List ? 'codicon-filter' : 'codicon-selection'; + const iconClass = mode === ViewModelMode.List ? 'codicon-list-filter' : 'codicon-list-selection'; this.class = `scm-action toggle-view-mode ${iconClass}`; } }