Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feature/1568 - Updated top navigation #2454

Merged
merged 1 commit into from
Dec 26, 2024
Merged

feature/1568 - Updated top navigation #2454

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion front-end/src/app/layout/committee-banner/committee-banner.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div class="grid" *ngIf="committeeID">
<div class="col-12">
<div class="col-12 pt-0">
<div class="committee-name">{{ committeeName }}</div>
<div class="grid">
<div class="col-12 committee-info" aria-label="Committee Status">
Expand Down
2 changes: 1 addition & 1 deletion front-end/src/app/layout/header/header.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<nav class="navbar navbar-expand-lg navbar-light bg-light px-2 py-0" aria-label="Navigation Bar">
<nav class="navbar navbar-expand-lg navbar-light bg-light py-0" aria-label="Navigation Bar">
<button class="seal-link navbar-brand pb-0">
<img ngSrc="assets/img/seal-and-title.svg" class="seal-and-title mr-2" alt="FEC Seal" height="48" width="181" />
</button>
Expand Down
4 changes: 4 additions & 0 deletions front-end/src/app/layout/header/header.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ a {

nav {
background-color: white !important;
height: 80px;
border-bottom: 2px solid #e8e8e8;
padding-left: calc(32px + 0.5rem);
padding-right: calc(32px + 0.5rem);
}

.navbar-nav {
Expand Down
17 changes: 7 additions & 10 deletions front-end/src/app/layout/layout.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
<div id="page-container" [ngClass]="[layoutControls.backgroundStyle]">
<app-banner #bannerRef></app-banner>
<div
class="header-container"
[ngStyle]="{ paddingBottom: layoutControls.showSidebar ? '0' : '64px' }"
*ngIf="layoutControls.showHeader"
>
<app-header [headerStyle]="layoutControls.headerStyle"></app-header>
</div>

<!-- Begin Sidebar section -->

Expand All @@ -8,9 +15,6 @@
<app-sidebar></app-sidebar>
</div>
<div class="sidebar-content-container">
<div class="header-container" *ngIf="layoutControls.showHeader">
<app-header [headerStyle]="layoutControls.headerStyle"></app-header>
</div>
<div class="main-content">
<div class="grid">
<div *ngIf="layoutControls.showCommitteeBanner">
Expand All @@ -32,13 +36,6 @@

<!-- Begin No Sidebar section -->
<div *ngIf="!layoutControls.showSidebar" id="content-offset" #contentOffset>
<div
class="header-container"
style="max-width: 1320px; margin-left: auto; margin-right: auto"
*ngIf="layoutControls.showHeader"
>
<app-header [headerStyle]="layoutControls.headerStyle"></app-header>
</div>
<div class="main-content">
<app-committee-banner *ngIf="layoutControls.showCommitteeBanner"></app-committee-banner>
<div class="container" *ngIf="layoutControls.backgroundStyle === BackgroundStyles.DEFAULT; else no_container">
Expand Down
3 changes: 2 additions & 1 deletion front-end/src/app/layout/layout.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
}

.header-container {
padding: 0 32px 64px 32px;
padding: 0;
}

.row {
Expand All @@ -39,6 +39,7 @@ app-footer {
width: calc(100% - 250px);
display: flex;
flex-direction: column;
padding-top: 64px;
}

.login-background {
Expand Down
6 changes: 0 additions & 6 deletions front-end/src/app/layout/sidebar/sidebar.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,4 @@
<div class="sidebar">
<div class="grid title">
<a class="col-12" class="sidebar-logo" routerLink="/">
<h4 class="site-name">FECFile</h4>
<div>FEDERAL ELECTION COMMISSION</div>
</a>
</div>
<app-f3x-menu *ngIf="(activeReport$ | async)?.report_type === reportTypes.F3X"></app-f3x-menu>
<app-f99-menu *ngIf="(activeReport$ | async)?.report_type === reportTypes.F99"></app-f99-menu>
<app-f1m-menu *ngIf="(activeReport$ | async)?.report_type === reportTypes.F1M"></app-f1m-menu>
Expand Down