development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-10-04 02:14:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

use commit-icon for description, tweak codicon font-size (#155714)

Browse source 
https://github.com/microsoft/vscode/issues/150863
This commit is contained in:
Johannes Rieken 2022-07-20 13:49:24 +02:00 committed by GitHub
parent 7a1f7101db
commit ce5d92e998
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
extensions/git/src/commands.ts
View file

@ -432,11 +432,11 @@ export class CommandCenter {
]);
// ours (current branch and commit)
ours.detail = head.refNames.map(s => s.replace(/^HEAD ->/, '')).join(', ');
ours.description = head.hash.substring(0, 7);
ours.description = '$(git-commit) ' + head.hash.substring(0, 7);
// theirs
theirs.detail = rebaseOrMergeHead.refNames.join(', ');
theirs.description = rebaseOrMergeHead.hash.substring(0, 7);
theirs.description = '$(git-commit) ' + rebaseOrMergeHead.hash.substring(0, 7);
} catch (error) {
// not so bad, can continue with just uris

4
src/vs/workbench/contrib/mergeEditor/browser/view/media/mergeEditor.css
View file

@ -31,6 +31,10 @@
flex-shrink: 0;
}
.monaco-workbench .merge-editor .code-view > .title>SPAN.detail .codicon {
font-size: 13px;
}
.monaco-workbench .merge-editor .code-view > .container {
display: flex;
flex-direction: row;