Skip to content

Commit 40a198a

Browse files
committed
Removes duplicated codicons from glicons
1 parent 2dbaa3d commit 40a198a

File tree

18 files changed

+84
-168
lines changed

18 files changed

+84
-168
lines changed

images/icons/diff-multiple.svg

Lines changed: 0 additions & 1 deletion
This file was deleted.

images/icons/diff-single.svg

Lines changed: 0 additions & 1 deletion
This file was deleted.

images/icons/repo-fetch.svg

Lines changed: 0 additions & 1 deletion
This file was deleted.

images/icons/repo-force-push.svg

Lines changed: 0 additions & 1 deletion
This file was deleted.

images/icons/repo-pull.svg

Lines changed: 0 additions & 1 deletion
This file was deleted.

images/icons/repo-push.svg

Lines changed: 0 additions & 1 deletion
This file was deleted.

images/icons/template/mapping.json

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
"switch": 61720,
2828
"expand": 61721,
2929
"list-auto": 61722,
30-
"repo-force-push": 61723,
3130
"pinned-filled": 61724,
3231
"clock": 61725,
3332
"provider-azdo": 61726,
@@ -46,11 +45,6 @@
4645
"repository-filled": 61739,
4746
"gitlens-filled": 61740,
4847
"code-suggestion": 61741,
49-
"diff-multiple": 61742,
50-
"diff-single": 61743,
51-
"repo-fetch": 61744,
52-
"repo-pull": 61745,
53-
"repo-push": 61746,
5448
"provider-jira": 61747,
5549
"play-button": 61748,
5650
"rocket-filled": 61749,

package.json

