Merge branch 'zx/base' into 'master'

修改navigationbar button的字号大小

See merge request !10

Example/GMBase/GMListViewController.m

@@ -28,9 +28,9 @@
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
         self.navigationBar.title = @"你好我是汪洋，我在更美工作，很开心，哈哈哈哈哈哈";
     });
-//    self.navigationBar.rightTitle = @"举报有奖";
+    self.navigationBar.rightTitle = @"举报有奖";
     self.navigationBar.nearRightIcon = @"back";
-        self.navigationBar.rightIcon = @"back";
+//        self.navigationBar.rightIcon = @"back";
 
     _table.separatorStyle = UITableViewCellSeparatorStyleSingleLine;
     [_table registerClass:[UITableViewCell class] forCellReuseIdentifier:@"cell"];

Example/Podfile.lock

@@ -14,7 +14,7 @@ PODS:
   - AFNetworking/Serialization (3.1.0)
   - AFNetworking/UIKit (3.1.0):
     - AFNetworking/NSURLSession
-  - GMBase (0.4.6):
+  - GMBase (0.4.7):
     - GMHud
     - GMJSONModel
     - GMKit
@@ -103,7 +103,7 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   AFNetworking: 5e0e199f73d8626b11e79750991f5d173d1f8b67
-  GMBase: 475c50eff77316bce4d1f9d7342771703ee0e1ad
+  GMBase: 30084faea71c10d0f5670625940895f86723703a
   GMCache: b7d48432ee2469eb0c6c86c720a1958bd373187e
   GMHud: 9cc3942fc9f215db55b134cbfd05a458b124a964
   GMJSONModel: 5e81a98de668e9f93cf6ff77869f77b0d1a806be

GMBase/Classes/OCNavigationBar.m

@@ -96,7 +96,7 @@
     UIColor *color = [UIColor colorWithhex:0x333333];
     [button setTitleColor:color forState:UIControlStateNormal];
     button.hidden = YES;
-    button.titleLabel.font = [UIFont navigationFontWithSize:14];
+    button.titleLabel.font = [UIFont navigationFontWithSize:16];
     button.adaptiveWidth = 40;
 }