Skip to content

Commit 11cca1d

Browse files
authored
Merge pull request #8451 from woocommerce/issue/8450-pink-to-purple
[Design] Update buttons, CTAs, and links from pink to purple
2 parents 85234dd + 7fc9f1c commit 11cca1d

File tree

66 files changed

+133
-128
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+133
-128
lines changed

RELEASE-NOTES.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
11.8
44
-----
5+
- [*] Design refresh: Buttons, links, and other calls to action are now purple instead of pink. [https://github.com/woocommerce/woocommerce-ios/pull/8451]
56
- [internal] Design: Updated capitalization for various pages, links, and buttons to match new design guidelines. [https://github.com/woocommerce/woocommerce-ios/pull/8455]
67

78
11.7

WooCommerce/Classes/Authentication/AuthenticationManager.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ class AuthenticationManager: Authentication {
113113
subheadlineColor: .gray(.shade30),
114114
placeholderColor: .placeholderImage,
115115
viewControllerBackgroundColor: .listBackground,
116-
textFieldBackgroundColor: .listForeground,
116+
textFieldBackgroundColor: .listForeground(modal: false),
117117
buttonViewBackgroundColor: .authPrologueBottomBackgroundColor,
118118
buttonViewTopShadowImage: nil,
119119
navBarImage: StyleManager.navBarImage,

WooCommerce/Classes/Extensions/Ghost+Woo.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import WordPressUI
55
extension GhostStyle {
66
static var wooDefaultGhostStyle: Self {
77
return GhostStyle(beatDuration: Defaults.beatDuration,
8-
beatStartColor: .listForeground,
8+
beatStartColor: .listForeground(modal: false),
99
beatEndColor: .ghostCellAnimationEndColor)
1010
}
1111
}

WooCommerce/Classes/Extensions/UICollectionViewCell+Helpers.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ extension UICollectionViewCell {
1515
/// Applies the default background color
1616
///
1717
func applyDefaultBackgroundStyle() {
18-
backgroundColor = .listForeground
19-
contentView.backgroundColor = .listForeground
18+
backgroundColor = .listForeground(modal: false)
19+
contentView.backgroundColor = .listForeground(modal: false)
2020
}
2121

2222
func applyGrayBackgroundStyle() {

WooCommerce/Classes/Extensions/UINavigationBar+Appearance.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ extension UINavigationBar {
1111
class func applyWooAppearance() {
1212
let appearance = UINavigationBarAppearance()
1313
appearance.configureWithOpaqueBackground()
14-
appearance.backgroundColor = .listForeground
14+
appearance.backgroundColor = .listForeground(modal: false)
1515
appearance.titleTextAttributes = [.foregroundColor: UIColor.text]
1616
appearance.largeTitleTextAttributes = [.foregroundColor: UIColor.text]
1717

WooCommerce/Classes/Extensions/UITabBar+Appearance.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ extension UITabBar {
4242
/// Configures the appearance object for a tabbar's items with the default WC style.
4343
///
4444
private static func applyWooAppearance(to tabBarItemAppearance: UITabBarItemAppearance) {
45-
tabBarItemAppearance.normal.badgeTextAttributes = [.foregroundColor: UIColor.textInverted]
46-
tabBarItemAppearance.selected.badgeTextAttributes = [.foregroundColor: UIColor.textInverted]
47-
tabBarItemAppearance.disabled.badgeTextAttributes = [.foregroundColor: UIColor.textInverted]
45+
tabBarItemAppearance.normal.badgeTextAttributes = [.foregroundColor: UIColor.white]
46+
tabBarItemAppearance.selected.badgeTextAttributes = [.foregroundColor: UIColor.white]
47+
tabBarItemAppearance.disabled.badgeTextAttributes = [.foregroundColor: UIColor.white]
4848
tabBarItemAppearance.normal.badgeBackgroundColor = .primary
4949
tabBarItemAppearance.selected.badgeBackgroundColor = .primary
5050
tabBarItemAppearance.disabled.badgeBackgroundColor = .primary

WooCommerce/Classes/Extensions/UITableViewCell+Helpers.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ extension UITableViewCell {
1515
/// Applies the default background color
1616
///
1717
func applyDefaultBackgroundStyle() {
18-
backgroundColor = .listForeground
18+
backgroundColor = .listForeground(modal: false)
1919
}
2020

2121
/// Hides the separator for a cell.

WooCommerce/Classes/Tools/Notices/PermanentNotice/PermanentNoticeView.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ struct PermanentNoticeView: View {
88

99
var body: some View {
1010
PermanentNoticeContentView(notice: notice)
11-
.background(Color(.listForeground))
11+
.background(Color(.listForeground(modal: false)))
1212
.overlay(Rectangle()
1313
.frame(width: nil, height: 0.5, alignment: .top)
1414
.foregroundColor(Color(UIColor.systemColor(.separator))), alignment: .top)

WooCommerce/Classes/ViewRelated/BottomSheet/ListSelector/BottomSheetListSelectorSectionHeaderView.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ final class BottomSheetListSelectorSectionHeaderView: UITableViewHeaderFooterVie
2222

2323
private extension BottomSheetListSelectorSectionHeaderView {
2424
func configureMainView() {
25-
contentView.backgroundColor = .listForeground
25+
contentView.backgroundColor = .listForeground(modal: false)
2626
}
2727

2828
func configureTitle() {

WooCommerce/Classes/ViewRelated/BottomSheet/ListSelector/BottomSheetListSelectorViewController.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ UIViewController, UITableViewDataSource, UITableViewDelegate where Command.Model
103103
private extension BottomSheetListSelectorViewController {
104104

105105
func configureMainView() {
106-
view.backgroundColor = .listForeground
106+
view.backgroundColor = .listForeground(modal: false)
107107
}
108108

109109
func configureTableView() {
@@ -114,7 +114,7 @@ private extension BottomSheetListSelectorViewController {
114114
tableView.estimatedSectionHeaderHeight = (viewProperties.title != nil || viewProperties.subtitle != nil) ? estimatedSectionHeight : .zero
115115
tableView.sectionHeaderHeight = UITableView.automaticDimension
116116

117-
tableView.backgroundColor = .listForeground
117+
tableView.backgroundColor = .listForeground(modal: false)
118118

119119
registerTableViewCells()
120120
registerTableViewHeaderFooters()

0 commit comments

Comments
 (0)