From 3860373fd42091790ac2b00039cccd22e59d0ea5 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Julius=20H=C3=A4rtl?= <jus@bitgrid.net>
Date: Wed, 27 Mar 2019 16:41:46 +0100
Subject: [PATCH] Fix various theming issues on bright colors
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 apps/theming/css/theming.scss | 25 ++++++++++++++++++++++---
 core/css/header.scss          |  2 +-
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/apps/theming/css/theming.scss b/apps/theming/css/theming.scss
index 928c54bc105..23c12be7b2d 100644
--- a/apps/theming/css/theming.scss
+++ b/apps/theming/css/theming.scss
@@ -68,7 +68,8 @@ $invert: luma($color-primary) > 0.6;
 		a,
 		label,
 		p,
-		#alternative-logins legend {
+		#alternative-logins legend,
+		.lost-password-container #lost-password {
 			color: $color-primary-text;
 		}
 		input[type='checkbox'].checkbox--white + label:before {
@@ -175,8 +176,26 @@ input.primary,
 }
 
 @if ($invert) {
-	#body-login #submit-wrapper .icon-confirm-white {
-		background-image: url('../../../core/img/actions/confirm.svg');
+	#body-login {
+		.body-login-container {
+			background-color: $color-main-background;
+		}
+		#submit-wrapper .icon-confirm-white {
+			background-image: url('../../../core/img/actions/confirm.svg');
+		}
+		.body-login-container {
+			h2 {
+				color: $color-main-text;
+			}
+			.icon-search.icon-white {
+				// CSS variable is not used here since it is on the public page layout,
+				// where the dark theme doesn't apply at the moment
+				background-image: url('../../../core/img/actions/search.svg');
+			}
+		}
+	}
+	#body-public #header .icon-more-white {
+		background-image: var(--icon-more-000);
 	}
 }
 
diff --git a/core/css/header.scss b/core/css/header.scss
index 46c9083e458..159083da912 100644
--- a/core/css/header.scss
+++ b/core/css/header.scss
@@ -445,7 +445,7 @@ nav[role='navigation'] {
 			text-overflow: initial;
 			width: auto;
 			overflow: hidden;
-			background-color: var(--color-primary-element);
+			background-color: var(--color-primary);
 			padding: 0 5px;
 			z-index: 2;
 		}
-- 
2.39.5