Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 480e0f91 authored by Fahim Salam Chowdhury's avatar Fahim Salam Chowdhury 👽
Browse files

fix: patch-026 for nc32 upgrade

parent 4bf968cf
Loading
Loading
Loading
Loading
Loading
+6 −6
Original line number Diff line number Diff line
@@ -2,8 +2,8 @@ From: Avinash <avinashg@e.email>
Date: Web, 12 Mar 2023 17:00 +0530
Subject: [PATCH] To fix the primary color in nextcloud 25 onwards

--- apps/theming/lib/Themes/CommonThemeTrait.php	2023-04-12 17:16:23.456078658 +0530
+++ apps/theming/lib/Themes/CommonThemeTrait-new.php	2023-04-12 17:17:30.456079957 +0530
--- ./apps/theming/lib/Themes/CommonThemeTrait.php	2026-03-23 17:46:38.214004783 +0600
+++ ./apps/theming/lib/Themes/CommonThemeTrait-new.php	2026-03-24 09:57:32.869130797 +0600
@@ -26,6 +26,9 @@
 	 */
 	protected function generatePrimaryVariables(string $colorMainBackground, string $colorMainText, bool $highContrast = false): array {
@@ -12,12 +12,12 @@ Subject: [PATCH] To fix the primary color in nextcloud 25 onwards
+		$this->primaryColor = $defaults->getColorPrimary();
+		$this->defaultPrimaryColor=$defaults->getColorPrimary();
 		$colorPrimaryElement = $this->util->elementColor($this->primaryColor, $isBrightColor, $colorMainBackground, $highContrast);
 		$colorPrimaryElementText = $this->util->getTextColor($colorPrimaryElement);
 		$colorPrimaryLight = $this->util->mix($colorPrimaryElement, $colorMainBackground, -80);
 		$colorPrimaryElementLight = $this->util->mix($colorPrimaryElement, $colorMainBackground, -80);

--- apps/theming/lib/Util.php	2023-04-12 17:16:23.456078658 +0530
+++ apps/theming/lib/Util-new.php	2023-04-12 17:17:30.456079957 +0530
@@ -35,7 +35,7 @@
--- ./apps/theming/lib/Util.php	2026-03-23 17:46:38.215004781 +0600
+++ ./apps/theming/lib/Util-new.php	2026-03-24 10:00:04.574832693 +0600
@@ -33,7 +33,7 @@
 	 * @return bool
 	 */
 	public function invertTextColor(string $color): bool {