diff options
| author | Andrej Mihajlov <and@mullvad.net> | 2020-02-04 12:36:12 +0100 |
|---|---|---|
| committer | Andrej Mihajlov <and@mullvad.net> | 2020-02-04 12:36:12 +0100 |
| commit | ca5c13380c06b9b92959c3a9c1ce892ebe32ffe7 (patch) | |
| tree | 5209a7b6fb94ac6297fc7296183c1311dc232fb9 | |
| parent | 78219f7e0c8c2fb8a29ba0a60b47776a4306a028 (diff) | |
| parent | 56b2248979a568126150a90c2e40e54158e9f1fa (diff) | |
| download | mullvadvpn-ca5c13380c06b9b92959c3a9c1ce892ebe32ffe7.tar.xz mullvadvpn-ca5c13380c06b9b92959c3a9c1ce892ebe32ffe7.zip | |
Merge branch 'fix-placeholder-color-dark-mode-ios'
| -rw-r--r-- | ios/MullvadVPN/LoginViewController.swift | 3 | ||||
| -rw-r--r-- | ios/MullvadVPN/UIColor+Palette.swift | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/ios/MullvadVPN/LoginViewController.swift b/ios/MullvadVPN/LoginViewController.swift index 30877664e8..ce11468e76 100644 --- a/ios/MullvadVPN/LoginViewController.swift +++ b/ios/MullvadVPN/LoginViewController.swift @@ -46,6 +46,9 @@ class LoginViewController: UIViewController, UITextFieldDelegate, RootContainmen super.viewDidLoad() accountTextField.inputAccessoryView = keyboardToolbar + accountTextField.attributedPlaceholder = NSAttributedString( + string: "0000 0000 0000 0000", + attributes: [.foregroundColor: UIColor.lightGray]) updateDisplayedMessage() updateStatusIcon() diff --git a/ios/MullvadVPN/UIColor+Palette.swift b/ios/MullvadVPN/UIColor+Palette.swift index 580ce74ad6..dfcd4174f8 100644 --- a/ios/MullvadVPN/UIColor+Palette.swift +++ b/ios/MullvadVPN/UIColor+Palette.swift @@ -12,7 +12,7 @@ extension UIColor { enum AccountTextField { enum NormalState { - static let borderColor = UIColor(red: 0.10, green: 0.18, blue: 0.27, alpha: 1.0) + static let borderColor = secondaryColor static let textColor = primaryColor static let backgroundColor = UIColor.white } |