From a4cce51e18a3ecebf9681033ed9df4142eae1539 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lukas=20Mau=C3=9F?= <lukas.mauss@mni.thm.de>
Date: Tue, 15 Oct 2019 13:35:38 +0200
Subject: [PATCH] Use different card color in moderator comment list
---
src/app/components/shared/comment/comment.component.html | 3 ++-
src/app/components/shared/comment/comment.component.scss | 6 +++++-
src/theme/dark-theme/darkTheme.const.ts | 3 ++-
src/theme/high-contrast-theme/highContrastTheme.const.ts | 3 ++-
src/theme/light-theme/light-theme.ts | 4 +++-
src/theme/purple-theme/purpleTheme.const.ts | 4 +++-
6 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/src/app/components/shared/comment/comment.component.html b/src/app/components/shared/comment/comment.component.html
index 69826309a..0a7049940 100644
--- a/src/app/components/shared/comment/comment.component.html
+++ b/src/app/components/shared/comment/comment.component.html
@@ -1,5 +1,6 @@
<mat-card id="comment-card" [ngClass]="{'highlighted': comment.highlighted,
- '': !comment.highlighted}" [@slide]>
+ '': !comment.highlighted,
+ 'moderator': moderator}" [@slide]>
<div fxLayout="column">
<div fxLayout="row" class="comment-actions">
<div class="date-container">
diff --git a/src/app/components/shared/comment/comment.component.scss b/src/app/components/shared/comment/comment.component.scss
index 446fb52af..dd044e1f4 100644
--- a/src/app/components/shared/comment/comment.component.scss
+++ b/src/app/components/shared/comment/comment.component.scss
@@ -74,7 +74,7 @@ mat-card-content > :first-child {
.click {
cursor: pointer;
}
-
+user.role
.mat-icon {
transform: scale(1.2);
}
@@ -102,3 +102,7 @@ mat-card-content > :first-child {
.gavel {
color: var(--primary);
}
+
+.moderator {
+ background-color: var(--moderator)!important;
+}
diff --git a/src/theme/dark-theme/darkTheme.const.ts b/src/theme/dark-theme/darkTheme.const.ts
index bb7e60c01..d047560ed 100644
--- a/src/theme/dark-theme/darkTheme.const.ts
+++ b/src/theme/dark-theme/darkTheme.const.ts
@@ -25,7 +25,8 @@ export const dark = {
'--light-green': '#80ba24',
'--grey': '#BDBDBD',
'--grey-light': '#9E9E9E',
- '--black': '#212121'
+ '--black': '#212121',
+ '--moderator': '#37474f'
};
export const dark_meta = {
diff --git a/src/theme/high-contrast-theme/highContrastTheme.const.ts b/src/theme/high-contrast-theme/highContrastTheme.const.ts
index 4c46d7a30..06d8443df 100644
--- a/src/theme/high-contrast-theme/highContrastTheme.const.ts
+++ b/src/theme/high-contrast-theme/highContrastTheme.const.ts
@@ -23,7 +23,8 @@ export const highcontrast = {
'--light-green': 'lightgreen',
'--grey': 'grey',
'--grey-light': 'lightgrey',
- '--black': 'black'
+ '--black': 'black',
+ '--moderator': '#37474f'
};
diff --git a/src/theme/light-theme/light-theme.ts b/src/theme/light-theme/light-theme.ts
index 30d69b59a..34a285394 100644
--- a/src/theme/light-theme/light-theme.ts
+++ b/src/theme/light-theme/light-theme.ts
@@ -25,7 +25,9 @@ export const arsnova = {
'--light-green': '#80ba24',
'--grey': '#BDBDBD',
'--grey-light': '#EEEEEE',
- '--black': 'black'
+ '--black': 'black',
+ '--moderator': '#fff3e0'
+
};
export const arsnova_meta = {
diff --git a/src/theme/purple-theme/purpleTheme.const.ts b/src/theme/purple-theme/purpleTheme.const.ts
index f8739a944..a23b0ba19 100644
--- a/src/theme/purple-theme/purpleTheme.const.ts
+++ b/src/theme/purple-theme/purpleTheme.const.ts
@@ -24,7 +24,9 @@ export const purple = {
'--light-green': 'lightgreen',
'--grey': 'grey',
'--grey-light': 'lightgrey',
- '--black': 'black'
+ '--black': 'black',
+ '--moderator': '#e0f2f1'
+
};
export const purple_meta = {
--
GitLab