Commit 486e3966 authored by 汪洋's avatar 汪洋

navigation button边距调整为20

parent 3d54bb3b
...@@ -10,14 +10,7 @@ ...@@ -10,14 +10,7 @@
@implementation UIFont (GMBase) @implementation UIFont (GMBase)
+ (UIFont *)navigationFontWithSize:(NSInteger)size { + (UIFont *)navigationFontWithSize:(NSInteger)size {
UIFont *font = [UIFont fontWithName:@"FZLTHThin--GB1-4-YS" size:size]; UIFont *font = [UIFont systemFontOfSize:size];
if (!font) {
if(([[[UIDevice currentDevice] systemVersion] compare:@"9.0" options:NSNumericSearch] != NSOrderedAscending)) {
return [UIFont fontWithName:@"PingFangSC-Regular" size:size];
}else{
return [UIFont fontWithName:@"STHeitiSC-Light" size:size];
}
}
return font; return font;
} }
@end @end
...@@ -29,4 +22,4 @@ ...@@ -29,4 +22,4 @@
blue: ((hex & 0xFF))/255.0f blue: ((hex & 0xFF))/255.0f
alpha: 1]; alpha: 1];
} }
@end @end
\ No newline at end of file
...@@ -74,11 +74,11 @@ ...@@ -74,11 +74,11 @@
[_itemView addSubview:_rightButton]; [_itemView addSubview:_rightButton];
[_itemView addSubview:_nearRightButton]; [_itemView addSubview:_nearRightButton];
[_leftButton mas_makeConstraints:^(MASConstraintMaker *make) { [_leftButton mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(15); make.left.mas_equalTo(20);
make.centerY.mas_equalTo(0); make.centerY.mas_equalTo(0);
}]; }];
[_rightButton mas_makeConstraints:^(MASConstraintMaker *make) { [_rightButton mas_makeConstraints:^(MASConstraintMaker *make) {
make.right.mas_equalTo(-15); make.right.mas_equalTo(-20);
make.centerY.mas_equalTo(0); make.centerY.mas_equalTo(0);
}]; }];
[_nearRightButton mas_makeConstraints:^(MASConstraintMaker *make) { [_nearRightButton mas_makeConstraints:^(MASConstraintMaker *make) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment