Merge branch 'master' into ios-tweaks

ssaw · May 12, 2015 · 944101f · 944101f
2 parents 5cd975b + 9583741
commit 944101f
Show file tree

Hide file tree

Showing 17 changed files with 1 addition and 704 deletions.
diff --git a/Peacock.xcodeproj/project.pbxproj b/Peacock.xcodeproj/project.pbxproj
diff --git a/Peacock/UILabel/LYUILabelWithVerticalScrollAnimationOnSetText.h b/Peacock/UILabel/LYUILabelWithVerticalScrollAnimationOnSetText.h
diff --git a/Peacock/UILabel/LYUILabelWithVerticalScrollAnimationOnSetText.m b/Peacock/UILabel/LYUILabelWithVerticalScrollAnimationOnSetText.m
diff --git a/Peacock/UILabel/UILabel+LYAttributedLabel.h b/Peacock/UILabel/UILabel+LYAttributedLabel.h
@@ -7,10 +7,6 @@
 
 @interface UILabel (LYAttributedLabel)
 
-// these are deprecated see, #import "UILabel+FontAppearance.h"
-@property (nonatomic, copy) UIColor* LYTextColor UI_APPEARANCE_SELECTOR;
-@property (nonatomic, copy) UIFont* LYFont UI_APPEARANCE_SELECTOR;
-
 @property (nonatomic, assign) NSLineBreakMode LYLineBreakMode UI_APPEARANCE_SELECTOR;
 
 @property (nonatomic, assign) NSTextAlignment LYTextAlignment UI_APPEARANCE_SELECTOR;

diff --git a/Peacock/UILabel/UILabel+SizeToFitText.h b/Peacock/UILabel/UILabel+SizeToFitText.h
diff --git a/Peacock/UILabel/UILabel+SizeToFitText.m b/Peacock/UILabel/UILabel+SizeToFitText.m
diff --git a/Peacock/UILabel/UILabel+VerticalAlignText.h b/Peacock/UILabel/UILabel+VerticalAlignText.h
diff --git a/Peacock/UILabel/UILabel+VerticalAlignText.m b/Peacock/UILabel/UILabel+VerticalAlignText.m
diff --git a/Peacock/UIViewController/UIViewController+AttributedStringTitle.h b/Peacock/UIViewController/UIViewController+AttributedStringTitle.h
@@ -5,15 +5,6 @@
 
 #import <UIKit/UIKit.h>
 
-@interface UIViewController (AttributedStringTitle)
-// this is deprecated
--(void)setAttributedTitle:(NSString*)titleText;
-
-// use this now, after having set the title
--(void)setAttributedTitle;
-@end
-
-
 @interface UIViewController (AttributedStringTitleExtensions)
 // you should rarely, if ever, need this; it's for other classes to build out from
 -(void)setAttributedTitle:(NSString*)titleText usingLabel:(UILabel*)titleView;