|
|
@@ -106,7 +106,7 @@
|
|
|
//title
|
|
|
UILabel *titleLabel = [[UILabel alloc] init];
|
|
|
titleLabel.textAlignment = NSTextAlignmentCenter;
|
|
|
- titleLabel.font = [UIFont boldSystemFontOfSize:18.0];
|
|
|
+ titleLabel.font = [UIFont boldSystemFontOfSize:16.0];
|
|
|
titleLabel.textColor = [UIColor blackColor];
|
|
|
titleLabel.translatesAutoresizingMaskIntoConstraints = NO;
|
|
|
[self.navBarBGView addSubview:titleLabel];
|
|
|
@@ -140,7 +140,7 @@
|
|
|
[_rightButton setTitle:NSLocalizedString(@"File_upload_cancel_select_all",nil) forState:UIControlStateSelected];
|
|
|
|
|
|
[_rightButton setTitleColor:[UIColor hwColor:@"#01B7EA" alpha:1.0] forState:UIControlStateNormal];
|
|
|
- _rightButton.titleLabel.font = [UIFont systemFontOfSize:18.0];
|
|
|
+ _rightButton.titleLabel.font = [UIFont systemFontOfSize:16.0];
|
|
|
_rightButton.contentHorizontalAlignment = UIControlContentHorizontalAlignmentRight;
|
|
|
[_rightButton addTarget:self action:@selector(didClickSelectAllButton:) forControlEvents:UIControlEventTouchUpInside];
|
|
|
[self.navBarBGView addSubview:_rightButton];
|
|
|
@@ -153,7 +153,7 @@
|
|
|
}
|
|
|
|
|
|
[_rightButton mas_makeConstraints:^(MASConstraintMaker *make) {
|
|
|
- make.width.mas_equalTo(90);
|
|
|
+ make.width.mas_equalTo(80);
|
|
|
make.height.mas_equalTo(40);
|
|
|
make.right.mas_equalTo(-15);
|
|
|
make.centerY.mas_equalTo(self.titleLabel.mas_centerY);
|
|
|
@@ -446,7 +446,7 @@
|
|
|
|
|
|
self.MytitleLabel.text = title;
|
|
|
|
|
|
- CGFloat curWidth = [title boundingRectWithSize:CGSizeMake(SCREEN_W, 30) options:(NSStringDrawingUsesLineFragmentOrigin) attributes:@{NSFontAttributeName:[UIFont boldSystemFontOfSize:18.f]} context:nil].size.width;
|
|
|
+ CGFloat curWidth = [title boundingRectWithSize:CGSizeMake(SCREEN_W, 30) options:(NSStringDrawingUsesLineFragmentOrigin) attributes:@{NSFontAttributeName:[UIFont boldSystemFontOfSize:16.f]} context:nil].size.width;
|
|
|
|
|
|
curWidth += 20;
|
|
|
//HLog(@"title w:%f",curWidth);
|