public-mirrors/NewsBlur-viq
1
0
Fork 0
mirror of https://github.com/viq/NewsBlur.git synced 2025-09-18 21:43:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

adding in disclosure icons, etc

Browse source
This commit is contained in:
Roy Yang 2012-08-09 13:05:19 -07:00
parent 1dd0efbed9
commit bb47c37580
8 changed files with 35 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
media/ios/Classes/ActivityCell.m
View file

@ -91,11 +91,11 @@
return 1;
}
UIImage *placeholder = [UIImage imageNamed:@"user_dark"];
UIImage *placeholder = [UIImage imageNamed:@"user_light"];
[self.faviconView setImageWithURL:[NSURL URLWithString:[[activity objectForKey:@"with_user"] objectForKey:@"photo_url"]]
placeholderImage:placeholder];
} else if ([category isEqualToString:@"sharedstory"]) {
UIImage *placeholder = [UIImage imageNamed:@"user_dark"];
UIImage *placeholder = [UIImage imageNamed:@"user_light"];
[self.faviconView setImageWithURL:[NSURL URLWithString:[userProfile objectForKey:@"photo_url"]]
placeholderImage:placeholder];
} else {

2
media/ios/Classes/InteractionCell.m
View file

@ -67,7 +67,7 @@
self.interactionLabel.frame = interactionLabelRect;
self.avatarView.frame = CGRectMake(leftMargin, topMargin, avatarSize, avatarSize);
UIImage *placeholder = [UIImage imageNamed:@"user_dark"];
UIImage *placeholder = [UIImage imageNamed:@"user_light"];
// this is for the rare instance when the with_user doesn't return anything
if ([[interaction objectForKey:@"with_user"] class] == [NSNull class]) {

2
media/ios/Classes/ProfileBadge.m
View file

@ -92,7 +92,7 @@
photo_url = [photo_url stringByReplacingOccurrencesOfString:@"_normal" withString:@""];
}
UIImage *placeholder = [UIImage imageNamed:@"user_dark"];
UIImage *placeholder = [UIImage imageNamed:@"user_light"];
UIImageView *avatar = [[UIImageView alloc] init];
avatar.frame = CGRectMake(10, 10, 80, 80);

2
media/ios/Classes/Utilities.m
View file

@ -70,7 +70,7 @@ static NSMutableDictionary *imageCache;
return image;
} else {
if (isSocial) {
return [UIImage imageNamed:@"user_dark.png"];
return [UIImage imageNamed:@"user_light.png"];
} else {
return [UIImage imageNamed:@"world.png"];
}

8
media/ios/NewsBlur.xcodeproj/project.pbxproj
View file

@ -216,6 +216,8 @@
43B8F02A156603180008733D /* OriginalStoryViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 43B8F020156603170008733D /* OriginalStoryViewController.xib */; };
43B8F02B156603180008733D /* StoryDetailViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 43B8F021156603170008733D /* StoryDetailViewController.xib */; };
43C1680B15B3D99B00428BA3 /* 7-location-place.png in Resources */ = {isa = PBXBuildFile; fileRef = 43C1680A15B3D99B00428BA3 /* 7-location-place.png */; };
43C3D40415D44EA30066D36D /* user_light.png in Resources */ = {isa = PBXBuildFile; fileRef = 43C3D40215D44EA30066D36D /* user_light.png */; };
43C3D40515D44EA30066D36D /* user_light@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 43C3D40315D44EA30066D36D /* user_light@2x.png */; };
43C95C3F158BCDD70086C69B /* 19-circle-check.png in Resources */ = {isa = PBXBuildFile; fileRef = 43C95C3D158BCDD70086C69B /* 19-circle-check.png */; };
43C95C40158BCDD70086C69B /* 19-circle-check@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 43C95C3E158BCDD70086C69B /* 19-circle-check@2x.png */; };
43C95C42158BD13D0086C69B /* category_selected_background.png in Resources */ = {isa = PBXBuildFile; fileRef = 43C95C41158BD13D0086C69B /* category_selected_background.png */; };
@ -582,6 +584,8 @@
43B8F020156603170008733D /* OriginalStoryViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = OriginalStoryViewController.xib; sourceTree = "<group>"; };
43B8F021156603170008733D /* StoryDetailViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = StoryDetailViewController.xib; sourceTree = "<group>"; };
43C1680A15B3D99B00428BA3 /* 7-location-place.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "7-location-place.png"; sourceTree = "<group>"; };
43C3D40215D44EA30066D36D /* user_light.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = user_light.png; sourceTree = "<group>"; };
43C3D40315D44EA30066D36D /* user_light@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "user_light@2x.png"; sourceTree = "<group>"; };
43C95C3D158BCDD70086C69B /* 19-circle-check.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "19-circle-check.png"; sourceTree = "<group>"; };
43C95C3E158BCDD70086C69B /* 19-circle-check@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "19-circle-check@2x.png"; sourceTree = "<group>"; };
43C95C41158BD13D0086C69B /* category_selected_background.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = category_selected_background.png; sourceTree = "<group>"; };
@ -1045,6 +1049,8 @@
431B857615A132B600DCE497 /* Images */ = {
isa = PBXGroup;
children = (
43C3D40215D44EA30066D36D /* user_light.png */,
43C3D40315D44EA30066D36D /* user_light@2x.png */,
4302471815D2DF580049145F /* group_white.png */,
432EBD1A15D1AB6B0000729D /* user_dark.png */,
432EBD1815D1AB580000729D /* user_dark@2x.png */,
@ -1946,6 +1952,8 @@
432EBD1915D1AB580000729D /* user_dark@2x.png in Resources */,
432EBD1B15D1AB6B0000729D /* user_dark.png in Resources */,
4302471915D2DF580049145F /* group_white.png in Resources */,
43C3D40415D44EA30066D36D /* user_light.png in Resources */,
43C3D40515D44EA30066D36D /* user_light@2x.png in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};

BIN
media/ios/Resources/user_light.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
media/ios/Resources/user_light@2x.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.9 KiB

31
media/ios/storyDetailView.css
View file

@ -40,7 +40,7 @@
*/
.NB-ipad-wide .NB-header {
padding: 15px 0;
padding: 15px 0 5px;
}
.NB-ipad-wide .NB-header .NB-header-inner {
@ -78,7 +78,7 @@
*/
.NB-ipad-narrow .NB-header {
padding: 15px 30px;
padding: 15px 30px 5px;
}
.NB-ipad-narrow .NB-story {
@ -113,7 +113,7 @@
*/
.NB-iphone .NB-header {
padding: 12px 12px;
padding: 12px 12px 5px;
}
.NB-iphone .NB-story {
@ -152,13 +152,15 @@ body.NB-iphone {
color: #969696;
text-transform: uppercase;
margin: 4px 8px 0px 0;
margin-bottom: 8px;
text-shadow: 0 1px 0 #F9F9F9;
float: left;
}
.NB-story-tags {
overflow: hidden;
padding: 5px 0 0 0;
padding: 5px 0 0px 0;
margin-bottom: 8px;
text-transform: uppercase;
}
@ -460,8 +462,9 @@ a.NB-show-profile {
background: -webkit-gradient(
linear, left top, left bottom,
from(#42aaff),
to(#003366));
box-shadow: inset 0 0 1px 1px rgba(255, 255, 255, 1)
to(#1e78c1));
box-shadow: inset 0 0 1px 1px rgba(255, 255, 255, 1);
text-shadow: 0 1px 0 #003366;
}
.NB-button.NB-share-button div span {
@ -492,12 +495,22 @@ a.NB-show-profile {
top: 2px;
}
.NB-button.hover div,
.NB-button:hover div,
.NB-button.selected div {
background: #217412;
background: #2379bf;
background: -webkit-gradient(
linear, left top, left bottom,
from(#1e78c1),
to(#2379bf));
box-shadow: none;
}
.NB-button.NB-share-button:hover div,
.NB-button.NB-share-button.selected div{
box-shadow: inset 0 0 1px 1px rgba(255, 255, 255, 1);
}
.NB-button a {
display: block;
padding-top: 1px;
@ -516,7 +529,7 @@ a.NB-show-profile {
font-size: 14px;
}
.NB-button.hover a,
.NB-button:hover a,
.NB-button.selected a {
color: rgba(255,255,255,1);
text-shadow: none;