From 81df953669c8eb4b7bfb16be2be7c7be444fd998 Mon Sep 17 00:00:00 2001 From: "Pfeil, Scott Robert" Date: Mon, 3 Jun 2019 10:30:09 -0400 Subject: [PATCH] disable fix. highlight fix. --- MVMCoreUI/Atoms/Buttons/MFTextButton.m | 2 +- MVMCoreUI/Atoms/Buttons/PrimaryButton.m | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/MVMCoreUI/Atoms/Buttons/MFTextButton.m b/MVMCoreUI/Atoms/Buttons/MFTextButton.m index 4c513ef9..c404fa08 100644 --- a/MVMCoreUI/Atoms/Buttons/MFTextButton.m +++ b/MVMCoreUI/Atoms/Buttons/MFTextButton.m @@ -54,7 +54,7 @@ self.backgroundColor = [UIColor clearColor]; self.contentMode = UIViewContentModeRedraw; [self setTitleColor:[UIColor mfTextButtonColor] forState:UIControlStateNormal]; - [self setTitleColor:[UIColor mfTextButtonColorHighlighted] forState:UIControlStateHighlighted]; + [self setTitleColor:[UIColor mfCharcoalColor] forState:UIControlStateHighlighted]; // left alignment by default self.titleLabel.textAlignment = NSTextAlignmentLeft; self.contentHorizontalAlignment = UIControlContentHorizontalAlignmentLeft; diff --git a/MVMCoreUI/Atoms/Buttons/PrimaryButton.m b/MVMCoreUI/Atoms/Buttons/PrimaryButton.m index 38cc164e..16dc124e 100644 --- a/MVMCoreUI/Atoms/Buttons/PrimaryButton.m +++ b/MVMCoreUI/Atoms/Buttons/PrimaryButton.m @@ -643,6 +643,7 @@ self.primaryButtonType = PrimaryButtonTypeCustom; self.fillColor = [UIColor blackColor]; self.textColor = [UIColor whiteColor]; + self.disabledTextColor = self.textColor; self.borderColor = nil; _bordered = false; }