diff --git a/src/themes/pedspace-custom/app/header-nav-wrapper/header-navbar-wrapper.component.html b/src/themes/pedspace-custom/app/header-nav-wrapper/header-navbar-wrapper.component.html index e69de29b..8c10efcb 100644 --- a/src/themes/pedspace-custom/app/header-nav-wrapper/header-navbar-wrapper.component.html +++ b/src/themes/pedspace-custom/app/header-nav-wrapper/header-navbar-wrapper.component.html @@ -0,0 +1,3 @@ +
+ +
diff --git a/src/themes/pedspace-custom/app/header-nav-wrapper/header-navbar-wrapper.component.scss b/src/themes/pedspace-custom/app/header-nav-wrapper/header-navbar-wrapper.component.scss index e69de29b..1daf4ebd 100644 --- a/src/themes/pedspace-custom/app/header-nav-wrapper/header-navbar-wrapper.component.scss +++ b/src/themes/pedspace-custom/app/header-nav-wrapper/header-navbar-wrapper.component.scss @@ -0,0 +1,7 @@ +:host { + // The header-navbar-wrapper should not have a z-index, otherwise it would cover the media viewer despite its higher z-index + position: relative; + div#header-navbar-wrapper { + border-bottom: 5px var(--ds-header-navbar-border-bottom-color) solid; + } +} diff --git a/src/themes/pedspace-custom/app/header-nav-wrapper/header-navbar-wrapper.component.ts b/src/themes/pedspace-custom/app/header-nav-wrapper/header-navbar-wrapper.component.ts index e0495436..36e23e17 100644 --- a/src/themes/pedspace-custom/app/header-nav-wrapper/header-navbar-wrapper.component.ts +++ b/src/themes/pedspace-custom/app/header-nav-wrapper/header-navbar-wrapper.component.ts @@ -6,10 +6,8 @@ import { HeaderNavbarWrapperComponent as BaseComponent } from '../../../../app/h */ @Component({ selector: 'ds-header-navbar-wrapper', - // styleUrls: ['./header-navbar-wrapper.component.scss'], - styleUrls: ['../../../../app/header-nav-wrapper/header-navbar-wrapper.component.scss'], - // templateUrl: './header-navbar-wrapper.component.html', - templateUrl: '../../../../app/header-nav-wrapper/header-navbar-wrapper.component.html', + styleUrls: ['header-navbar-wrapper.component.scss'], + templateUrl: 'header-navbar-wrapper.component.html', }) export class HeaderNavbarWrapperComponent extends BaseComponent { } diff --git a/src/themes/pedspace-custom/app/header/header.component.html b/src/themes/pedspace-custom/app/header/header.component.html index e69de29b..31f200b3 100644 --- a/src/themes/pedspace-custom/app/header/header.component.html +++ b/src/themes/pedspace-custom/app/header/header.component.html @@ -0,0 +1,25 @@ +
+ + + +
diff --git a/src/themes/pedspace-custom/app/header/header.component.scss b/src/themes/pedspace-custom/app/header/header.component.scss index e69de29b..2fc85782 100644 --- a/src/themes/pedspace-custom/app/header/header.component.scss +++ b/src/themes/pedspace-custom/app/header/header.component.scss @@ -0,0 +1,26 @@ +@media screen and (min-width: map-get($grid-breakpoints, md)) { + nav.navbar { + display: none; + } + .header { + background-color: var(--ds-header-bg); + } +} + +.navbar-brand img { + @media screen and (max-width: map-get($grid-breakpoints, md)) { + height: var(--ds-header-logo-height-xs); + } +} +.navbar-toggler .navbar-toggler-icon { + background-image: none !important; + line-height: 1.5; +} + +.navbar-toggler { + color: var(--ds-header-icon-color); + + &:hover, &:focus { + color: var(--ds-header-icon-color-hover); + } +} diff --git a/src/themes/pedspace-custom/app/header/header.component.ts b/src/themes/pedspace-custom/app/header/header.component.ts index 866072f3..6da89b47 100644 --- a/src/themes/pedspace-custom/app/header/header.component.ts +++ b/src/themes/pedspace-custom/app/header/header.component.ts @@ -6,10 +6,8 @@ import { HeaderComponent as BaseComponent } from '../../../../app/header/header. */ @Component({ selector: 'ds-header', - // styleUrls: ['header.component.scss'], - styleUrls: ['../../../../app/header/header.component.scss'], - // templateUrl: 'header.component.html', - templateUrl: '../../../../app/header/header.component.html', + styleUrls: ['header.component.scss'], + templateUrl: 'header.component.html', }) export class HeaderComponent extends BaseComponent { } diff --git a/src/themes/pedspace-custom/app/home-page/home-news/home-news.component.html b/src/themes/pedspace-custom/app/home-page/home-news/home-news.component.html index e69de29b..9292762e 100644 --- a/src/themes/pedspace-custom/app/home-page/home-news/home-news.component.html +++ b/src/themes/pedspace-custom/app/home-page/home-news/home-news.component.html @@ -0,0 +1,28 @@ +
+ + + + + + +
+
+
+

PEDSnet Variable Dictionary

+

Explore a wealth of clinical, environmental, and health data from over 13 million children. Discover variables and codesets used in previous studies to inspire your research.

+ +
+
+

Repository Information:

+
    +
  • Codeset: A collection of codes (e.g., diagnosis or procedure codes) used for a given clinical concept.
  • +
  • Variable Definition: The logic for determining (levels of) a variable, which may include one or more codesets.
  • +
  • Computable Phenotype: A complex variable definition that uses multiple other variables to assess or determine a healthcare concept.
  • +
+
+
+
+ Photo by @inspiredimages +
diff --git a/src/themes/pedspace-custom/app/home-page/home-news/home-news.component.scss b/src/themes/pedspace-custom/app/home-page/home-news/home-news.component.scss index e69de29b..44e5613a 100644 --- a/src/themes/pedspace-custom/app/home-page/home-news/home-news.component.scss +++ b/src/themes/pedspace-custom/app/home-page/home-news/home-news.component.scss @@ -0,0 +1,86 @@ +:host { + display: block; + + div.background-image-container { + color: white; + position: relative; + + .background-image > img { + background-color: var(--bs-info); + position: absolute; + z-index: -1; + top: 0; + left: 0; + width: 100%; + height: 100%; + object-fit: cover; + object-position: bottom; + } + + .container { + position: relative; + text-shadow: 1px 1px 4px rgba(0, 0, 0, 0.6); + + &:before, &:after { + content: ''; + display: block; + width: var(--ds-banner-background-gradient-width); + height: 100%; + top: 0; + position: absolute; + } + + &:before { + background: linear-gradient(to left, var(--ds-banner-text-background), transparent); + left: calc(-1 * var(--ds-banner-background-gradient-width)); + + } + + &:after { + background: linear-gradient(to right, var(--ds-banner-text-background), transparent); + right: calc(-1 * var(--ds-banner-background-gradient-width)); + } + + background-color: var(--ds-banner-text-background); + } + + + small.credits { + a { + color: inherit; + } + + opacity: 0.3; + position: absolute; + right: var(--bs-spacer); + bottom: 0; + } + } + + .btn-subtle { + color: #ffffff; + background-color: rgba(255, 255, 255, 0.2); + border: 1px solid rgba(255, 255, 255, 0.3); + } + + .btn-subtle:hover, .btn-subtle:focus { + background-color: rgba(255, 255, 255, 0.3); + border-color: rgba(255, 255, 255, 0.5); + } + + .jumbotron { + background-color: transparent; + } + + a { + color: var(--ds-home-news-link-color); + + @include hover { + color: var(--ds-home-news-link-hover-color); + } + } +} + + + + diff --git a/src/themes/pedspace-custom/app/home-page/home-news/home-news.component.ts b/src/themes/pedspace-custom/app/home-page/home-news/home-news.component.ts index c9c070f6..d4032011 100644 --- a/src/themes/pedspace-custom/app/home-page/home-news/home-news.component.ts +++ b/src/themes/pedspace-custom/app/home-page/home-news/home-news.component.ts @@ -3,10 +3,8 @@ import { HomeNewsComponent as BaseComponent } from '../../../../../app/home-page @Component({ selector: 'ds-home-news', - // styleUrls: ['./home-news.component.scss'], - styleUrls: ['../../../../../app/home-page/home-news/home-news.component.scss'], - // templateUrl: './home-news.component.html' - templateUrl: '../../../../../app/home-page/home-news/home-news.component.html' + styleUrls: ['./home-news.component.scss'], + templateUrl: './home-news.component.html' }) /** diff --git a/src/themes/pedspace-custom/app/navbar/navbar.component.html b/src/themes/pedspace-custom/app/navbar/navbar.component.html index e69de29b..dcd7e152 100644 --- a/src/themes/pedspace-custom/app/navbar/navbar.component.html +++ b/src/themes/pedspace-custom/app/navbar/navbar.component.html @@ -0,0 +1,26 @@ + diff --git a/src/themes/pedspace-custom/app/navbar/navbar.component.scss b/src/themes/pedspace-custom/app/navbar/navbar.component.scss index e69de29b..28ead2f1 100644 --- a/src/themes/pedspace-custom/app/navbar/navbar.component.scss +++ b/src/themes/pedspace-custom/app/navbar/navbar.component.scss @@ -0,0 +1,65 @@ +nav.navbar { + align-items: baseline; + + .navbar-inner-container { + border-top: 1px var(--ds-header-navbar-border-top-color) solid; + } +} + +.navbar-nav { + background-color: var(--ds-navbar-bg); +} + +/** Mobile menu styling **/ +@media screen and (max-width: map-get($grid-breakpoints, md)-0.02) { + .navbar { + width: 100vw; + background-color: var(--bs-white); + position: absolute; + overflow: hidden; + height: 0; + z-index: var(--ds-nav-z-index); + &.open { + height: 100vh; //doesn't matter because wrapper is sticky + border-bottom: 5px var(--ds-header-navbar-border-bottom-color) solid; // open navbar covers header-navbar-wrapper border + } + } +} + +@media screen and (min-width: map-get($grid-breakpoints, md)) { + .reset-padding-md { + margin-left: calc(var(--bs-spacer) / -2); + margin-right: calc(var(--bs-spacer) / -2); + } +} + +/* TODO remove when https://github.com/twbs/bootstrap/issues/24726 is fixed */ +.navbar-expand-md.navbar-container { + @media screen and (max-width: map-get($grid-breakpoints, md)-0.02) { + > .navbar-inner-container { + padding: 0 var(--bs-spacer); + a.navbar-brand { + display: none; + } + .navbar-collapsed { + display: none; + } + } + padding: 0; + } + height: 80px; +} + +a.navbar-brand img { + max-height: var(--ds-header-logo-height); +} + +.navbar-nav { + ::ng-deep a.nav-link { + color: var(--ds-navbar-link-color); + + &:hover, &:focus { + color: var(--ds-navbar-link-color-hover); + } + } +} diff --git a/src/themes/pedspace-custom/app/navbar/navbar.component.ts b/src/themes/pedspace-custom/app/navbar/navbar.component.ts index e163f096..321351a9 100644 --- a/src/themes/pedspace-custom/app/navbar/navbar.component.ts +++ b/src/themes/pedspace-custom/app/navbar/navbar.component.ts @@ -7,10 +7,8 @@ import { slideMobileNav } from '../../../../app/shared/animations/slide'; */ @Component({ selector: 'ds-navbar', - // styleUrls: ['./navbar.component.scss'], - styleUrls: ['../../../../app/navbar/navbar.component.scss'], - // templateUrl: './navbar.component.html', - templateUrl: '../../../../app/navbar/navbar.component.html', + styleUrls: ['./navbar.component.scss'], + templateUrl: './navbar.component.html', animations: [slideMobileNav] }) export class NavbarComponent extends BaseComponent {