From 592eeffd82be35eb8c792df0b725d9fe1a3b1ff3 Mon Sep 17 00:00:00 2001
From: Klaus Quibeldey-Cirkel <klaus.quibeldey-cirkel@mni.thm.de>
Date: Sun, 26 Jul 2020 16:49:11 +0200
Subject: [PATCH] theme corrections
---
.../shared/header/header.component.html | 2 +-
src/theme/dark-theme/_dark-theme.scss | 15 +++++++++++++++
.../high-contrast-theme/_high-contrast-theme.scss | 15 +++++++++++++++
3 files changed, 31 insertions(+), 1 deletion(-)
diff --git a/src/app/components/shared/header/header.component.html b/src/app/components/shared/header/header.component.html
index ae50f7268..38eb0f63c 100644
--- a/src/app/components/shared/header/header.component.html
+++ b/src/app/components/shared/header/header.component.html
@@ -15,7 +15,7 @@
</h2>
<span class="fill-remaining-space"
*ngIf="router.url.includes('comments') && deviceType === 'desktop'"></span>
- <button *ngIf="router.url.includes('comments') && (user.role === 0 || user.role === 3) && deviceType === 'desktop'"
+ <button *ngIf="(router.url.includes('comments') && !router.url.includes('moderator')) && deviceType === 'desktop'"
mat-raised-button class="question-focus-btn" routerLink="participant/room/{{shortId}}/comments/questionwall">
<mat-icon svgIcon="beamer" class="header-icons beamer-icon"></mat-icon>
<span class="question-focus-btn-txt">{{'header.question-wall' | translate}}</span>
diff --git a/src/theme/dark-theme/_dark-theme.scss b/src/theme/dark-theme/_dark-theme.scss
index 3c84cc949..75bad02bb 100644
--- a/src/theme/dark-theme/_dark-theme.scss
+++ b/src/theme/dark-theme/_dark-theme.scss
@@ -18,3 +18,18 @@ a {
.mat-dialog-container h3 {
color: var(--on-surface) !important;
}
+
+::ng-deep .mat-menu-panel {
+ background-color: var(--dialog);
+ color: var(--on-dialog);
+}
+
+::ng-deep .mat-menu-item {
+ background-color: var(--dialog);
+ color: var(--on-dialog);
+}
+
+::ng-deep .mat-menu-item .mat-icon {
+ background-color: var(--dialog);
+ color: var(--on-dialog);
+}
diff --git a/src/theme/high-contrast-theme/_high-contrast-theme.scss b/src/theme/high-contrast-theme/_high-contrast-theme.scss
index 2d1d49793..00fb6ad8d 100644
--- a/src/theme/high-contrast-theme/_high-contrast-theme.scss
+++ b/src/theme/high-contrast-theme/_high-contrast-theme.scss
@@ -14,3 +14,18 @@ $purple-theme: mat-light-theme($purple-primary, $purple-accent, $purple-warn);
.mat-dialog-container h3 {
color: var(--on-surface) !important;
}
+
+::ng-deep .mat-menu-panel {
+ background-color: var(--dialog);
+ color: var(--on-dialog);
+}
+
+::ng-deep .mat-menu-item {
+ background-color: var(--dialog);
+ color: var(--on-dialog);
+}
+
+::ng-deep .mat-menu-item .mat-icon {
+ background-color: var(--dialog);
+ color: var(--on-dialog);
+}
--
GitLab