From e9a93b8760da680b2f24fbd995e4e469c266e7c3 Mon Sep 17 00:00:00 2001
From: bclayton-usgs <bclayton@usgs.gov>
Date: Wed, 25 Mar 2020 10:00:53 -0600
Subject: [PATCH] update
---
.../lib/components/header/header.component.html | 17 +++++++++--------
.../main-page/main-page.component.scss | 1 +
.../src/lib/nshmp-template.module.ts | 5 +++--
3 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/projects/nshmp-template/src/lib/components/header/header.component.html b/projects/nshmp-template/src/lib/components/header/header.component.html
index 4c30b48..680a0ba 100644
--- a/projects/nshmp-template/src/lib/components/header/header.component.html
+++ b/projects/nshmp-template/src/lib/components/header/header.component.html
@@ -2,7 +2,7 @@
<header class="usa-header usa-header--basic" [ngClass]="{ 'header-minimal': minimal }">
<div class="grid-row">
<!-- USGS logo -->
- <div class="grid-col">
+ <div class="grid-col-auto">
<div class="usgs-logo border-0 width-auto">
<img
alt="U.S. Geological Survey"
@@ -14,18 +14,19 @@
</div>
</div>
+ <!-- Add content in header -->
+ <div class="grid-col-fill">
+ <ng-content></ng-content>
+ </div>
+
<!-- USGS site wide search bar -->
<ng-container *ngIf="!minimal ? renderSearchBar : false">
- <nshmp-template-search-bar class="search-bar grid-col-12 mobile-lg:grid-col">
- </nshmp-template-search-bar>
+ <nshmp-template-search-bar class="search-bar grid-col-auto"> </nshmp-template-search-bar>
</ng-container>
- <!-- Header controls and site navigation -->
- <div class="grid-col-8 mobile-lg:grid-col-4 desktop:grid-col-2">
+ <!-- Site navigation -->
+ <div class="grid-col-auto">
<div class="grid-row float-right">
- <!-- Add content next to dropdown menu -->
- <ng-content></ng-content>
-
<!-- Header dropdown menu -->
<nshmp-template-navigation class="margin-x-1" [navigationList]="navigationList">
</nshmp-template-navigation>
diff --git a/projects/nshmp-template/src/lib/components/main-page/main-page.component.scss b/projects/nshmp-template/src/lib/components/main-page/main-page.component.scss
index 107fbff..77b58f7 100644
--- a/projects/nshmp-template/src/lib/components/main-page/main-page.component.scss
+++ b/projects/nshmp-template/src/lib/components/main-page/main-page.component.scss
@@ -11,4 +11,5 @@ main {
order: 0;
flex: 1 1 auto;
align-self: auto;
+ height: 100%;
}
diff --git a/projects/nshmp-template/src/lib/nshmp-template.module.ts b/projects/nshmp-template/src/lib/nshmp-template.module.ts
index 905681a..6b1750f 100644
--- a/projects/nshmp-template/src/lib/nshmp-template.module.ts
+++ b/projects/nshmp-template/src/lib/nshmp-template.module.ts
@@ -1,10 +1,11 @@
import { ModuleWithProviders, NgModule } from '@angular/core';
+import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import { RouterModule } from '@angular/router';
import { NshmpLayoutModule } from './modules/nshmp-layout.module';
@NgModule({
- imports: [NshmpLayoutModule, RouterModule.forRoot([])],
+ imports: [NshmpLayoutModule, BrowserAnimationsModule, RouterModule.forRoot([])],
exports: [NshmpLayoutModule]
})
export class NshmpTemplateModuleForRoot {}
@@ -16,7 +17,7 @@ export class NshmpTemplateModuleForRoot {}
* RouterModule.forRoot() must call NshmpTemplateModule.forRoot()
*/
@NgModule({
- imports: [NshmpLayoutModule],
+ imports: [NshmpLayoutModule, BrowserAnimationsModule],
exports: [NshmpLayoutModule]
})
export class NshmpTemplateModule {
--
GitLab