Skip to content

Commit ec267d3

Browse files
d13d13
committed
Renames local button component
1 parent dcdf2bb commit ec267d3

File tree

9 files changed

+43
-43
lines changed

9 files changed

+43
-43
lines changed

‎src/webviews/apps/home/home.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ <h1 class="alert__title">No repository detected</h1>
8282
To use GitLens, open a folder containing a git repository or clone from a URL from the Explorer.
8383
</p>
8484
<p class="centered">
85-
<gk-button data-action="command:workbench.view.explorer">Open a Folder or Repository</gk-button>
85+
<gl-button data-action="command:workbench.view.explorer">Open a Folder or Repository</gl-button>
8686
</p>
8787
<p class="mb-0">
8888
If you have opened a folder with a repository, please let us know by
@@ -100,7 +100,7 @@ <h1 class="alert__title">Unsafe repository</h1>
100100
not being owned by the current user.
101101
</p>
102102
<p class="centered">
103-
<gk-button data-action="command:workbench.view.scm">Manage in Source Control</gk-button>
103+
<gl-button data-action="command:workbench.view.scm">Manage in Source Control</gl-button>
104104
</p>
105105
</div>
106106
</div>
@@ -109,7 +109,7 @@ <h1 class="alert__title">Untrusted workspace</h1>
109109
<div class="alert__description">
110110
<p>Unable to open repositories in Restricted Mode.</p>
111111
<p class="centered">
112-
<gk-button data-action="command:workbench.trust.manage">Manage Workspace Trust</gk-button>
112+
<gl-button data-action="command:workbench.trust.manage">Manage Workspace Trust</gl-button>
113113
</p>
114114
</div>
115115
</div>

‎src/webviews/apps/home/home.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ ul {
298298
}
299299
}
300300

