From 989d51f46fd59466ffc0d2455bf27d0b56411cc6 Mon Sep 17 00:00:00 2001 From: megli2 Date: Fri, 8 Dec 2023 14:40:08 +0100 Subject: [PATCH] uninstall puzzle shell and implement banner on our own --- frontend/angular.json | 5 +- .../application-banner.component.html | 72 ++++++++++--------- .../application-banner.component.scss | 1 + .../application-banner.component.ts | 1 + 4 files changed, 41 insertions(+), 38 deletions(-) diff --git a/frontend/angular.json b/frontend/angular.json index 122f52587b..ee55dc2591 100644 --- a/frontend/angular.json +++ b/frontend/angular.json @@ -33,10 +33,7 @@ "stylePreprocessorOptions": { "includePaths": ["src/style", "src/assets"] }, - "scripts": [ - "node_modules/@puzzleitc/puzzle-shell/dist/bundle.js", - "node_modules/bootstrap/dist/js/bootstrap.min.js" - ] + "scripts": ["node_modules/bootstrap/dist/js/bootstrap.min.js"] }, "configurations": { "production": { diff --git a/frontend/src/app/application-banner/application-banner.component.html b/frontend/src/app/application-banner/application-banner.component.html index d069bc2dd8..6bb811e4d4 100644 --- a/frontend/src/app/application-banner/application-banner.component.html +++ b/frontend/src/app/application-banner/application-banner.component.html @@ -1,38 +1,42 @@ - - okr-tangram -
-
-
-
- -

Quartal

- -
- +
+
+
+
+
+
+ +

Quartal

+ +
+ +
+
- -
-
+ -
- - - - - {{ - (quarterLabel$ | async) || quarterLabel$.getValue() - }} - Filter - - +
+ + + + + {{ + (quarterLabel$ | async) || quarterLabel$.getValue() + }} + Filter + + -
- - - -
-
-
-
+
+ + + +
+
+
+
+
+
+ okr-tangram +
-
+ diff --git a/frontend/src/app/application-banner/application-banner.component.scss b/frontend/src/app/application-banner/application-banner.component.scss index e13097de5f..dbf18ec973 100644 --- a/frontend/src/app/application-banner/application-banner.component.scss +++ b/frontend/src/app/application-banner/application-banner.component.scss @@ -6,6 +6,7 @@ height: min-content; z-index: 100; transition: 0.5s; + background-color: #dcedf9; } .header-content { diff --git a/frontend/src/app/application-banner/application-banner.component.ts b/frontend/src/app/application-banner/application-banner.component.ts index 9b46e8ef45..7af852e31f 100644 --- a/frontend/src/app/application-banner/application-banner.component.ts +++ b/frontend/src/app/application-banner/application-banner.component.ts @@ -37,6 +37,7 @@ export class ApplicationBannerComponent implements AfterViewInit, OnDestroy { ngAfterViewInit(): void { this.resizeObserver.observe(this.okrBanner.nativeElement); + this.changeHeaderAppearance(); } changeHeaderAppearance() {