diff --git a/apps/cde-ui/src/app/app.component.ts b/apps/cde-ui/src/app/app.component.ts
index 96fa47a83..1416f2e00 100644
--- a/apps/cde-ui/src/app/app.component.ts
+++ b/apps/cde-ui/src/app/app.component.ts
@@ -1,7 +1,6 @@
import { Component, inject } from '@angular/core';
import { Router, RouterOutlet } from '@angular/router';
-import { HeaderComponent } from './components/header/header.component';
import { ScreenSizeNoticeComponent } from './components/screen-size-notice/screen-size-notice.component';
/** Max width to show screen size notice */
@@ -14,7 +13,7 @@ export const SCREEN_SIZE_NOTICE_MAX_HEIGHT = 832;
*/
@Component({
standalone: true,
- imports: [RouterOutlet, HeaderComponent],
+ imports: [RouterOutlet],
selector: 'cde-root',
templateUrl: './app.component.html',
styleUrl: './app.component.scss',
diff --git a/apps/cde-ui/src/app/components/header/header.component.html b/apps/cde-ui/src/app/components/header/header.component.html
deleted file mode 100644
index 65511a34a..000000000
--- a/apps/cde-ui/src/app/components/header/header.component.html
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
-
-
-
- Cell Distance Explorer
- HRA Preview Application
-
-
-
-
-
-
-
diff --git a/apps/cde-ui/src/app/components/header/header.component.scss b/apps/cde-ui/src/app/components/header/header.component.scss
deleted file mode 100644
index f9c8fc9c6..000000000
--- a/apps/cde-ui/src/app/components/header/header.component.scss
+++ /dev/null
@@ -1,123 +0,0 @@
-@use 'sass:math';
-
-:host {
- $logo-height: 3rem;
- --mat-text-button-hover-state-layer-opacity: 0;
-
- display: flex;
- margin: 0 1rem;
- align-items: center;
- gap: 1rem;
- height: 5.25rem;
-
- .hra-home,
- .cde-home {
- height: $logo-height;
- border-radius: 0.5rem;
-
- img {
- height: $logo-height;
- }
- }
-
- .cde-home {
- display: inline-flex;
- img {
- margin-right: 0.75rem;
- }
-
- .cde-label {
- color: #201e3d;
- font-size: 1.25rem;
- line-height: 1.875rem;
- }
-
- .preview-app {
- font-size: 1rem;
- line-height: 1.5rem;
- letter-spacing: 0.5px;
- font-weight: 500;
- color: #4b4b5e;
- }
- }
-
- .logo.small {
- display: none;
- }
-
- .help {
- --mdc-text-button-label-text-size: 11px;
- --mdc-text-button-label-text-tracking: 0.2px;
- line-height: 16.5px;
- $border-width: 0.125rem;
- $bottom-border-width: 0rem;
- height: 1.75rem;
- min-width: fit-content;
-
- &:not(:focus-visible) {
- border-bottom-style: solid;
- border-bottom-width: $bottom-border-width;
- border-bottom-left-radius: 0;
- border-bottom-right-radius: 0;
- }
-
- &:focus-visible {
- padding: (0.5rem - $border-width) (5rem - $border-width) (0.5rem - $border-width + $bottom-border-width)
- (0.25rem - $border-width);
- border-style: solid;
- border-width: $border-width;
- }
- }
-
- .filler {
- flex-grow: 1;
- }
-
- @media (max-width: 544px) {
- gap: 0.25rem;
- .hra-home {
- .large {
- display: none;
- }
- .small {
- display: block;
- }
- img {
- height: 2.5rem;
- }
- }
- .cde-home {
- .cde-label {
- font-size: 1rem;
- line-height: 1.5rem;
- }
-
- .preview-app {
- font-size: 0.75rem;
- line-height: 18px;
- }
-
- img {
- height: 2.5rem;
- }
- }
- }
-
- @media (min-width: 544px) {
- .help {
- --mdc-text-button-label-text-size: 0.875rem;
- line-height: 21px;
- padding: 0.75rem 1.5rem;
- height: 45px;
- }
- }
-
- @media (min-width: 1012px) {
- .help {
- border-bottom-width: 0.125rem !important;
- padding: 0 5rem 0 0.25rem;
- --mdc-text-button-label-text-size: 1.125rem;
- line-height: 27px;
- }
- }
-}
diff --git a/apps/cde-ui/src/app/components/header/header.component.spec.ts b/apps/cde-ui/src/app/components/header/header.component.spec.ts
deleted file mode 100644
index 83cde141a..000000000
--- a/apps/cde-ui/src/app/components/header/header.component.spec.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { render, screen } from '@testing-library/angular';
-import { HeaderComponent } from './header.component';
-import { RouterModule } from '@angular/router';
-
-describe('HeaderComponent', () => {
- it('should render the logo', async () => {
- await render(HeaderComponent);
-
- const logo = screen.getAllByAltText('Human Reference Atlas home')[0];
- expect(logo).toBeInTheDocument();
- });
-
- it('should have navigable links', async () => {
- await render(HeaderComponent, {
- imports: [RouterModule.forRoot([])],
- });
-
- const homeLink = screen.getByAltText('Cell Distance Explorer home');
- expect(homeLink).toBeInTheDocument();
- });
-});
diff --git a/apps/cde-ui/src/app/components/header/header.component.theme.scss b/apps/cde-ui/src/app/components/header/header.component.theme.scss
deleted file mode 100644
index 4e34d46ef..000000000
--- a/apps/cde-ui/src/app/components/header/header.component.theme.scss
+++ /dev/null
@@ -1,47 +0,0 @@
-@use '@angular/material' as mat;
-
-@mixin color($theme) {
- cde-header {
- .hra-home,
- .cde-home {
- &:focus-visible {
- outline-color: mat.get-theme-color($theme, primary, default);
- }
- }
-
- .help {
- --mdc-text-button-label-text-color: #{mat.get-theme-color($theme, accent, default)};
- border-color: mat.get-theme-color($theme, accent, lighter);
-
- &:hover {
- border-color: mat.get-theme-color($theme, primary, default);
- }
-
- &:active {
- --mdc-text-button-label-text-color: #{mat.get-theme-color($theme, primary, darker)};
- border-color: mat.get-theme-color($theme, primary, darker);
- }
-
- &:focus-visible {
- --mat-text-button-state-layer-color: white;
- border-color: mat.get-theme-color($theme, primary, default);
- }
- }
- }
-}
-
-@mixin typography($theme) {
- cde-header {
- @include mat.button-typography($theme);
- }
-}
-
-@mixin theme($theme) {
- @if mat.theme-has($theme, color) {
- @include color($theme);
- }
-
- @if mat.theme-has($theme, typography) {
- @include typography($theme);
- }
-}
diff --git a/apps/cde-ui/src/app/components/header/header.component.ts b/apps/cde-ui/src/app/components/header/header.component.ts
deleted file mode 100644
index 1fae38ff8..000000000
--- a/apps/cde-ui/src/app/components/header/header.component.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { CommonModule } from '@angular/common';
-import { ChangeDetectionStrategy, Component } from '@angular/core';
-import { MatButtonModule } from '@angular/material/button';
-import { RouterModule } from '@angular/router';
-import { AssetUrlPipe } from '@hra-ui/cdk/app-href';
-
-/**
- * Component for header
- */
-@Component({
- selector: 'cde-header',
- standalone: true,
- imports: [CommonModule, RouterModule, MatButtonModule, AssetUrlPipe],
- templateUrl: './header.component.html',
- styleUrl: './header.component.scss',
- changeDetection: ChangeDetectionStrategy.OnPush,
-})
-export class HeaderComponent {}
diff --git a/apps/cde-ui/src/app/components/visual-card/visual-card.component.html b/apps/cde-ui/src/app/components/visual-card/visual-card.component.html
index 8a9a1db4f..393058a98 100644
--- a/apps/cde-ui/src/app/components/visual-card/visual-card.component.html
+++ b/apps/cde-ui/src/app/components/visual-card/visual-card.component.html
@@ -1,9 +1,9 @@
@for (card of cardData(); track card.label) {
-
+
{{ card.label }}
- east
-
+ arrow_right_alt
+
}
diff --git a/apps/cde-ui/src/app/components/visual-card/visual-card.component.scss b/apps/cde-ui/src/app/components/visual-card/visual-card.component.scss
index 2a8691e0c..97f87fb78 100644
--- a/apps/cde-ui/src/app/components/visual-card/visual-card.component.scss
+++ b/apps/cde-ui/src/app/components/visual-card/visual-card.component.scss
@@ -1,87 +1,57 @@
-// @use '../../../styles/cta' as cta;
-
:host {
display: flex;
flex-wrap: wrap;
gap: 2.5rem;
column-gap: 1.75rem;
- justify-content: center;
+ margin: 0 auto;
+ width: min-content;
+
+ @media (min-width: 768px) {
+ margin: 0;
+ width: auto;
+ }
+
+ @media (min-width: 1280px) {
+ justify-content: space-between;
+ }
.visual-card {
+ @media (min-width: 1012px) {
+ width: 24.5rem;
+ height: 24.5rem;
+ }
+
+ @media (min-width: 1920px) {
+ width: 30.5rem;
+ height: 30.5rem;
+ }
+
border-radius: 1rem;
overflow: hidden;
- box-shadow: 0px 5px 1rem 0px rgba(32, 30, 61, 0.24);
+ box-shadow: 0px 5px 1rem 0px rgb(from var(--sys-shadow) r g b / 0.24);
outline-offset: 0;
cursor: pointer;
display: flex;
flex-direction: column;
justify-content: center;
- font-family: Metropolis;
width: 17.5rem;
height: 17.5rem;
&:hover {
- box-shadow: 0px 5px 1rem 5px rgba(32, 30, 61, 0.24);
+ box-shadow: 0px 5px 1rem 5px rgb(from var(--sys-shadow) r g b / 0.24);
}
- // &:focus-visible .label {
- // @include cta.flatFocus();
- // }
-
img {
width: 100%;
object-fit: contain;
}
.label {
- display: flex;
- align-items: center;
- justify-content: center;
margin: auto auto;
- font-size: 0.75rem;
- line-height: 1.125rem;
}
mat-icon {
- vertical-align: middle;
- height: 1rem;
- width: 1rem;
- font-size: 1rem;
- margin-left: 0.5rem;
- }
- }
-
- @media (min-width: 768px) {
- justify-content: space-between;
- }
-
- @media (min-width: 1012px) {
- .visual-card {
- width: 24.5rem;
- height: 24.5rem;
-
- .label {
- font-size: 1rem;
- line-height: 1.5rem;
- }
-
- mat-icon {
- height: 1.5rem;
- width: 1.5rem;
- font-size: 1.5rem;
- margin-left: 0.75rem;
- }
- }
- }
-
- @media (min-width: 1280px) {
- column-gap: 2rem;
- }
-
- @media (min-width: 1920px) {
- .visual-card {
- width: 30.5rem;
- height: 30.5rem;
+ margin-left: 0.25rem;
}
}
}
diff --git a/apps/cde-ui/src/app/components/visual-card/visual-card.component.ts b/apps/cde-ui/src/app/components/visual-card/visual-card.component.ts
index ab9ac7212..ddc998295 100644
--- a/apps/cde-ui/src/app/components/visual-card/visual-card.component.ts
+++ b/apps/cde-ui/src/app/components/visual-card/visual-card.component.ts
@@ -1,8 +1,8 @@
-import { ChangeDetectionStrategy, Component, input } from '@angular/core';
import { CommonModule } from '@angular/common';
-import { MatButtonModule } from '@angular/material/button';
+import { ChangeDetectionStrategy, Component, input } from '@angular/core';
import { MatIconModule } from '@angular/material/icon';
import { RouterModule } from '@angular/router';
+import { ButtonModule } from '@hra-ui/design-system/button';
/**
* Interface for the visual card
@@ -24,7 +24,7 @@ export interface VisualCard {
@Component({
selector: 'cde-visual-card',
standalone: true,
- imports: [CommonModule, MatButtonModule, MatIconModule, RouterModule],
+ imports: [CommonModule, ButtonModule, MatIconModule, RouterModule],
templateUrl: './visual-card.component.html',
styleUrl: './visual-card.component.scss',
changeDetection: ChangeDetectionStrategy.OnPush,
diff --git a/apps/cde-ui/src/app/pages/create-visualization-page/create-visualization-page.component.scss b/apps/cde-ui/src/app/pages/create-visualization-page/create-visualization-page.component.scss
index ccd079f51..4a63e3ecd 100644
--- a/apps/cde-ui/src/app/pages/create-visualization-page/create-visualization-page.component.scss
+++ b/apps/cde-ui/src/app/pages/create-visualization-page/create-visualization-page.component.scss
@@ -10,13 +10,6 @@
height: 5rem;
}
- ::ng-deep .app-logo .app-description {
- border-radius: 0.125rem;
- width: fit-content;
- padding: 0 0.25rem;
- font: 500 0.625rem/1rem Metropolis !important;
- }
-
.content {
display: flex;
flex-direction: column;
diff --git a/apps/cde-ui/src/app/pages/create-visualization-page/create-visualization-page.component.theme.scss b/apps/cde-ui/src/app/pages/create-visualization-page/create-visualization-page.component.theme.scss
index 77ba3ef3e..fdf80d67b 100644
--- a/apps/cde-ui/src/app/pages/create-visualization-page/create-visualization-page.component.theme.scss
+++ b/apps/cde-ui/src/app/pages/create-visualization-page/create-visualization-page.component.theme.scss
@@ -5,11 +5,6 @@ cde-create-visualization-page {
background-color: var(--sys-surface-container-high) !important;
}
- .app-description {
- color: var(--sys-on-tertiary-fixed) !important;
- background: rgb(from var(--sys-on-tertiary-container) r g b / 0.08);
- }
-
.card {
background-color: var(--sys-surface-container-low);
diff --git a/apps/cde-ui/src/app/pages/create-visualization-page/create-visualization-page.component.ts b/apps/cde-ui/src/app/pages/create-visualization-page/create-visualization-page.component.ts
index 77f2a3974..fb2a2aca2 100644
--- a/apps/cde-ui/src/app/pages/create-visualization-page/create-visualization-page.component.ts
+++ b/apps/cde-ui/src/app/pages/create-visualization-page/create-visualization-page.component.ts
@@ -34,7 +34,6 @@ import { ParseError } from 'papaparse';
import { MarkEmptyFormControlDirective } from '../../components/empty-form-control/empty-form-control.directive';
import { FileLoadError, FileUploadComponent } from '../../components/file-upload/file-upload.component';
-import { HeaderComponent } from '../../components/header/header.component';
import { VisualizationDataService } from '../../services/visualization-data-service/visualization-data.service';
import { validateInteger } from '../../shared/form-validators/is-integer';
import { OrganEntry } from '../../shared/resolvers/organs/organs.resolver';
@@ -78,7 +77,6 @@ function optionalValue(): T | null {
ButtonModule,
FileUploadComponent,
FooterComponent,
- HeaderComponent,
MarkEmptyFormControlDirective,
NavHeaderComponent,
OverlayModule,
diff --git a/apps/cde-ui/src/app/pages/landing-page/landing-page.component.html b/apps/cde-ui/src/app/pages/landing-page/landing-page.component.html
index ce6403f67..7786aa7a9 100644
--- a/apps/cde-ui/src/app/pages/landing-page/landing-page.component.html
+++ b/apps/cde-ui/src/app/pages/landing-page/landing-page.component.html
@@ -1,9 +1,14 @@
-
+