Lines changed: 12 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -7014,21 +7014,21 @@
70147014
"command": "gitlens.fetchRepositories",
70157015
"title": "Fetch",
70167016
"category": "GitLens",
7017-
"icon": "$(gitlens-repo-fetch)",
7017+
"icon": "$(repo-fetch)",
70187018
"enablement": "!operationInProgress"
70197019
},
70207020
{
70217021
"command": "gitlens.pullRepositories",
70227022
"title": "Pull",
70237023
"category": "GitLens",
7024-
"icon": "$(gitlens-repo-pull)",
7024+
"icon": "$(repo-pull)",
70257025
"enablement": "!operationInProgress"
70267026
},
70277027
{
70287028
"command": "gitlens.pushRepositories",
70297029
"title": "Push",
70307030
"category": "GitLens",
7031-
"icon": "$(gitlens-repo-push)",
7031+
"icon": "$(repo-push)",
70327032
"enablement": "!operationInProgress"
70337033
},
70347034
{
@@ -7112,7 +7112,7 @@
71127112
{
71137113
"command": "gitlens.views.fetch",
71147114
"title": "Fetch",
7115-
"icon": "$(gitlens-repo-fetch)",
7115+
"icon": "$(repo-fetch)",
71167116
"enablement": "!operationInProgress"
71177117
},
71187118
{
@@ -7130,19 +7130,19 @@
71307130
{
71317131
"command": "gitlens.views.pull",
71327132
"title": "Pull",
7133-
"icon": "$(gitlens-repo-pull)",
7133+
"icon": "$(repo-pull)",
71347134
"enablement": "!operationInProgress"
71357135
},
71367136
{
71377137
"command": "gitlens.views.push",
71387138
"title": "Push",
7139-
"icon": "$(gitlens-repo-push)",
7139+
"icon": "$(repo-push)",
71407140
"enablement": "!operationInProgress"
71417141
},
71427142
{
71437143
"command": "gitlens.views.pushWithForce",
71447144
"title": "Push (force)",
7145-
"icon": "$(gitlens-repo-force-push)",
7145+
"icon": "$(repo-force-push)",
71467146
"enablement": "!operationInProgress"
71477147
},
71487148
{
@@ -7482,7 +7482,7 @@
74827482
{
74837483
"command": "gitlens.views.pushToCommit",
74847484
"title": "Push to Commit...",
7485-
"icon": "$(gitlens-repo-push)",
7485+
"icon": "$(repo-push)",
74867486
"enablement": "!operationInProgress"
74877487
},
74887488
{
@@ -8829,25 +8829,25 @@
88298829
{
88308830
"command": "gitlens.graph.push",
88318831
"title": "Push",
8832-
"icon": "$(gitlens-repo-push)",
8832+
"icon": "$(repo-push)",
88338833
"enablement": "!operationInProgress"
88348834
},
88358835
{
88368836
"command": "gitlens.graph.pull",
88378837
"title": "Pull",
8838-
"icon": "$(gitlens-repo-pull)",
8838+
"icon": "$(repo-pull)",
88398839
"enablement": "!operationInProgress"
88408840
},
88418841
{
88428842
"command": "gitlens.graph.pushWithForce",
88438843
"title": "Push (force)",
8844-
"icon": "$(gitlens-repo-force-push)",
8844+
"icon": "$(repo-force-push)",
88458845
"enablement": "!operationInProgress"
88468846
},
88478847
{
88488848
"command": "gitlens.graph.fetch",
88498849
"title": "Fetch",
8850-
"icon": "$(gitlens-repo-fetch)",
8850+
"icon": "$(repo-fetch)",
88518851
"enablement": "!operationInProgress"
88528852
},
88538853
{
@@ -9513,13 +9513,6 @@
95139513
"fontCharacter": "\\f11a"
95149514
}
95159515
},
9516-
"gitlens-repo-force-push": {
9517-
"description": "repo-force-push icon",
9518-
"default": {
9519-
"fontPath": "dist/glicons.woff2",
9520-
"fontCharacter": "\\f11b"
9521-
}
9522-
},
95239516
"gitlens-pinned-filled": {
95249517
"description": "pinned-filled icon",
95259518
"default": {
@@ -9646,41 +9639,6 @@
96469639
"fontCharacter": "\\f12d"
96479640
}
96489641
},
9649-
"gitlens-diff-multiple": {
9650-
"description": "diff-multiple icon",
9651-
"default": {
9652-
"fontPath": "dist/glicons.woff2",
9653-
"fontCharacter": "\\f12e"
9654-
}
9655-
},
9656-
"gitlens-diff-single": {
9657-
"description": "diff-single icon",
9658-
"default": {
9659-
"fontPath": "dist/glicons.woff2",
9660-
"fontCharacter": "\\f12f"
9661-
}
9662-
},
9663-
"gitlens-repo-fetch": {
9664-
"description": "repo-fetch icon",
9665-
"default": {
9666-
"fontPath": "dist/glicons.woff2",
9667-
"fontCharacter": "\\f130"
9668-
}
9669-
},
9670-
"gitlens-repo-pull": {
9671-
"description": "repo-pull icon",
9672-
"default": {
9673-
"fontPath": "dist/glicons.woff2",
9674-
"fontCharacter": "\\f131"
9675-
}
9676-
},
9677-
"gitlens-repo-push": {
9678-
"description": "repo-push icon",
9679-
"default": {
9680-
"fontPath": "dist/glicons.woff2",
9681-
"fontCharacter": "\\f132"
9682-
}
9683-
},
96849642
"gitlens-provider-jira": {
96859643
"description": "provider-jira icon",
96869644
"default": {

src/commands/quickCommand.buttons.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ export const FeedbackQuickInputButton: QuickInputButton = {
7373
};
7474

7575
export const FetchQuickInputButton: QuickInputButton = {
76-
iconPath: new ThemeIcon('gitlens-repo-fetch'),
76+
iconPath: new ThemeIcon('repo-fetch'),
7777
tooltip: 'Fetch',
7878
};
7979

src/webviews/apps/commitDetails/components/gl-status-nav.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ export class GlStatusNav extends LitElement {
140140
<div class="group">
141141
<gl-tooltip hoist content="Fetch">
142142
<a href="#" class="commit-action" @click=${(e: MouseEvent) => this.handleAction(e, 'fetch')}
143-
><code-icon icon="gl-repo-fetch"></code-icon></a
143+
><code-icon icon="repo-fetch"></code-icon></a
144144
></gl-tooltip>
145145
</div>
146146
`;

0 commit comments

Comments
 (0)