Skip to content

Commit c52d38c

Browse files
authored
[Design System] Update color values to match Figma (#22402)
2 parents c471cba + 1afcf93 commit c52d38c

10 files changed

Lines changed: 15 additions & 72 deletions

File tree

Modules/Sources/DesignSystem/Components/DSButton.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ public struct DSButton: View {
109109
.fill(style.backgroundColor.opacity(priamryDisabledOpacity))
110110
case .secondary:
111111
RoundedRectangle(cornerRadius: Length.Radius.small)
112-
.stroke(Color.DS.divider, lineWidth: 1)
112+
.stroke(Color.DS.Background.tertiary, lineWidth: 1)
113113
.background(Color.clear)
114114

115115
case .tertiary:

Modules/Sources/DesignSystem/Foundation/Color+DesignSystem.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,6 @@ public extension Color {
3535
private static let wordPress = colorWithModuleBundle(colorName: DesignSystemColorNames.Background.wordPress)
3636
}
3737

38-
public static let divider = colorWithModuleBundle(colorName: DesignSystemColorNames.divider)
39-
4038
private static func colorWithModuleBundle(colorName: String) -> Color {
4139
Color(colorName, bundle: .module)
4240
}

Modules/Sources/DesignSystem/Foundation/Colors.xcassets/Foundation/Background/backgroundQuaternary.colorset/Contents.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
"color-space" : "srgb",
2424
"components" : {
2525
"alpha" : "1.000",
26-
"blue" : "0x79",
27-
"green" : "0x78",
28-
"red" : "0x78"
26+
"blue" : "0x4F",
27+
"green" : "0x4E",
28+
"red" : "0x4E"
2929
}
3030
},
3131
"idiom" : "universal"

Modules/Sources/DesignSystem/Foundation/Colors.xcassets/Foundation/Background/backgroundSecondary.colorset/Contents.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
"color-space" : "srgb",
2424
"components" : {
2525
"alpha" : "1.000",
26-
"blue" : "0x2E",
27-
"green" : "0x2C",
28-
"red" : "0x2C"
26+
"blue" : "0x3C",
27+
"green" : "0x3A",
28+
"red" : "0x3A"
2929
}
3030
},
3131
"idiom" : "universal"

Modules/Sources/DesignSystem/Foundation/Colors.xcassets/Foundation/Background/backgroundTertiary.colorset/Contents.json

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,12 @@
22
"colors" : [
33
{
44
"color" : {
5-
"color-space" : "extended-gray",
5+
"color-space" : "srgb",
66
"components" : {
77
"alpha" : "1.000",
8-
"white" : "0xC2"
8+
"blue" : "198",
9+
"green" : "194",
10+
"red" : "194"
911
}
1012
},
1113
"idiom" : "universal"
@@ -21,9 +23,9 @@
2123
"color-space" : "srgb",
2224
"components" : {
2325
"alpha" : "1.000",
24-
"blue" : "0x3C",
25-
"green" : "0x3A",
26-
"red" : "0x3A"
26+
"blue" : "0x2E",
27+
"green" : "0x2C",
28+
"red" : "0x2C"
2729
}
2830
},
2931
"idiom" : "universal"

Modules/Sources/DesignSystem/Foundation/Colors.xcassets/Foundation/Divider/Contents.json

Lines changed: 0 additions & 6 deletions
This file was deleted.

Modules/Sources/DesignSystem/Foundation/Colors.xcassets/Foundation/Divider/divider.colorset/Contents.json

Lines changed: 0 additions & 38 deletions
This file was deleted.

Modules/Sources/DesignSystem/Foundation/UIColor+DesignSystem.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,6 @@ public extension UIColor {
4040
private static let wordPress = colorWithModuleBundle(colorName: DesignSystemColorNames.Background.wordPress)
4141
}
4242

43-
public static let divider = colorWithModuleBundle(colorName: DesignSystemColorNames.divider)
44-
4543
private static func colorWithModuleBundle(colorName: String) -> UIColor? {
4644
UIColor(named: colorName, in: .module, compatibleWith: .current)
4745
}

Modules/Sources/DesignSystem/Gallery/ColorGallery.swift

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ struct ColorGallery: View {
88
Group {
99
foregroundSection
1010
backgroundSection
11-
dividerSection
1211
}
1312
}
1413
.navigationTitle("Colors")
@@ -89,16 +88,6 @@ struct ColorGallery: View {
8988
}
9089
}
9190

92-
private var dividerSection: some View {
93-
Section(header: sectionTitle("Divider")) {
94-
listItem(
95-
with: "Divider",
96-
hexString: hexString(for: .DS.divider),
97-
color: Color.DS.divider
98-
)
99-
}
100-
}
101-
10291
private func hexString(for color: UIColor?) -> String? {
10392
colorScheme == .light ? color?.lightVariant().hexString() : color?.darkVariant().hexString()
10493
}

WordPress/Classes/ViewRelated/EEUUSCompliance/CompliancePopover.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ struct CompliancePopover: View {
5555
}) {
5656
ZStack {
5757
RoundedRectangle(cornerRadius: Length.Padding.single)
58-
.stroke(Color.DS.divider, lineWidth: Length.Border.thin)
58+
.stroke(Color.DS.Background.tertiary, lineWidth: Length.Border.thin)
5959
Text(Strings.settingsButtonTitle)
6060
.font(.body)
6161
}

0 commit comments

Comments
 (0)