Skip to content

Commit 5282aa3

Browse files
committed
Moves home nav back to top
1 parent cc933ca commit 5282aa3

File tree

4 files changed

+20
-6
lines changed

4 files changed

+20
-6
lines changed

src/webviews/apps/home/components/repo-alerts.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { consume } from '@lit/context';
22
import { css, html } from 'lit';
3-
import { customElement, state } from 'lit/decorators.js';
3+
import { customElement, property, state } from 'lit/decorators.js';
44
import { when } from 'lit/directives/when.js';
55
import type { State } from '../../../home/protocol';
66
import { GlElement } from '../../shared/components/element';
@@ -38,6 +38,11 @@ export class GlRepoAlerts extends GlElement {
3838
`,
3939
];
4040

41+
@property({ type: Boolean, reflect: true, attribute: 'has-alerts' })
42+
get hasAlerts() {
43+
return this.alertVisibility.header;
44+
}
45+
4146
@consume<State>({ context: stateContext, subscribe: true })
4247
@state()
4348
private _state!: State;

src/webviews/apps/home/home.css.ts

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,6 @@ export const homeStyles = css`
5757
}
5858
.home__nav {
5959
flex: none;
60-
padding: 0;
61-
margin-block: 0.6rem -1rem;
6260
}
6361
.home__footer {
6462
flex: none;
@@ -67,6 +65,10 @@ export const homeStyles = css`
6765
gl-home-account-content {
6866
margin-bottom: 0;
6967
}
68+
69+
gl-repo-alerts:not([has-alerts]) {
70+
display: none;
71+
}
7072
`;
7173

7274
export const inlineNavStyles = css`
@@ -128,6 +130,9 @@ export const inlineNavStyles = css`
128130
color: var(--color-foreground--50);
129131
margin-bottom: 0.2rem;
130132
}
133+
.promo-banner:not([has-promo]) {
134+
display: none;
135+
}
131136
`;
132137

133138
export const buttonStyles = css`

src/webviews/apps/home/home.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,16 +52,15 @@ export class GlHomeApp extends GlApp<State> {
5252
override render() {
5353
return html`
5454
<div class="home scrollable">
55+
<gl-home-nav class="home__nav"></gl-home-nav>
5556
<gl-repo-alerts class="home__header"></gl-repo-alerts>
5657
<main class="home__main scrollable" id="main">
5758
<gl-onboarding></gl-onboarding>
5859
<gl-feature-nav .badgeSource=${this.badgeSource}></gl-feature-nav>
5960
</main>
6061
6162
<footer class="home__footer">
62-
<gl-home-account-content id="account-content">
63-
<gl-home-nav class="home__nav"></gl-home-nav>
64-
</gl-home-account-content>
63+
<gl-home-account-content id="account-content"> </gl-home-account-content>
6564
</footer>
6665
</div>
6766
`;

src/webviews/apps/shared/components/promo.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,11 @@ export class GlPromo extends LitElement {
5252
@property({ reflect: true, type: String })
5353
type: 'link' | 'info' = 'info';
5454

55+
@property({ reflect: true, type: Boolean, attribute: 'has-promo' })
56+
get hasPromo() {
57+
return this.promo != null;
58+
}
59+
5560
override render() {
5661
if (!this.promo) return;
5762

0 commit comments

Comments
 (0)