From 562664ec5f2aa19a4d0193f2304df2c24f42a86a Mon Sep 17 00:00:00 2001 From: Max Date: Sat, 18 Jan 2020 00:09:10 +0100 Subject: [PATCH] Make nav bar black in dark mode --- src/app/app.module.ts | 5 +- src/app/components/about/about.component.html | 6 +- src/app/components/about/about.component.sass | 1 - .../feed/postlist/postlist.component.sass | 2 + .../components/imprint/imprint.component.html | 2 +- .../main-navigation.component.html | 11 +- .../main-navigation.component.sass | 7 +- src/app/gv-new-logo.svg | 141 ++++++++++++++++++ src/styles/greenvironment-material-theme.scss | 56 +++---- 9 files changed, 189 insertions(+), 42 deletions(-) create mode 100644 src/app/gv-new-logo.svg diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 1dcd433..99d543d 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -70,6 +70,7 @@ import {MatSnackBarModule} from '@angular/material/snack-bar'; // import logo from 'src/assets/gv-new-logo.svg'; import logo from '!!raw-loader!./gv-new-logo-white.svg'; +import logo_green from '!!raw-loader!./gv-new-logo.svg'; const config: SocketIoConfig = { url: 'http://localhost:4444', options: {} }; @@ -162,6 +163,8 @@ const appRoutes: Routes = [ export class AppModule { constructor(iconRegistry: MatIconRegistry, sanitizer: DomSanitizer) { iconRegistry.addSvgIconLiteral( - 'logo', sanitizer.bypassSecurityTrustHtml(logo)); + 'logo', sanitizer.bypassSecurityTrustHtml(logo)); + iconRegistry.addSvgIconLiteral( + 'logo_green', sanitizer.bypassSecurityTrustHtml(logo_green)); } } diff --git a/src/app/components/about/about.component.html b/src/app/components/about/about.component.html index 1a31a56..13f59fa 100644 --- a/src/app/components/about/about.component.html +++ b/src/app/components/about/about.component.html @@ -5,7 +5,7 @@




Keep it clean and green!

@@ -65,8 +65,8 @@

We believe, that together we can do amazing things to protect our environment and keep it clean and green.

You aren't part of greenvironment yet? - join us now!

- Register + Register
- Login + Login
\ No newline at end of file diff --git a/src/app/components/about/about.component.sass b/src/app/components/about/about.component.sass index be12ffc..d8cea49 100644 --- a/src/app/components/about/about.component.sass +++ b/src/app/components/about/about.component.sass @@ -11,7 +11,6 @@ padding: 2em max-width: 100% min-height: 50% - background-color: mat-color($primary) #text1 padding: 2em diff --git a/src/app/components/feed/postlist/postlist.component.sass b/src/app/components/feed/postlist/postlist.component.sass index 7ee04b9..9ad0f8b 100644 --- a/src/app/components/feed/postlist/postlist.component.sass +++ b/src/app/components/feed/postlist/postlist.component.sass @@ -12,6 +12,8 @@ $mat-card-header-size: 40px !default margin-top: 10px .mat-card-subtitle display: contents + .mat-card-content + overflow: auto a:hover cursor: pointer #button-box diff --git a/src/app/components/imprint/imprint.component.html b/src/app/components/imprint/imprint.component.html index 2828c76..d53a447 100644 --- a/src/app/components/imprint/imprint.component.html +++ b/src/app/components/imprint/imprint.component.html @@ -1,4 +1,4 @@ -Imprint +Imprint

The greenvironment network is being developed by the greenvironment team

Contact

diff --git a/src/app/components/main-navigation/main-navigation.component.html b/src/app/components/main-navigation/main-navigation.component.html index 1027467..80caa1f 100644 --- a/src/app/components/main-navigation/main-navigation.component.html +++ b/src/app/components/main-navigation/main-navigation.component.html @@ -7,8 +7,8 @@ fxShow="true" fxHide.gt-sm="true" fixedInViewport="false" autoFocus="false"> - Menu - + Menu +
@@ -32,7 +32,7 @@ - + - + + Greenvironment -