From 93610d3d07481ce6f72077f468bf58e95a919f57 Mon Sep 17 00:00:00 2001 From: Max Date: Wed, 18 Dec 2019 12:52:17 +0100 Subject: [PATCH] darken background, try to fix #56 --- src/app/components/feed/feed.component.html | 2 +- src/app/components/feed/feed.component.ts | 3 ++- src/styles/greenvironment-material-theme.scss | 12 +++++++++++- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/app/components/feed/feed.component.html b/src/app/components/feed/feed.component.html index 7363565..1fbc9f5 100644 --- a/src/app/components/feed/feed.component.html +++ b/src/app/components/feed/feed.component.html @@ -8,7 +8,7 @@ - diff --git a/src/app/components/feed/feed.component.ts b/src/app/components/feed/feed.component.ts index 5af0431..06bc6ab 100644 --- a/src/app/components/feed/feed.component.ts +++ b/src/app/components/feed/feed.component.ts @@ -10,7 +10,8 @@ import { Actionlist } from 'src/app/models/actionlist'; }) export class FeedComponent implements OnInit { checked: boolean //if the "I protected the environment."-box is checked - value: number //points value of the green action + //points value of the green action + value: any viewNew: boolean = true viewMostLiked: boolean = false diff --git a/src/styles/greenvironment-material-theme.scss b/src/styles/greenvironment-material-theme.scss index 36d2c93..88c7c5b 100644 --- a/src/styles/greenvironment-material-theme.scss +++ b/src/styles/greenvironment-material-theme.scss @@ -11,13 +11,22 @@ // hue. Available color palettes: https://material.io/design/color/ $primary: mat-palette($mat-green); $accent: mat-palette($mat-pink, A200, A100, A400); - +$background-color: map_get($mat-grey, 50); // The warn palette is optional (defaults to red). $warn: mat-palette($mat-red); // Create the theme object (a Sass map containing all of the palettes). $light-theme: mat-light-theme($primary, $accent, $warn); +// Set custom background color +$background-color: map_get($mat-blue-grey, 50); + +$background: map-get($light-theme, background); +$background: map_merge($background, (background: $background-color)); +$light-theme: map_merge($light-theme, (background: $background)); + + + $dark-primary: mat-palette($mat-green); $dark-accent: mat-palette($mat-pink, A200, A100, A400); @@ -27,6 +36,7 @@ $dark-warn: mat-palette($mat-red); // Create the theme object (a Sass map containing all of the palettes). $dark-theme: mat-dark-theme($dark-primary, $dark-accent, $dark-warn); + .dark-theme { @include angular-material-theme($dark-theme); }