From 81ba5216f42f0c920ab3ef79c76bfbe31bb4ce07 Mon Sep 17 00:00:00 2001
From: Klaus-Dieter Quibeldey-Cirkel <klaus.quibeldey-cirkel@mni.thm.de>
Date: Thu, 1 Apr 2021 14:56:27 +0200
Subject: [PATCH] Revert "Merge branch
'588-color-the-border-of-a-question-according-to-its-marking' into 'master'"
This reverts merge request !520
---
.../home/home-page/home-page.component.html | 2 --
.../home/home-page/home-page.component.scss | 3 +--
.../home/new-landing/new-landing.component.scss | 4 ++--
.../shared/comment/comment.component.html | 7 +------
.../shared/comment/comment.component.scss | 17 +----------------
src/theme/blue-theme/blueTheme.const.ts | 3 +--
src/theme/dark-theme/darkTheme.const.ts | 3 +--
.../highContrastTheme.const.ts | 1 -
src/theme/light-theme/light-theme.ts | 3 +--
src/theme/purple-theme/purpleTheme.const.ts | 3 +--
10 files changed, 9 insertions(+), 37 deletions(-)
diff --git a/src/app/components/home/home-page/home-page.component.html b/src/app/components/home/home-page/home-page.component.html
index cdf649c19..e8562e801 100644
--- a/src/app/components/home/home-page/home-page.component.html
+++ b/src/app/components/home/home-page/home-page.component.html
@@ -32,7 +32,6 @@
</mat-card>
</div>
- <!--
<h2>
<span class="feedback">
<a class="info"
@@ -43,7 +42,6 @@
</a>
</span>
</h2>
- -->
<button id="live_announcer-button"
tabIndex="-1"
diff --git a/src/app/components/home/home-page/home-page.component.scss b/src/app/components/home/home-page/home-page.component.scss
index a8c1e2067..11b2ccc26 100644
--- a/src/app/components/home/home-page/home-page.component.scss
+++ b/src/app/components/home/home-page/home-page.component.scss
@@ -1,8 +1,7 @@
.outer {
width: 80%;
max-width: 300px;
- background-color: var(--background);
- box-shadow: none;
+ background-color: var(--surface);
}
.main-heading-primary {
diff --git a/src/app/components/home/new-landing/new-landing.component.scss b/src/app/components/home/new-landing/new-landing.component.scss
index 5d6f0b244..5a74df385 100644
--- a/src/app/components/home/new-landing/new-landing.component.scss
+++ b/src/app/components/home/new-landing/new-landing.component.scss
@@ -4,8 +4,8 @@
border-radius: 5px;
margin: 10% 0 2% 0;
font-size: large;
- background-color: var(--background);
- color: var(--on-background);
+ background-color: var(--surface);
+ color: var(--on-surface);
}
.add {
diff --git a/src/app/components/shared/comment/comment.component.html b/src/app/components/shared/comment/comment.component.html
index 6230d12e7..28af9e855 100644
--- a/src/app/components/shared/comment/comment.component.html
+++ b/src/app/components/shared/comment/comment.component.html
@@ -1,13 +1,8 @@
<mat-card id="comment-card" class="border"
[ngClass]="{'highlighted': comment.highlighted, '': !comment.highlighted,
'moderator': moderator,
- 'border-notMarked': comment.correct === 0 && comment.bookmark === false && comment.favorite === false && !comment.answer && comment.creatorId !== user.id,
- 'border-ownQuestion': comment.creatorId === user.id && comment.correct === 0 && comment.bookmark === false && comment.favorite === false && !comment.answer,
- 'border-answer': comment.answer && comment.correct === 0 && comment.bookmark === false && comment.favorite === false,
'border-correct': comment.correct === 1,
- 'border-wrong': comment.correct === 2,
- 'border-bookmark': comment.bookmark === true,
- 'border-favorite': comment.favorite === true
+ 'border-wrong': comment.correct === 2
}"
[@slide]="slideAnimationState"
(@slide.done)="changeSlideState()">
diff --git a/src/app/components/shared/comment/comment.component.scss b/src/app/components/shared/comment/comment.component.scss
index 303434bb7..99b8a839e 100644
--- a/src/app/components/shared/comment/comment.component.scss
+++ b/src/app/components/shared/comment/comment.component.scss
@@ -52,7 +52,7 @@ mat-card-content > :first-child {
}
.bookmark-icon {
- color: var(--magenta);
+ color: var(--red);
}
.wrong-icon {
@@ -139,21 +139,6 @@ mat-card-content > :first-child {
&-wrong{
@include card-box-shadow(var(--red));
}
- &-bookmark{
- @include card-box-shadow(var(--magenta));
- }
- &-favorite{
- @include card-box-shadow(var(--yellow));
- }
- &-notMarked{
- @include card-box-shadow(var(--grey));
- }
- &-answer{
- @include card-box-shadow(var(--primary));
- }
- &-ownQuestion{
- @include card-box-shadow(var(--purple));
- }
&-bonus{
@include card-box-shadow(var(--yellow));
}
diff --git a/src/theme/blue-theme/blueTheme.const.ts b/src/theme/blue-theme/blueTheme.const.ts
index e8e379ef7..fc6581f68 100644
--- a/src/theme/blue-theme/blueTheme.const.ts
+++ b/src/theme/blue-theme/blueTheme.const.ts
@@ -23,9 +23,8 @@ export const blue = {
'--yellow': '#FFD54F',
'--blue': '#3f51b5',
'--purple': '#9c27b0',
- '--magenta': '#ea0a8e',
'--light-green': '#80ba24',
- '--grey': 'slategrey',
+ '--grey': '#BDBDBD',
'--grey-light': '#EEEEEE',
'--black': '#212121',
'--moderator': 'darkred'
diff --git a/src/theme/dark-theme/darkTheme.const.ts b/src/theme/dark-theme/darkTheme.const.ts
index 365fbe157..7cd195e52 100644
--- a/src/theme/dark-theme/darkTheme.const.ts
+++ b/src/theme/dark-theme/darkTheme.const.ts
@@ -26,9 +26,8 @@ export const dark = {
'--yellow': 'yellow',
'--blue': '#3f51b5',
'--purple': '#9c27b0',
- '--magenta': '#ea0a8e',
'--light-green': '#80ba24',
- '--grey': 'slategrey',
+ '--grey': '#BDBDBD',
'--grey-light': '#9E9E9E',
'--black': 'black',
'--moderator': 'maroon'
diff --git a/src/theme/high-contrast-theme/highContrastTheme.const.ts b/src/theme/high-contrast-theme/highContrastTheme.const.ts
index e9b6e254f..bb11ab8c3 100644
--- a/src/theme/high-contrast-theme/highContrastTheme.const.ts
+++ b/src/theme/high-contrast-theme/highContrastTheme.const.ts
@@ -26,7 +26,6 @@ export const highcontrast = {
'--yellow': '#e9d533',
'--blue': '#3833e9',
'--purple': '#e933e2',
- '--magenta': '#ea0a8e',
'--light-green': '#33e98d',
'--grey': '#7e7e7e',
'--grey-light': '#9c9c9c',
diff --git a/src/theme/light-theme/light-theme.ts b/src/theme/light-theme/light-theme.ts
index afec344e3..c26611a07 100644
--- a/src/theme/light-theme/light-theme.ts
+++ b/src/theme/light-theme/light-theme.ts
@@ -26,9 +26,8 @@ export const arsnova = {
'--yellow': 'red',
'--blue': '#002878',
'--purple': '#9c27b0',
- '--magenta': '#ea0a8e',
'--light-green': 'lightgreen',
- '--grey': 'slategrey',
+ '--grey': '#BDBDBD',
'--grey-light': '#EEEEEE',
'--black': '#000000',
'--moderator': 'lightsalmon'
diff --git a/src/theme/purple-theme/purpleTheme.const.ts b/src/theme/purple-theme/purpleTheme.const.ts
index 880063da1..494418293 100644
--- a/src/theme/purple-theme/purpleTheme.const.ts
+++ b/src/theme/purple-theme/purpleTheme.const.ts
@@ -26,9 +26,8 @@ export const purple = {
'--yellow': 'red',
'--blue': 'blue',
'--purple': 'purple',
- '--magenta': '#ea0a8e',
'--light-green': 'lightgreen',
- '--grey': 'slategrey',
+ '--grey': 'grey',
'--grey-light': 'lightgrey',
'--black': 'black',
'--moderator': 'lightsalmon'
--
GitLab