Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update palette to Color Studio 2.5.0 and update WordPress Log In button #1520

Open
wants to merge 2 commits into
base: trunk
Choose a base branch
from
+28 −41
Open

Update palette to Color Studio 2.5.0 and update WordPress Log In button #1520

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
edcfc5e
Update palette to Color Studio 2.5.0 and update WordPress Log In butt…
mrpolanco Mar 23, 2023
d81d24e
Refactor corner radius for authentication
mrpolanco Mar 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 23 additions & 35 deletions Simplenote/Classes/ColorStudio.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,30 +6,30 @@ import Foundation
//
enum ColorStudio: String {
case black = "000000"
case blue0 = "e9eff5"
case blue5 = "c5d9ed"
case blue10 = "9ec2e6"
case blue20 = "72aee6"
case blue30 = "5198d9"
case blue40 = "3582c4"
case blue50 = "2271b1"
case blue60 = "135e96"
case blue70 = "0a4b78"
case blue80 = "043959"
case blue90 = "01263a"
case blue100 = "00131c"
case blue0 = "e9f0f5"
case blue5 = "bbe0fa"
case blue10 = "91caf2"
case blue20 = "68b3e8"
case blue30 = "399ce3"
case blue40 = "1689db"
case blue50 = "0675c4"
case blue60 = "055d9c"
case blue70 = "044b7a"
case blue80 = "02395c"
case blue90 = "01283d"
case blue100 = "001621"
case celadon0 = "e4f2ed"
case celadon5 = "a7e8d4"
case celadon10 = "63d6b6"
case celadon20 = "2ebd99"
case celadon30 = "09a884"
case celadon40 = "009172"
case celadon50 = "007e65"
case celadon60 = "006753"
case celadon70 = "005042"
case celadon80 = "003b30"
case celadon90 = "002721"
case celadon100 = "001c17"
case celadon5 = "a7e8d3"
case celadon10 = "66deb9"
case celadon20 = "31cc9f"
case celadon30 = "09b585"
case celadon40 = "009e73"
case celadon50 = "008763"
case celadon60 = "007053"
case celadon70 = "005c44"
case celadon80 = "004533"
case celadon90 = "003024"
case celadon100 = "001c15"
case darkGray1 = "1C1C1E"
case darkGray2 = "2C2C2E"
case darkGray3 = "3A3A3C"
Expand Down Expand Up @@ -124,18 +124,6 @@ enum ColorStudio: String {
case spYellow0 = "FE9500"
case spYellow10 = "FE9F0A"
case white = "FFFFFF"
case wpBlue0 = "e6f1f5"
case wpBlue5 = "bedae6"
case wpBlue10 = "98c6d9"
case wpBlue20 = "6ab3d0"
case wpBlue30 = "3895ba"
case wpBlue40 = "187aa2"
case wpBlue50 = "006088"
case wpBlue60 = "004e6e"
case wpBlue70 = "003c56"
case wpBlue80 = "002c40"
case wpBlue90 = "001d2d"
case wpBlue100 = "00101c"
case yellow0 = "f5f1e1"
case yellow5 = "f5e6b3"
case yellow10 = "f2d76b"
Expand Down
5 changes: 4 additions & 1 deletion Simplenote/Classes/SPSheetController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,10 @@ class SPSheetController: UIViewController {
///
@IBOutlet private var button1: SPSquaredButton! {
didSet {
button1.backgroundColor = .simplenoteWPBlue50Color
button1.backgroundColor = .white
button1.setTitleColor(.simplenoteBlue50Color, for: .normal)
button1.layer.borderWidth = 1
button1.layer.borderColor = UIColor.simplenoteBlue50Color.cgColor
}
}

Expand Down
2 changes: 1 addition & 1 deletion Simplenote/Classes/SPSquaredButton.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ class SPSquaredButton: UIButton {

/// Default Radius
///
private let defaultCornerRadius = CGFloat(4)
private let defaultCornerRadius = CGFloat(8)

/// Outer Border Radius
///
Expand Down
4 changes: 0 additions & 4 deletions Simplenote/Classes/UIColor+Studio.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,10 +103,6 @@ extension UIColor {
UIColor(studioColor: .red60)
}

@objc
static var simplenoteWPBlue50Color: UIColor {
UIColor(studioColor: .wpBlue50)
}

@objc
static var simplenoteAutocompleteBackgroundColor: UIColor {
Expand Down