Skip to content

Commit fabb54c

Browse files
eamodioeamodio
committed
Updates graph settings and highlights GL+ features
1 parent 9bf200b commit fabb54c

File tree

6 files changed

+75
-60
lines changed

6 files changed

+75
-60
lines changed

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
1010

1111
- Adds a banner to the _Commit Details_ view to let users know they can move the view to the Secondary Side Bar
1212

13+
### Updated
14+
15+
- Updates the _Commit Graph_ settings clarity and ordering
16+
1317
### Fixed
1418

1519
- Fixes [#2271](https://github.com/gitkraken/vscode-gitlens/issues/2271) - Terminal commands should wrap path with quote to deal with path contains space

‎package.json‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -2094,20 +2094,27 @@
20942094
"title": "Commit Graph",
20952095
"order": 105,
20962096
"properties": {
2097-
"gitlens.graph.avatars": {
2098-
"type": "boolean",
2099-
"default": true,
2100-
"markdownDescription": "Specifies whether to show avatar images instead of author initials and remote icons in the _Commit Graph_",
2097+
"gitlens.graph.defaultItemLimit": {
2098+
"type": "number",
2099+
"default": 500,
2100+
"markdownDescription": "Specifies the default number of items to show in the _Commit Graph_. Use 0 to specify no limit",
21012101
"scope": "window",
21022102
"order": 10
21032103
},
2104-
"gitlens.graph.highlightRowsOnRefHover": {
2105-
"type": "boolean",
2106-
"default": true,
2107-
"markdownDescription": "Specifies whether to highlight rows associated with the ref when hovering over it in the _Commit Graph_",
2104+
"gitlens.graph.pageItemLimit": {
2105+
"type": "number",
2106+
"default": 200,
2107+
"markdownDescription": "Specifies the number of additional items to fetch when paginating in the _Commit Graph_. Use 0 to specify no limit",
21082108
"scope": "window",
21092109
"order": 11
21102110
},
2111+
"gitlens.graph.searchItemLimit": {
2112+
"type": "number",
2113+
"default": 100,
2114+
"markdownDescription": "Specifies the number of results to gather when searching in the _Commit Graph_. Use 0 to specify no limit",
2115+
"scope": "window",
2116+
"order": 12
2117+
},
21112118
"gitlens.graph.showDetailsView": {
21122119
"type": [
21132120
"boolean",
@@ -2126,42 +2133,35 @@
21262133
],
21272134
"markdownDescription": "Specifies when to show the _Commit Details_ view for the selected row in the _Commit Graph_",
21282135
"scope": "window",
2129-
"order": 12
2136+
"order": 20
21302137
},
21312138
"gitlens.graph.showGhostRefsOnRowHover": {
21322139
"type": "boolean",
21332140
"default": true,
2134-
"markdownDescription": "Specifies whether to show a ghost ref for the hovered/selected row in the _Commit Graph_",
2141+
"markdownDescription": "Specifies whether to show a ghost branch / tag when hovering over or selecting a row in the _Commit Graph_",
2142+
"scope": "window",
2143+
"order": 21
2144+
},
2145+
"gitlens.graph.highlightRowsOnRefHover": {
2146+
"type": "boolean",
2147+
"default": true,
2148+
"markdownDescription": "Specifies whether to highlight rows associated with the branch / tag when hovering over it in the _Commit Graph_",
21352149
"scope": "window",
2136-
"order": 13
2150+
"order": 22
21372151
},
21382152
"gitlens.graph.showRemoteNames": {
21392153
"type": "boolean",
21402154
"default": false,
21412155
"markdownDescription": "Specifies whether to show remote names on remote branches in the _Commit Graph_",
21422156
"scope": "window",
2143-
"order": 14
2144-
},
2145-
"gitlens.graph.defaultItemLimit": {
2146-
"type": "number",
2147-
"default": 500,
2148-
"markdownDescription": "Specifies the default number of items to show in the _Commit Graph_. Use 0 to specify no limit",
2149-
"scope": "window",
2150-
"order": 20
2157+
"order": 23
21512158
},
2152-
"gitlens.graph.pageItemLimit": {
2153-
"type": "number",
2154-
"default": 200,
2155-
"markdownDescription": "Specifies the number of additional items to fetch when paginating in the _Commit Graph_. Use 0 to specify no limit",
2156-
"scope": "window",
2157-
"order": 21
2158-
},
2159-
"gitlens.graph.searchItemLimit": {
2160-
"type": "number",
2161-
"default": 100,
2162-
"markdownDescription": "Specifies the number of results to gather when searching in the _Commit Graph_. Use 0 to specify no limit",
2159+
"gitlens.graph.avatars": {
2160+
"type": "boolean",
2161+
"default": true,
2162+
"markdownDescription": "Specifies whether to show avatar images instead of author initials and remote icons in the _Commit Graph_",
21632163
"scope": "window",
2164-
"order": 22
2164+
"order": 24
21652165
},
21662166
"gitlens.graph.commitOrdering": {
21672167
"type": "string",

‎src/webviews/apps/settings/partials/commit-graph.html‎

Lines changed: 36 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<section id="commit-graph" class="section--settings section--collapsible">
22
<div class="section__header">
33
<h2>
4-
Commit Graph
4+
<span title="GitLens+ feature">✨</span> Commit Graph
55
<a
66
class="link__learn-more"
77
title="Learn more"
@@ -16,7 +16,7 @@ <h2>
1616
<a class="command command--show-view" title="Show Commit Graph" href="command:gitlens.showGraphPage"
1717
>Commit Graph</a
1818
>
19-
to visualize, explore, and manage a Git repository ✨
19+
to visualize, explore, and manage a Git repository
2020
</p>
2121
</div>
2222

@@ -35,43 +35,32 @@ <h2>
3535
data-setting
3636
data-default-value="500"
3737
/>
38-
<label for="graph.defaultItemLimit"> rows initially</label>
39-
</div>
40-
</div>
41-
42-
<div class="setting">
43-
<div class="setting__input">
44-
<label for="graph.pageItemLimit">Show an additional </label>
38+
<label for="graph.defaultItemLimit"> rows at first and</label>
39+
<label for="graph.pageItemLimit">&nbsp;then page in </label>
4540
<input
4641
id="graph.pageItemLimit"
4742
name="graph.pageItemLimit"
4843
type="number"
49-
placeholder="90"
44+
placeholder="200"
5045
data-setting
51-
data-default-value="90"
46+
data-default-value="200"
5247
/>
53-
<label for="graph.pageItemLimit"> rows when scrolling</label>
54-
</div>
55-
</div>
56-
57-
<div class="setting">
58-
<div class="setting__input">
59-
<input id="graph.avatars" name="graph.avatars" type="checkbox" data-setting />
60-
<label for="graph.avatars">Use author and remote avatars</label>
48+
<label for="graph.pageItemLimit"> more rows when scrolling</label>
6149
</div>
6250
</div>
6351

6452
<div class="setting">
6553
<div class="setting__input">
54+
<label for="graph.searchItemLimit">Show </label>
6655
<input
67-
id="graph.highlightRowsOnRefHover"
68-
name="graph.highlightRowsOnRefHover"
69-
type="checkbox"
56+
id="graph.searchItemLimit"
57+
name="graph.searchItemLimit"
58+
type="number"
59+
placeholder="100"
7060
data-setting
61+
data-default-value="100"
7162
/>
72-
<label for="graph.highlightRowsOnRefHover"
73-
>Highlight associated rows when hovering on a branch</label
74-
>
63+
<label for="graph.searchItemLimit"> search results at first and when paging</label>
7564
</div>
7665
</div>
7766

@@ -108,7 +97,21 @@ <h2>
10897
data-setting
10998
/>
11099
<label for="graph.showGhostRefsOnRowHover"
111-
>Show a ghost ref when hovering/selecting on a commit</label
100+
>Show ghost branch / tag when hovering over or selecting a commit</label
101+
>
102+
</div>
103+
</div>
104+
105+
<div class="setting">
106+
<div class="setting__input">
107+
<input
108+
id="graph.highlightRowsOnRefHover"
109+
name="graph.highlightRowsOnRefHover"
110+
type="checkbox"
111+
data-setting
112+
/>
113+
<label for="graph.highlightRowsOnRefHover"
114+
>Highlight associated rows when hovering over a branch</label
112115
>
113116
</div>
114117
</div>
@@ -125,6 +128,13 @@ <h2>
125128
</div>
126129
</div>
127130

131+
<div class="setting">
132+
<div class="setting__input">
133+
<input id="graph.avatars" name="graph.avatars" type="checkbox" data-setting />
134+
<label for="graph.avatars">Use author and remote avatars</label>
135+
</div>
136+
</div>
137+
128138
<div class="setting">
129139
<div class="setting__input">
130140
<input

‎src/webviews/apps/settings/partials/views.worktrees.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<section id="worktrees-view" class="section--settings section--collapsible">
22
<div class="section__header">
33
<h2>
4-
Worktrees view
4+
<span title="GitLens+ feature">✨</span> Worktrees view
55
<a
66
class="link__learn-more"
77
title="Learn more"

‎src/webviews/apps/settings/settings.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ <h2>Jump to</h2>
218218
data-action="jump"
219219
href="#worktrees-view"
220220
title="Jump to Worktrees view settings"
221-
>Worktrees view</a
221+
>✨ Worktrees view</a
222222
>
223223
</li>
224224
<li>
@@ -274,7 +274,7 @@ <h2>Jump to</h2>
274274
data-action="jump"
275275
href="#commit-graph"
276276
title="Jump to Commit Graph settings"
277-
>Commit Graph</a
277+
>✨ Commit Graph</a
278278
>
279279
</li>
280280
<li>

‎src/webviews/apps/shared/base.scss‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,7 @@ textarea {
144144

145145
input[type='number'] {
146146
max-width: 100px;
147+
text-align: center;
147148
}
148149

149150
kbd {

0 commit comments

Comments
 (0)