From 0673194079ebadb3fae0e8c9018aa900e79cead2 Mon Sep 17 00:00:00 2001 From: Morgan Pretty Date: Mon, 19 Aug 2024 08:51:34 +1000 Subject: [PATCH 1/2] Minor theme change --- SessionUIKit/Style Guide/Themes/Theme+ClassicLight.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SessionUIKit/Style Guide/Themes/Theme+ClassicLight.swift b/SessionUIKit/Style Guide/Themes/Theme+ClassicLight.swift index 1feb658bb..3d1e66ebb 100644 --- a/SessionUIKit/Style Guide/Themes/Theme+ClassicLight.swift +++ b/SessionUIKit/Style Guide/Themes/Theme+ClassicLight.swift @@ -18,7 +18,7 @@ internal enum Theme_ClassicLight: ThemeColors { .backgroundSecondary: .classicLight5, .textPrimary: .classicLight0, .textSecondary: .classicLight1, - .borderSeparator: .classicLight2, + .borderSeparator: .classicLight3, // Path .path_connected: .pathConnected, From fd8fdb11058e6412a007d93c7dc3e3541a1f79ed Mon Sep 17 00:00:00 2001 From: Morgan Pretty Date: Mon, 19 Aug 2024 14:54:43 +1000 Subject: [PATCH 2/2] Updated the PrimaryFillButton text colours --- SessionUIKit/Style Guide/Themes/Theme+ClassicDark.swift | 4 ++-- SessionUIKit/Style Guide/Themes/Theme+ClassicLight.swift | 4 ++-- SessionUIKit/Style Guide/Themes/Theme+OceanDark.swift | 4 ++-- SessionUIKit/Style Guide/Themes/Theme+OceanLight.swift | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/SessionUIKit/Style Guide/Themes/Theme+ClassicDark.swift b/SessionUIKit/Style Guide/Themes/Theme+ClassicDark.swift index ce5a62c53..b5e7ee9fe 100644 --- a/SessionUIKit/Style Guide/Themes/Theme+ClassicDark.swift +++ b/SessionUIKit/Style Guide/Themes/Theme+ClassicDark.swift @@ -65,7 +65,7 @@ internal enum Theme_ClassicDark: ThemeColors { .sessionButton_destructiveBackground: .clear, .sessionButton_destructiveHighlight: .dangerDark.withAlphaComponent(0.3), .sessionButton_destructiveBorder: .dangerDark, - .sessionButton_primaryFilledText: .classicDark0, + .sessionButton_primaryFilledText: .black, .sessionButton_primaryFilledBackground: .primary, // SolidButton @@ -186,7 +186,7 @@ internal enum Theme_ClassicDark: ThemeColors { .sessionButton_destructiveBackground: .clear, .sessionButton_destructiveHighlight: .dangerDark.opacity(0.3), .sessionButton_destructiveBorder: .dangerDark, - .sessionButton_primaryFilledText: .classicDark0, + .sessionButton_primaryFilledText: .black, .sessionButton_primaryFilledBackground: .primary, // SolidButton diff --git a/SessionUIKit/Style Guide/Themes/Theme+ClassicLight.swift b/SessionUIKit/Style Guide/Themes/Theme+ClassicLight.swift index 3d1e66ebb..a80872f54 100644 --- a/SessionUIKit/Style Guide/Themes/Theme+ClassicLight.swift +++ b/SessionUIKit/Style Guide/Themes/Theme+ClassicLight.swift @@ -65,7 +65,7 @@ internal enum Theme_ClassicLight: ThemeColors { .sessionButton_destructiveBackground: .clear, .sessionButton_destructiveHighlight: .dangerLight.withAlphaComponent(0.3), .sessionButton_destructiveBorder: .dangerLight, - .sessionButton_primaryFilledText: .classicLight0, + .sessionButton_primaryFilledText: .black, .sessionButton_primaryFilledBackground: .primary, // SolidButton @@ -186,7 +186,7 @@ internal enum Theme_ClassicLight: ThemeColors { .sessionButton_destructiveBackground: .clear, .sessionButton_destructiveHighlight: .dangerLight.opacity(0.3), .sessionButton_destructiveBorder: .dangerLight, - .sessionButton_primaryFilledText: .classicLight0, + .sessionButton_primaryFilledText: .black, .sessionButton_primaryFilledBackground: .primary, // SolidButton diff --git a/SessionUIKit/Style Guide/Themes/Theme+OceanDark.swift b/SessionUIKit/Style Guide/Themes/Theme+OceanDark.swift index b05a49864..1e76a60e3 100644 --- a/SessionUIKit/Style Guide/Themes/Theme+OceanDark.swift +++ b/SessionUIKit/Style Guide/Themes/Theme+OceanDark.swift @@ -65,7 +65,7 @@ internal enum Theme_OceanDark: ThemeColors { .sessionButton_destructiveBackground: .clear, .sessionButton_destructiveHighlight: .dangerDark.withAlphaComponent(0.3), .sessionButton_destructiveBorder: .dangerDark, - .sessionButton_primaryFilledText: .oceanDark0, + .sessionButton_primaryFilledText: .black, .sessionButton_primaryFilledBackground: .primary, // SolidButton @@ -186,7 +186,7 @@ internal enum Theme_OceanDark: ThemeColors { .sessionButton_destructiveBackground: .clear, .sessionButton_destructiveHighlight: .dangerDark.opacity(0.3), .sessionButton_destructiveBorder: .dangerDark, - .sessionButton_primaryFilledText: .oceanDark0, + .sessionButton_primaryFilledText: .black, .sessionButton_primaryFilledBackground: .primary, // SolidButton diff --git a/SessionUIKit/Style Guide/Themes/Theme+OceanLight.swift b/SessionUIKit/Style Guide/Themes/Theme+OceanLight.swift index 93fa004fc..bd2d23cf5 100644 --- a/SessionUIKit/Style Guide/Themes/Theme+OceanLight.swift +++ b/SessionUIKit/Style Guide/Themes/Theme+OceanLight.swift @@ -65,7 +65,7 @@ internal enum Theme_OceanLight: ThemeColors { .sessionButton_destructiveBackground: .clear, .sessionButton_destructiveHighlight: .dangerLight.withAlphaComponent(0.3), .sessionButton_destructiveBorder: .dangerLight, - .sessionButton_primaryFilledText: .oceanLight1, + .sessionButton_primaryFilledText: .black, .sessionButton_primaryFilledBackground: .primary, // SolidButton @@ -186,7 +186,7 @@ internal enum Theme_OceanLight: ThemeColors { .sessionButton_destructiveBackground: .clear, .sessionButton_destructiveHighlight: .dangerLight.opacity(0.3), .sessionButton_destructiveBorder: .dangerLight, - .sessionButton_primaryFilledText: .oceanLight1, + .sessionButton_primaryFilledText: .black, .sessionButton_primaryFilledBackground: .primary, // SolidButton