Skip to content

Commit b843c41

Browse files
Uses promo image in other places and shrinks gap
1 parent a88a582 commit b843c41

File tree

5 files changed

+13
-6
lines changed

5 files changed

+13
-6
lines changed

src/webviews/apps/home/home.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import '../shared/components/button';
1818
import '../shared/components/code-icon';
1919
import '../shared/components/feature-badge';
2020
import '../shared/components/overlays/tooltip';
21-
import './svg-devExDays';
21+
import '../shared/components/svg-devExDays';
2222

2323
export class HomeApp extends App<State> {
2424
constructor() {

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import { elementBase, linkBase } from '../../../shared/components/styles/lit/bas
1616
import '../../../shared/components/button';
1717
import '../../../shared/components/button-container';
1818
import '../../../shared/components/code-icon';
19+
import '../../../shared/components/svg-devExDays';
1920

2021
@customElement('account-content')
2122
export class AccountContent extends LitElement {
@@ -121,12 +122,12 @@ export class AccountContent extends LitElement {
121122
}
122123
123124
.special {
124-
font-size: smaller;
125125
margin-top: 0.8rem;
126126
text-align: center;
127127
}
128128
129129
.special-dim {
130+
font-size: smaller;
130131
opacity: 0.6;
131132
}
132133
`,
@@ -303,6 +304,7 @@ export class AccountContent extends LitElement {
303304
</button-container>
304305
${promo?.description
305306
? html`<p class="special ${promo.key === 'pro50' ? 'special-dim' : ''}">
307+
${promo.key === 'devex-days' ? html`<gl-devex-days-svg></gl-devex-days-svg>` : nothing}
306308
${promo.descriptionIntro ?? 'Special'}: <b>${promo.description}</b><br />
307309
</p>`
308310
: nothing}
@@ -317,7 +319,8 @@ export class AccountContent extends LitElement {
317319
<gl-button full href="command:gitlens.plus.upgrade">Upgrade to Pro</gl-button>
318320
</button-container>
319321
${promo?.description
320-
? html`<p class="${promo.key === 'pro50' ? 'special dim' : 'special dim'}">
322+
? html`<p class="special ${promo.key === 'pro50' ? 'special-dim' : ''}">
323+
${promo.key === 'devex-days' ? html`<gl-devex-days-svg></gl-devex-days-svg>` : nothing}
321324
${promo.descriptionIntro ?? 'Special'}: <b>${promo.description}</b><br />
322325
</p>`
323326
: nothing}

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import { SubscriptionState } from '../../../../../plus/gk/account/subscription';
77
import type { GlButton } from '../../../shared/components/button';
88
import { linkStyles } from './vscode.css';
99
import '../../../shared/components/button';
10+
import '../../../shared/components/svg-devExDays';
1011

1112
declare global {
1213
interface HTMLElementTagNameMap {
@@ -62,11 +63,11 @@ export class GlFeatureGatePlusState extends LitElement {
6263
}
6364
6465
.special {
65-
font-size: smaller;
6666
text-align: center;
6767
}
6868
6969
:host([appearance='welcome']) .special-dim {
70+
font-size: smaller;
7071
opacity: 0.6;
7172
}
7273
`,
@@ -171,6 +172,7 @@ export class GlFeatureGatePlusState extends LitElement {
171172
</p>
172173
${promo?.description
173174
? html`<p class="special ${promo.key === 'pro50' ? 'special-dim' : ''}">
175+
${promo.key === 'devex-days' ? html`<gl-devex-days-svg></gl-devex-days-svg>` : nothing}
174176
${promo.descriptionIntro ?? 'Special'}: <b>${promo.description}</b><br />
175177
</p>`
176178
: nothing}`;

src/webviews/apps/shared/components/feature-badge.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import { focusOutline } from './styles/lit/a11y.css';
1919
import { elementBase, linkBase } from './styles/lit/base.css';
2020
import './overlays/popover';
2121
import './overlays/tooltip';
22+
import './svg-devExDays';
2223

2324
declare global {
2425
interface HTMLElementTagNameMap {
@@ -121,12 +122,12 @@ export class GlFeatureBadge extends LitElement {
121122
}
122123
123124
.popup-content .actions .special {
124-
font-size: smaller;
125125
margin-top: 0.8rem;
126126
text-align: center;
127127
}
128128
129129
.popup-content .actions .special-dim {
130+
font-size: smaller;
130131
opacity: 0.6;
131132
}
132133
@@ -348,6 +349,7 @@ export class GlFeatureBadge extends LitElement {
348349
>
349350
${promo?.description
350351
? html`<p class="special ${promo.key === 'pro50' ? 'special-dim' : ''}">
352+
${promo.key === 'devex-days' ? html`<gl-devex-days-svg></gl-devex-days-svg>` : nothing}
351353
${promo.descriptionIntro ?? 'Special'}: <b>${promo.description}</b><br />
352354
</p>`
353355
: nothing}

src/webviews/apps/home/svg-devExDays.ts renamed to src/webviews/apps/shared/components/svg-devExDays.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ export class DevexDaysSvg extends LitElement {
99
max-width: 8rem;
1010
height: auto;
1111
vertical-align: text-bottom;
12-
margin-inline-end: 0.4rem;
12+
margin-inline-end: 0.2rem;
1313
}
1414
`,
1515
];

0 commit comments

Comments
 (0)