Просмотр исходного кода

Fixes unicode font issue on mac

main
Eric Amodio 3 лет назад
Родитель
Сommit
3efa4f281a
3 измененных файлов: 12 добавлений и 12 удалений
  1. +4
    -4
      CHANGELOG.md
  2. +4
    -4
      README.md
  3. +4
    -4
      src/views/viewDecorationProvider.ts

+ 4
- 4
CHANGELOG.md Просмотреть файл

@ -71,10 +71,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
- Adds new status indicators (decorations), on the right, and themeable colorizations to branches in the views
- `✓` — indicates that the branch is the current branch
- `` + green colorization — indicates that the branch has unpushed changes (ahead)
- `` + red colorization — indicates that the branch has unpulled changes (behind)
- `⮟⮝` + yellow colorization — indicates that the branch has diverged from its upstream; meaning it has both unpulled and unpushed changes
- `+` + green colorization — indicates that the branch hasn't yet been published to an upstream remote
- `` + green colorization — indicates that the branch has unpushed changes (ahead)
- `` + red colorization — indicates that the branch has unpulled changes (behind)
- `▼▲` + yellow colorization — indicates that the branch has diverged from its upstream; meaning it has both unpulled and unpushed changes
- `+` + green colorization — indicates that the branch hasn't yet been published to an upstream remote
- Adds new status indicators (decorations), on the right, and themeable colorizations to files in the views
- `M` — indicates that the file is/was modified
- `A` + green colorization — indicates that the file is/was added

+ 4
- 4
README.md Просмотреть файл

@ -380,10 +380,10 @@ The _Branches_ view lists all of the local branches, and additionally provides,
- _Yellow dot_ — both unpushed and unpulled changes
- status indicators (decorations), on the right, and themeable colorizations
- `✓` — indicates that the branch is the current branch
- `` + green colorization — indicates that the branch has unpushed changes (ahead)
- `` + red colorization — indicates that the branch has unpulled changes (behind)
- `⮟⮝` + yellow colorization — indicates that the branch has diverged from its upstream; meaning it has both unpulled and unpushed changes
- `+` + green colorization — indicates that the branch hasn't yet been published to an upstream remote
- `` + green colorization — indicates that the branch has unpushed changes (ahead)
- `` + red colorization — indicates that the branch has unpulled changes (behind)
- `▼▲` + yellow colorization — indicates that the branch has diverged from its upstream; meaning it has both unpulled and unpushed changes
- `+` + green colorization — indicates that the branch hasn't yet been published to an upstream remote
- `!` + dark red colorization — indicates that the branch has a missing upstream (e.g. the upstream branch was deleted)
- a branch comparison tool (**Compare <branch> with <branch, tag, or ref>**) — [optionally](#branches-view-settings- 'Jump to the Branches view settings') shows a comparison of the branch to a user-selected reference
- **Behind** — lists the commits that are missing from the branch (i.e. behind) but exist in the selected reference

+ 4
- 4
src/views/viewDecorationProvider.ts Просмотреть файл

@ -116,19 +116,19 @@ export class ViewFileDecorationProvider implements FileDecorationProvider, Dispo
switch (status as GitBranchStatus) {
case GitBranchStatus.Ahead:
return {
badge: '',
badge: '',
color: new ThemeColor('gitlens.decorations.branchAheadForegroundColor'),
tooltip: 'Ahead',
};
case GitBranchStatus.Behind:
return {
badge: '',
badge: '',
color: new ThemeColor('gitlens.decorations.branchBehindForegroundColor'),
tooltip: 'Behind',
};
case GitBranchStatus.Diverged:
return {
badge: '⮟⮝',
badge: '▼▲',
color: new ThemeColor('gitlens.decorations.branchDivergedForegroundColor'),
tooltip: 'Diverged',
};
@ -146,7 +146,7 @@ export class ViewFileDecorationProvider implements FileDecorationProvider, Dispo
};
case GitBranchStatus.Unpublished:
return {
badge: '+',
badge: '+',
color: new ThemeColor('gitlens.decorations.branchUnpublishedForegroundColor'),
tooltip: 'Unpublished',
};

Загрузка…
Отмена
Сохранить