fix: black color + borders changes (primary/secondary/tertiary) (#60)

Decathlon · May 3, 2022 · 2ad3a05 · 2ad3a05
1 parent 61df95d
commit 2ad3a05
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/Sources/Vitamin/Components/Button/VitaminButton.swift b/Sources/Vitamin/Components/Button/VitaminButton.swift
@@ -223,7 +223,7 @@ extension VitaminButton.Style {
                 .ghostReversed:
             return UIColor.clear
         case .secondary:
-            return VitaminColor.Core.Border.secondary
+            return VitaminColor.Core.Border.primary
         }
     }
 
@@ -238,7 +238,7 @@ extension VitaminButton.Style {
         case .primaryReversed:
             return VitaminColor.Core.Border.primaryReversed
         case .secondary:
-            return VitaminColor.Core.Border.secondary
+            return VitaminColor.Core.Border.primary
         }
     }
 }

diff --git a/Sources/Vitamin/Foundations/Colors/Colors.swift b/Sources/Vitamin/Foundations/Colors/Colors.swift
@@ -41,13 +41,13 @@ public struct VitaminColor {
     public static let grey100 = VitaminColor(rgbaValue: 0xeff1f3ff)
     public static let grey200 = VitaminColor(rgbaValue: 0xd9dde1ff)
     public static let grey300 = VitaminColor(rgbaValue: 0xb3bac3ff)
-    public static let grey400 = VitaminColor(rgbaValue: 0x8c96a2ff)
+    public static let grey400 = VitaminColor(rgbaValue: 0x8996a2ff)
     public static let grey50 = VitaminColor(rgbaValue: 0xf7f8f9ff)
     public static let grey500 = VitaminColor(rgbaValue: 0x687787ff)
     public static let grey600 = VitaminColor(rgbaValue: 0x4e5d6bff)
     public static let grey700 = VitaminColor(rgbaValue: 0x344450ff)
     public static let grey800 = VitaminColor(rgbaValue: 0x1a2a34ff)
-    public static let grey900 = VitaminColor(rgbaValue: 0x001018ff)
+    public static let grey900 = VitaminColor(rgbaValue: 0x142129ff)
     public static let orange100 = VitaminColor(rgbaValue: 0xffe4d6ff)
     public static let orange200 = VitaminColor(rgbaValue: 0xfac3a5ff)
     public static let orange300 = VitaminColor(rgbaValue: 0xfa9c69ff)

diff --git a/Sources/Vitamin/Foundations/Colors/Semantic/Colors+Theme.swift b/Sources/Vitamin/Foundations/Colors/Semantic/Colors+Theme.swift
@@ -37,9 +37,9 @@ extension VitaminColor {
                 public static let contentActionReversed = VitaminColor.Base.white.color
                 public static let contentVisitedReversed = VitaminColor.Base.purple200.color
 
-                public static let borderPrimary = VitaminColor.Base.white.color
-                public static let borderSecondary = VitaminColor.Base.grey200.color
-                public static let borderTertiary = VitaminColor.Base.grey100.color
+                public static let borderPrimary = VitaminColor.Base.grey200.color
+                public static let borderSecondary = VitaminColor.Base.grey100.color
+                public static let borderTertiary = VitaminColor.Base.white.color
                 public static let borderActive = VitaminColor.Base.blue400.color
                 public static let borderInactive = VitaminColor.Base.grey400.color
                 public static let borderNegative = VitaminColor.Base.red400.color
@@ -91,9 +91,9 @@ extension VitaminColor {
                 public static let contentActionReversed = VitaminColor.Base.black.color
                 public static let contentVisitedReversed = VitaminColor.Base.purple300.color
 
-                public static let borderPrimary = VitaminColor.Base.grey800.color
-                public static let borderSecondary = VitaminColor.Base.grey700.color
-                public static let borderTertiary = VitaminColor.Base.black.color
+                public static let borderPrimary = VitaminColor.Base.grey700.color
+                public static let borderSecondary = VitaminColor.Base.black.color
+                public static let borderTertiary = VitaminColor.Base.grey800.color
                 public static let borderActive = VitaminColor.Base.blue300.color
                 public static let borderInactive = VitaminColor.Base.grey500.color
                 public static let borderNegative = VitaminColor.Base.red300.color

diff --git a/Sources/Vitamin/Utils/SwiftGen/colors.txt b/Sources/Vitamin/Utils/SwiftGen/colors.txt
@@ -66,10 +66,10 @@ grey50:         #F7F8F9
 grey100:		#EFF1F3
 grey200:		#D9DDE1
 grey300:		#B3BAC3
-grey400:		#8C96A2
+grey400:		#8996A2
 grey500:		#687787
 grey600:		#4E5D6B
 grey700:		#344450
 grey800:		#1A2A34
-grey900:		#001018
+grey900:		#142129
 black:			#001018
diff --git a/Vitamin.podspec b/Vitamin.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
   s.name         = "Vitamin"
-  s.version      = "0.5.2"
+  s.version      = "0.5.3"
   s.summary      = "The iOS implement of Decathlon's design system"
 
   s.homepage     = "https://github.com/Decathlon/vitamin-ios"