diff --git a/Source/JSONFormBuilder.swift b/Source/JSONFormBuilder.swift index 08475c57a1..7df58d611e 100644 --- a/Source/JSONFormBuilder.swift +++ b/Source/JSONFormBuilder.swift @@ -64,12 +64,6 @@ class JSONFormBuilder { titleLabel.textAlignment = .Natural - let selectedAttributes = OEXTextStyle(weight: .Normal, size: .Small, color: OEXStyles.sharedStyles().neutralBlackT()) - let unselectedAttributes = OEXTextStyle(weight: .Normal, size: .Small, color: OEXStyles.sharedStyles().neutralDark()) - typeControl.setTitleTextAttributes(selectedAttributes.attributes, forState: .Selected) - typeControl.setTitleTextAttributes(unselectedAttributes.attributes, forState: .Normal) - typeControl.tintColor = OEXStyles.sharedStyles().primaryXLightColor() - descriptionLabel.textAlignment = .Natural descriptionLabel.numberOfLines = 0 descriptionLabel.preferredMaxLayoutWidth = 200 //value doesn't seem to matter as long as it's small enough diff --git a/Source/OEXStyles+Swift.swift b/Source/OEXStyles+Swift.swift index bebb307c83..c79ec8a06f 100644 --- a/Source/OEXStyles+Swift.swift +++ b/Source/OEXStyles+Swift.swift @@ -37,7 +37,7 @@ extension OEXStyles { let styleAttributes = OEXTextStyle(weight: .Normal, size : .Small, color : self.neutralBlack()).attributes UISegmentedControl.appearance().setTitleTextAttributes(styleAttributes, forState: UIControlState.Selected) UISegmentedControl.appearance().setTitleTextAttributes(styleAttributes, forState: UIControlState.Normal) - UISegmentedControl.appearance().tintColor = self.neutralLight() + UISegmentedControl.appearance().tintColor = self.primaryXLightColor() UINavigationBar.appearance().translucent = false diff --git a/Source/TabContainerView.swift b/Source/TabContainerView.swift index 5d1d5b2e81..d7496ab098 100644 --- a/Source/TabContainerView.swift +++ b/Source/TabContainerView.swift @@ -39,11 +39,6 @@ class TabContainerView : UIView { make.bottom.equalTo(self.snp_bottomMargin) } - let selectedAttributes = OEXTextStyle(weight: .Normal, size: .Small, color: OEXStyles.sharedStyles().neutralBlackT()) - let unselectedAttributes = OEXTextStyle(weight: .Normal, size: .Small, color: OEXStyles.sharedStyles().neutralDark()) - control.setTitleTextAttributes(selectedAttributes.attributes, forState: .Selected) - control.setTitleTextAttributes(unselectedAttributes.attributes, forState: .Normal) - control.tintColor = OEXStyles.sharedStyles().primaryXLightColor() control.oex_addAction({[weak self] control in let index = (control as! UISegmentedControl).selectedSegmentIndex self?.showTabAtIndex(index) diff --git a/Test/Snapshots/edXTests.DiscussionNewCommentViewControllerTests/testContentResponse_ios8_380x568@2x.png b/Test/Snapshots/edXTests.DiscussionNewCommentViewControllerTests/testContentResponse_ios8_380x568@2x.png index 9549a95a56..70eb03468c 100644 Binary files a/Test/Snapshots/edXTests.DiscussionNewCommentViewControllerTests/testContentResponse_ios8_380x568@2x.png and b/Test/Snapshots/edXTests.DiscussionNewCommentViewControllerTests/testContentResponse_ios8_380x568@2x.png differ diff --git a/Test/Snapshots/edXTests.DiscussionNewCommentViewControllerTests/testContentResponse_ios8_rtl_380x568@2x.png b/Test/Snapshots/edXTests.DiscussionNewCommentViewControllerTests/testContentResponse_ios8_rtl_380x568@2x.png index cb51e89d36..0dff078e0a 100644 Binary files a/Test/Snapshots/edXTests.DiscussionNewCommentViewControllerTests/testContentResponse_ios8_rtl_380x568@2x.png and b/Test/Snapshots/edXTests.DiscussionNewCommentViewControllerTests/testContentResponse_ios8_rtl_380x568@2x.png differ diff --git a/Test/Snapshots/edXTests.DiscussionNewCommentViewControllerTests/testContentResponse_ios9_380x568@2x.png b/Test/Snapshots/edXTests.DiscussionNewCommentViewControllerTests/testContentResponse_ios9_380x568@2x.png index 1aee77267b..184d759ba5 100644 Binary files a/Test/Snapshots/edXTests.DiscussionNewCommentViewControllerTests/testContentResponse_ios9_380x568@2x.png and b/Test/Snapshots/edXTests.DiscussionNewCommentViewControllerTests/testContentResponse_ios9_380x568@2x.png differ diff --git a/Test/Snapshots/edXTests.DiscussionNewCommentViewControllerTests/testContentResponse_ios9_rtl_380x568@2x.png b/Test/Snapshots/edXTests.DiscussionNewCommentViewControllerTests/testContentResponse_ios9_rtl_380x568@2x.png index e8d60132ad..9aeef0a775 100644 Binary files a/Test/Snapshots/edXTests.DiscussionNewCommentViewControllerTests/testContentResponse_ios9_rtl_380x568@2x.png and b/Test/Snapshots/edXTests.DiscussionNewCommentViewControllerTests/testContentResponse_ios9_rtl_380x568@2x.png differ diff --git a/Test/Snapshots/edXTests.UserProfileEditViewControllerTests/testSnapshotPublic_ios8_380x568@2x.png b/Test/Snapshots/edXTests.UserProfileEditViewControllerTests/testSnapshotPublic_ios8_380x568@2x.png index 959a7ac466..a8f455fcf7 100644 Binary files a/Test/Snapshots/edXTests.UserProfileEditViewControllerTests/testSnapshotPublic_ios8_380x568@2x.png and b/Test/Snapshots/edXTests.UserProfileEditViewControllerTests/testSnapshotPublic_ios8_380x568@2x.png differ diff --git a/Test/Snapshots/edXTests.UserProfileEditViewControllerTests/testSnapshotPublic_ios8_rtl_380x568@2x.png b/Test/Snapshots/edXTests.UserProfileEditViewControllerTests/testSnapshotPublic_ios8_rtl_380x568@2x.png index 61fb1b1d6c..cc6651fbf8 100644 Binary files a/Test/Snapshots/edXTests.UserProfileEditViewControllerTests/testSnapshotPublic_ios8_rtl_380x568@2x.png and b/Test/Snapshots/edXTests.UserProfileEditViewControllerTests/testSnapshotPublic_ios8_rtl_380x568@2x.png differ diff --git a/Test/Snapshots/edXTests.UserProfileEditViewControllerTests/testSnapshotPublic_ios9_380x568@2x.png b/Test/Snapshots/edXTests.UserProfileEditViewControllerTests/testSnapshotPublic_ios9_380x568@2x.png index 227ef590b9..abfd750336 100644 Binary files a/Test/Snapshots/edXTests.UserProfileEditViewControllerTests/testSnapshotPublic_ios9_380x568@2x.png and b/Test/Snapshots/edXTests.UserProfileEditViewControllerTests/testSnapshotPublic_ios9_380x568@2x.png differ diff --git a/Test/Snapshots/edXTests.UserProfileEditViewControllerTests/testSnapshotPublic_ios9_rtl_380x568@2x.png b/Test/Snapshots/edXTests.UserProfileEditViewControllerTests/testSnapshotPublic_ios9_rtl_380x568@2x.png index 533f51d973..4077387000 100644 Binary files a/Test/Snapshots/edXTests.UserProfileEditViewControllerTests/testSnapshotPublic_ios9_rtl_380x568@2x.png and b/Test/Snapshots/edXTests.UserProfileEditViewControllerTests/testSnapshotPublic_ios9_rtl_380x568@2x.png differ diff --git a/Test/Snapshots/edXTests.UserProfileViewTests/testSnapshotContentPrivateProfile_ios8_380x568@2x.png b/Test/Snapshots/edXTests.UserProfileViewTests/testSnapshotContentPrivateProfile_ios8_380x568@2x.png index bef654b272..58f6e63162 100644 Binary files a/Test/Snapshots/edXTests.UserProfileViewTests/testSnapshotContentPrivateProfile_ios8_380x568@2x.png and b/Test/Snapshots/edXTests.UserProfileViewTests/testSnapshotContentPrivateProfile_ios8_380x568@2x.png differ diff --git a/Test/Snapshots/edXTests.UserProfileViewTests/testSnapshotContentPrivateProfile_ios8_rtl_380x568@2x.png b/Test/Snapshots/edXTests.UserProfileViewTests/testSnapshotContentPrivateProfile_ios8_rtl_380x568@2x.png index eec15a9e47..ee328e1d75 100644 Binary files a/Test/Snapshots/edXTests.UserProfileViewTests/testSnapshotContentPrivateProfile_ios8_rtl_380x568@2x.png and b/Test/Snapshots/edXTests.UserProfileViewTests/testSnapshotContentPrivateProfile_ios8_rtl_380x568@2x.png differ diff --git a/Test/Snapshots/edXTests.UserProfileViewTests/testSnapshotContentPrivateProfile_ios9_380x568@2x.png b/Test/Snapshots/edXTests.UserProfileViewTests/testSnapshotContentPrivateProfile_ios9_380x568@2x.png index 97e43fd41c..749421dafd 100644 Binary files a/Test/Snapshots/edXTests.UserProfileViewTests/testSnapshotContentPrivateProfile_ios9_380x568@2x.png and b/Test/Snapshots/edXTests.UserProfileViewTests/testSnapshotContentPrivateProfile_ios9_380x568@2x.png differ diff --git a/Test/Snapshots/edXTests.UserProfileViewTests/testSnapshotContentPrivateProfile_ios9_rtl_380x568@2x.png b/Test/Snapshots/edXTests.UserProfileViewTests/testSnapshotContentPrivateProfile_ios9_rtl_380x568@2x.png index f5b6c386d0..a09c04fa39 100644 Binary files a/Test/Snapshots/edXTests.UserProfileViewTests/testSnapshotContentPrivateProfile_ios9_rtl_380x568@2x.png and b/Test/Snapshots/edXTests.UserProfileViewTests/testSnapshotContentPrivateProfile_ios9_rtl_380x568@2x.png differ diff --git a/Test/Snapshots/edXTests.UserProfileViewTests/testSnapshotContent_ios8_380x568@2x.png b/Test/Snapshots/edXTests.UserProfileViewTests/testSnapshotContent_ios8_380x568@2x.png index 61df526a2b..2efaf91c4b 100644 Binary files a/Test/Snapshots/edXTests.UserProfileViewTests/testSnapshotContent_ios8_380x568@2x.png and b/Test/Snapshots/edXTests.UserProfileViewTests/testSnapshotContent_ios8_380x568@2x.png differ diff --git a/Test/Snapshots/edXTests.UserProfileViewTests/testSnapshotContent_ios8_rtl_380x568@2x.png b/Test/Snapshots/edXTests.UserProfileViewTests/testSnapshotContent_ios8_rtl_380x568@2x.png index 6b7f6c1f44..93285fd8ab 100644 Binary files a/Test/Snapshots/edXTests.UserProfileViewTests/testSnapshotContent_ios8_rtl_380x568@2x.png and b/Test/Snapshots/edXTests.UserProfileViewTests/testSnapshotContent_ios8_rtl_380x568@2x.png differ diff --git a/Test/Snapshots/edXTests.UserProfileViewTests/testSnapshotContent_ios9_380x568@2x.png b/Test/Snapshots/edXTests.UserProfileViewTests/testSnapshotContent_ios9_380x568@2x.png index cbacf5ecc8..a9dea12925 100644 Binary files a/Test/Snapshots/edXTests.UserProfileViewTests/testSnapshotContent_ios9_380x568@2x.png and b/Test/Snapshots/edXTests.UserProfileViewTests/testSnapshotContent_ios9_380x568@2x.png differ diff --git a/Test/Snapshots/edXTests.UserProfileViewTests/testSnapshotContent_ios9_rtl_380x568@2x.png b/Test/Snapshots/edXTests.UserProfileViewTests/testSnapshotContent_ios9_rtl_380x568@2x.png index f195a567ef..d1aa39157d 100644 Binary files a/Test/Snapshots/edXTests.UserProfileViewTests/testSnapshotContent_ios9_rtl_380x568@2x.png and b/Test/Snapshots/edXTests.UserProfileViewTests/testSnapshotContent_ios9_rtl_380x568@2x.png differ