Merge branch 'revert-b7571b54' into 'master'

Revert "Merge branch '588-color-the-border-of-a-question-according-to-its-marking' into 'master'"

See merge request arsnova/frag.jetzt!522

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"

src/app/components/home/home-page/home-page.component.scss

 .outer {
   width: 80%;
   max-width: 300px;
-  background-color: var(--background);
-  box-shadow: none;
+  background-color: var(--surface);
 }
 
 .main-heading-primary {

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 {

src/app/components/shared/comment/comment.component.html

 <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()">

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));
   }

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'

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'

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',

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'

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'