301-
gk-button {
301+
gl-button {
302302
max-width: 300px;
303303
width: 100%;
304304

‎src/webviews/apps/plus/account/components/account-content.ts‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -137,9 +137,9 @@ export class AccountContent extends LitElement {
137137
<p class="account__title">${this.name}</p>
138138
<p class="account__access">${this.planName}${this.daysLeft}</p>
139139
<div class="account__signout">
140-
<gk-button appearance="toolbar" href="command:gitlens.plus.logout"
140+
<gl-button appearance="toolbar" href="command:gitlens.plus.logout"
141141
><code-icon icon="sign-out" title="Sign Out" aria-label="Sign Out"></code-icon
142-
></gk-button>
142+
></gl-button>
143143
</div>
144144
</div>
145145
`;
@@ -151,12 +151,12 @@ export class AccountContent extends LitElement {
151151
return html`
152152
<p>You must verify your email before you can continue.</p>
153153
<button-container>
154-
<gk-button full href="command:gitlens.plus.resendVerification"
155-
>Resend verification email</gk-button
154+
<gl-button full href="command:gitlens.plus.resendVerification"
155+
>Resend verification email</gl-button
156156
>
157157
</button-container>
158158
<button-container>
159-
<gk-button full href="command:gitlens.plus.validate">Refresh verification status</gk-button>
159+
<gl-button full href="command:gitlens.plus.validate">Refresh verification status</gl-button>
160160
</button-container>
161161
`;
162162

@@ -169,7 +169,7 @@ export class AccountContent extends LitElement {
169169
<a href="command:gitlens.plus.loginOrSignUp">sign in</a>.
170170
</p>
171171
<button-container>
172-
<gk-button full href="command:gitlens.plus.loginOrSignUp">Sign Up</gk-button>
172+
<gl-button full href="command:gitlens.plus.loginOrSignUp">Sign Up</gl-button>
173173
</button-container>
174174
<p>Signing up starts a free 7-day Pro trial.</p>
175175
`;
@@ -181,7 +181,7 @@ export class AccountContent extends LitElement {
181181
repos.
182182
</p>
183183
<button-container>
184-
<gk-button full href="command:gitlens.plus.purchase">Upgrade to Pro</gk-button>
184+
<gl-button full href="command:gitlens.plus.purchase">Upgrade to Pro</gl-button>
185185
</button-container>
186186
<p>
187187
You only have access to ✨ features on local and publicly hosted repos and ☁️ features based on
@@ -196,7 +196,7 @@ export class AccountContent extends LitElement {
196196
paid plan to continue using ✨ features.
197197
</p>
198198
<button-container>
199-
<gk-button full href="command:gitlens.plus.purchase">Upgrade to Pro</gk-button>
199+
<gl-button full href="command:gitlens.plus.purchase">Upgrade to Pro</gl-button>
200200
</button-container>
201201
<p>
202202
You have access to ✨ features on privately hosted repos and ☁️ features based on the Pro plan
@@ -207,8 +207,8 @@ export class AccountContent extends LitElement {
207207
case SubscriptionState.Paid:
208208
return html`
209209
<button-container>
210-
<gk-button appearance="secondary" full href="command:gitlens.plus.manage"
211-
>Manage Account</gk-button
210+
<gl-button appearance="secondary" full href="command:gitlens.plus.manage"
211+
>Manage Account</gl-button
212212
>
213213
</button-container>
214214
<p>You have access to ✨ features on privately hosted repos and ☁️ features based on your plan.</p>

‎src/webviews/apps/plus/focus/components/focus-app.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import { debounce } from '../../../../../system/function';
1818
import type { FeatureGate } from '../../../shared/components/feature-gate';
1919
import type { FeatureGateBadge } from '../../../shared/components/feature-gate-badge';
2020
import { themeProperties } from './gk-theme.css';
21+
import '../../../shared/components/button';
2122
import '../../../shared/components/code-icon';
2223
import '../../../shared/components/feature-gate';
2324
import '../../../shared/components/feature-gate-badge';
@@ -278,8 +279,8 @@ export class GlFocusApp extends LitElement {
278279
additional information inside hovers and the Commit Details view, such as auto-linked issues
279280
and pull requests and avatars.
280281
</p>
281-
<gk-button appearance="alert" href="command:gitlens.connectRemoteProvider"
282-
>Connect to GitHub</gk-button
282+
<gl-button appearance="alert" href="command:gitlens.connectRemoteProvider"
283+
>Connect to GitHub</gl-button
283284
>
284285
</gk-feature-gate>
285286

‎src/webviews/apps/plus/shared/components/feature-gate-plus-state.ts‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
import { css, html, LitElement, nothing } from 'lit';
22
import { customElement, property } from 'lit/decorators.js';
33
import { SubscriptionState } from '../../../../../subscription';
4-
// FIXME@d13 - conflict with gk-button from shared library
5-
// import '../../../shared/components/button';
4+
import '../../../shared/components/button';
65
import { linkStyles } from './vscode.css';
76

87
@customElement('gk-feature-gate-plus-state')
@@ -14,20 +13,20 @@ export class FeatureGatePlusState extends LitElement {
1413
container-type: inline-size;
1514
}
1615
17-
:host([appearance='welcome']) gk-button {
16+
:host([appearance='welcome']) gl-button {
1817
width: 100%;
1918
max-width: 300px;
2019
}
2120
2221
@container (max-width: 600px) {
23-
:host([appearance='welcome']) gk-button {
22+
:host([appearance='welcome']) gl-button {
2423
display: block;
2524
margin-left: auto;
2625
margin-right: auto;
2726
}
2827
}
2928
30-
:host([appearance='alert']) gk-button {
29+
:host([appearance='alert']) gl-button {
3130
display: block;
3231
margin-left: auto;
3332
margin-right: auto;
@@ -62,18 +61,18 @@ export class FeatureGatePlusState extends LitElement {
6261
case SubscriptionState.VerificationRequired:
6362
return html`
6463
<p>You must verify your email before you can continue.</p>
65-
<gk-button appearance="${appearance}" href="command:gitlens.plus.resendVerification"
66-
>Resend verification email</gk-button
64+
<gl-button appearance="${appearance}" href="command:gitlens.plus.resendVerification"
65+
>Resend verification email</gl-button
6766
>
68-
<gk-button appearance="${appearance}" href="command:gitlens.plus.validate"
69-
>Refresh verification status</gk-button
67+
<gl-button appearance="${appearance}" href="command:gitlens.plus.validate"
68+
>Refresh verification status</gl-button
7069
>
7170
`;
7271

7372
case SubscriptionState.Free:
7473
return html`
75-
<gk-button appearance="${appearance}" href="command:gitlens.plus.startPreviewTrial"
76-
>Preview Now</gk-button
74+
<gl-button appearance="${appearance}" href="command:gitlens.plus.startPreviewTrial"
75+
>Preview Now</gl-button
7776
>
7877
<p>
7978
Preview Pro for 3 days, or
@@ -88,17 +87,17 @@ export class FeatureGatePlusState extends LitElement {
8887
Your 3-day Pro preview has ended, start a free Pro trial to get an additional 7 days, or
8988
<a href="command:gitlens.plus.loginOrSignUp">sign in</a>.
9089
</p>
91-
<gk-button appearance="${appearance}" href="command:gitlens.plus.loginOrSignUp"
92-
>Start Free Pro Trial</gk-button
90+
<gl-button appearance="${appearance}" href="command:gitlens.plus.loginOrSignUp"
91+
>Start Free Pro Trial</gl-button
9392
>
9493
<p>✨ A trial or paid plan is required to use this on privately hosted repos.</p>
9594
`;
9695

9796
case SubscriptionState.FreePlusTrialExpired:
9897
return html`
9998
<p>Your Pro trial has ended, please upgrade to continue to use this on privately hosted repos.</p>
100-
<gk-button appearance="${appearance}" href="command:gitlens.plus.purchase"
101-
>Upgrade to Pro</gk-button
99+
<gl-button appearance="${appearance}" href="command:gitlens.plus.purchase"
100+
>Upgrade to Pro</gl-button
102101
>
103102
<p>✨ A paid plan is required to use this on privately hosted repos.</p>
104103
`;

‎src/webviews/apps/plus/timeline/timeline.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,15 +47,15 @@ <h2 data-bind="description"></h2>
4747
<vscode-option value="all">Full history</vscode-option>
4848
</vscode-dropdown>
4949
</div>
50-
<gk-button
50+
<gl-button
5151
data-placement-visible="view"
5252
href="command:gitlens.views.timeline.openInTab"
5353
title="Open in Editor Area"
5454
aria-label="Open in Editor Area"
5555
appearance="toolbar"
5656
>
5757
<code-icon icon="link-external"></code-icon>
58-
</gk-button>
58+
</gl-button>
5959
</div>
6060
</section>
6161
<section id="content">

‎src/webviews/apps/shared/components/button.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ import { customElement, property } from 'lit/decorators.js';
33
import { focusOutline } from './styles/lit/a11y.css';
44
import { elementBase } from './styles/lit/base.css';
55

6-
@customElement('gk-button')
7-
export class GKButton extends LitElement {
6+
@customElement('gl-button')
7+
export class GlButton extends LitElement {
88
static override styles = [
99
elementBase,
1010
css`

‎src/webviews/apps/shared/components/feature-gate.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@ export class FeatureGate extends LitElement {
7272
padding: 1.3rem;
7373
}
7474
75-
:host-context(body[data-placement='editor']) section ::slotted(gk-button),
76-
:host([appearance='alert']) section ::slotted(gk-button) {
75+
:host-context(body[data-placement='editor']) section ::slotted(gl-button),
76+
:host([appearance='alert']) section ::slotted(gl-button) {
7777
display: block;
7878
margin-left: auto;
7979
margin-right: auto;

‎src/webviews/apps/welcome/welcome.html‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -329,8 +329,8 @@ <h3>Integrations</h3>
329329
Use autolinks to linkify external references, like Jira issues or Zendesk tickets, in commit
330330
messages.
331331
</p>
332-
<gk-button appearance="secondary" href="command:gitlens.showSettingsPage?%22autolinks%22"
333-
>Configure Autolinks</gk-button
332+
<gl-button appearance="secondary" href="command:gitlens.showSettingsPage?%22autolinks%22"
333+
>Configure Autolinks</gl-button
334334
>
335335

336336
<h3><code-icon icon="beaker" size="20"></code-icon> GitKraken Labs</h3>
@@ -377,8 +377,8 @@ <h2>Tutorial Video</h2>
377377
<nav class="welcome__starting-nav" aria-label="Getting started links">
378378
<video-button></video-button>
379379
<span
380-
><gk-button appearance="secondary" href="command:gitlens.getStarted"
381-
>Get Started Walkthrough</gk-button
380+
><gl-button appearance="secondary" href="command:gitlens.getStarted"
381+
>Get Started Walkthrough</gl-button
382382
></span
383383
>
384384
</nav>
@@ -387,8 +387,8 @@ <h2>Tutorial Video</h2>
387387
<h2>Try Pro ✨</h2>
388388
<p class="h-space-half">Unlock the full power of GitLens ✨ and ☁️ features</p>
389389
<p>
390-
<gk-button appearance="secondary" href="command:gitlens.plus.loginOrSignUp"
391-
>Start a Pro trial</gk-button
390+
<gl-button appearance="secondary" href="command:gitlens.plus.loginOrSignUp"
391+
>Start a Pro trial</gl-button
392392
>
393393
&nbsp;or <a href="command:gitlens.plus.loginOrSignUp" title="Sign In">sign in</a>
394394
</p>

0 commit comments

Comments
 (0)