From 3efa4f281a473ed584be86c188911d98ea43792e Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Mon, 14 Jun 2021 00:24:59 -0400 Subject: [PATCH] Fixes unicode font issue on mac --- CHANGELOG.md | 8 ++++---- README.md | 8 ++++---- src/views/viewDecorationProvider.ts | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 791c639..42d6b73 100644 --- a/CHANGELOG.md +++ b/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 diff --git a/README.md b/README.md index 424c4cd..c92059b 100644 --- a/README.md +++ b/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 diff --git a/src/views/viewDecorationProvider.ts b/src/views/viewDecorationProvider.ts index 839fa29..fa451e3 100644 --- a/src/views/viewDecorationProvider.ts +++ b/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', };