Permalink
Browse files

Major cleanup on comments in iOS app.

  • Loading branch information...
1 parent 4f0b24b commit 9626f48f73d28a81f1989d5143226971cc64220c @samuelclay committed Dec 12, 2012
@@ -50,7 +50,7 @@ server {
}
location /favicon.ico {
- alias /home/sclay/newsblur/media/img/favicon.png;
+ alias /home/sclay/newsblur/media/img/favicon_32.png;
expires max;
access_log off;
}
View
@@ -20,7 +20,7 @@ server {
root /home/sclay/staging;
}
location /favicon.ico {
- alias /home/sclay/staging/media/img/favicon.png;
+ alias /home/sclay/staging/media/img/favicon_32.png;
expires max;
access_log off;
}
View
@@ -3555,7 +3555,8 @@ form.opml_import_form input {
-moz-transition: all .12s ease-out;
-o-transition: all .12s ease-out;
-ms-transition: all .12s ease-out;
- background: transparent url('/media/embed/reader/spacer_16.png') no-repeat 1px 0px;
+ background: transparent url('/media/embed/reader/spacer_16.png') no-repeat 0 -17px;
+ background-size: 16px;
}
@media screen and (max-width: 1050px) {
@@ -3574,19 +3575,24 @@ form.opml_import_form input {
.NB-splash-info .NB-splash-links .NB-splash-link-faq a:hover,
.NB-splash-info .NB-splash-links .NB-splash-link-api a:hover,
.NB-splash-info .NB-splash-links .NB-splash-link-press a:hover {
- background: transparent url('/media/embed/favicon.png') no-repeat 0 7px;
+ background: transparent url('/media/embed/favicon_32.png') no-repeat 0 7px;
+ background-size: 16px;
}
.NB-splash-info .NB-splash-links .NB-splash-link-github a:hover {
background: transparent url('/media/embed/reader/octocat.png') no-repeat 0 7px;
+ background-size: 16px;
}
.NB-splash-info .NB-splash-links .NB-splash-link-getsatisfaction a:hover {
background: transparent url('/media/embed/reader/getsatisfaction.png') no-repeat 0 7px;
+ background-size: 16px;
}
.NB-splash-info .NB-splash-links .NB-splash-link-blog a:hover {
background: transparent url('/media/embed/reader/ofbrooklyn_icon.png') no-repeat 0 7px;
+ background-size: 16px;
}
.NB-splash-info .NB-splash-links .NB-splash-link-twitter a:hover {
background: transparent url('/media/embed/reader/twitter_bird.png') no-repeat 0 7px;
+ background-size: 16px;
}
.NB-splash-info .NB-splash-links a {
@@ -241,11 +241,11 @@ - (UITableViewCell *)makeFontSizeTableCell {
cell.selectionStyle = UITableViewCellSelectionStyleNone;
fontSizeSegment.frame = CGRectMake(8, 4, cell.frame.size.width - 8*2, kMenuOptionHeight - 4*2);
- [fontSizeSegment setTitle:@"11pt" forSegmentAtIndex:0];
- [fontSizeSegment setTitle:@"12pt" forSegmentAtIndex:1];
+ [fontSizeSegment setTitle:@"12pt" forSegmentAtIndex:0];
+ [fontSizeSegment setTitle:@"13pt" forSegmentAtIndex:1];
[fontSizeSegment setTitle:@"14pt" forSegmentAtIndex:2];
- [fontSizeSegment setTitle:@"16pt" forSegmentAtIndex:3];
- [fontSizeSegment setTitle:@"18pt" forSegmentAtIndex:4];
+ [fontSizeSegment setTitle:@"15pt" forSegmentAtIndex:3];
+ [fontSizeSegment setTitle:@"17pt" forSegmentAtIndex:4];
[fontSizeSegment setTintColor:UIColorFromRGB(0x738570)];
[cell addSubview:fontSizeSegment];

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -4,7 +4,7 @@
version = "1.0">
<SymbolicBreakpoints>
<SymbolicBreakpoint
- shouldBeEnabled = "No"
+ shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "objc_exception_throw"
@@ -13,7 +13,7 @@
</SymbolicBreakpoints>
<ExceptionBreakpoints>
<ExceptionBreakpoint
- shouldBeEnabled = "No"
+ shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
scope = "0"
@@ -12,9 +12,7 @@
int main(int argc, char *argv[]) {
@autoreleasepool {
-// int retVal = UIApplicationMain(argc, argv, nil, nil);
-// for iOS6
- int retVal = UIApplicationMain(argc, argv, nil, @"NewsBlurAppDelegate");
+ int retVal = UIApplicationMain(argc, argv, nil, @"NewsBlurAppDelegate");
return retVal;
}
}
View
@@ -26,7 +26,7 @@
#story_pane .NB-story-comment .NB-user-avatar {
position: absolute;
left: 6px;
- top: 10px;
+ top: 8px;
}
#story_pane .NB-story-comment .NB-user-avatar.NB-story-comment-reshare {
top: 22px;
@@ -35,7 +35,7 @@
}
#story_pane .NB-story-comment .NB-user-avatar img {
border-radius: 6px;
- margin: 2px 0 0 1px;
+ margin: 0;
width: 48px;
height: 48px;
}
@@ -44,7 +44,7 @@
width: 36px;
}
#story_pane .NB-story-comment .NB-story-comment-author-container {
- margin: 4px 0 0;
+ padding: 8px 0 0;
}
#story_pane .NB-story-comment .NB-story-comment-reshares {
position: absolute;
@@ -61,7 +61,7 @@
font-size: 11px;
color: #1D4BA6;
font-weight: bold;
- margin: 4px 10px 0 0;
+ margin: 0 4px 0 0;
text-shadow: 0 -1px 0 #F0F0F0;
cursor: pointer;
line-height: 17px;
@@ -71,28 +71,32 @@
font-size: 10px;
color: #9D9D9D;
font-weight: bold;
- float: left;
+ float: right;
line-height: 17px;
- margin-top: 4px;
+ margin: 0 0 0;
}
#story_pane .NB-story-comment .NB-story-comment-location {
text-transform: uppercase;
font-size: 10px;
- color: #B7B58D;
+ color: #BECDD7;
font-weight: bold;
float: left;
- margin-right: 8px;
- margin: 4px 10px 0 0;
- background-color: #EFEFEF;
- border-radius: 8px;
- line-height: 17px;
- padding: 0 8px;
+ clear: both;
+ margin: 3px 0 6px;
+ line-height: 12px;
+}
+
+#story_pane .NB-story-comment .NB-button-wrapper {
+ overflow: hidden;
+ white-space: nowrap;
+ float: right;
}
#story_pane .NB-story-comment .NB-story-comment-content {
float: left;
color: #303030;
+ clear: both;
}
@@ -102,7 +106,7 @@
overflow: hidden;
clear: both;
position: relative;
- padding: 8px 0 8px 42px;
+ padding: 8px 0 4px 42px;
line-height: 18px;
}
#story_pane .NB-story-comment-reply .NB-story-comment-reply-photo {
@@ -111,14 +115,14 @@
border-radius: 3px;
position: absolute;
left: 0px;
- top: 10px;
+ top: 2px;
cursor: pointer;
}
#story_pane .NB-story-comment-reply-content {
clear: both;
color: #303030;
- float: left;
+ padding: 2px 0 3px;
}
#story_pane .NB-story-comment-reply-form {
@@ -255,8 +259,8 @@
float: left;
}
#story_pane .NB-story-comment .NB-story-comment-content {
- clear: left;
- padding: 0 0 8px 0;
+ clear: both;
+ padding: 2px 0 3px 0;
}
#story_pane .NB-feed-story-endbar {
View

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -5,24 +5,29 @@
.NB-story {
line-height: 1.5em;
}
-.NB-extra-small .NB-story {
- font-size: 11px;
+.NB-extra-small .NB-story,
+.NB-extra-small .NB-story-comment {
+ font-size: 12px;
}
-.NB-small .NB-story {
- font-size: 12px;
+.NB-small .NB-story,
+.NB-small .NB-story-comment {
+ font-size: 13px;
}
-.NB-medium .NB-story{
+.NB-medium .NB-story,
+.NB-medium .NB-story-comment {
font-size: 14px;
}
-.NB-large .NB-story {
- font-size: 16px;
+.NB-large .NB-story,
+.NB-large .NB-story-comment {
+ font-size: 15px;
}
-.NB-extra-large .NB-story {
- font-size: 18px;
+.NB-extra-large .NB-story,
+.NB-extra-large .NB-story-comment {
+ font-size: 17px;
}
.NB-san-serif {
@@ -415,7 +420,6 @@ del {
#story_pane .NB-story-comment-reply .NB-show-profile {
float: left;
left: -42px;
- top: -4px;
}
.NB-story-comment:last-child {
border-bottom: 1px solid #A6A6A6;
@@ -466,16 +470,22 @@ a.NB-show-profile {
-webkit-touch-callout: none;
}
-.NB-share-button {
+.NB-button.NB-share-button {
line-height: 20px;
font-family: Helvetica, sans-serif;
font-size: 14px;
color: #606060;
+ float: none;
+ display: block;
text-shadow:
0px 0px 0px rgba(000,000,000,0),
0px 1px 0px rgba(255,255,255,1);
}
+.NB-button.NB-share-button a {
+ display: block;
+}
+
.NB-share-button.active,
.NB-save-button.active {
background: #217412;
@@ -484,16 +494,11 @@ a.NB-show-profile {
/* Edit, Like, and Reply buttons */
-.NB-button-wrapper {
- float: right;
-}
-
.NB-button {
padding: 0px 0px 4px 4px;
- display: inline-block;
cursor: pointer;
- margin-top: -5px;
- margin-bottom: -4px;
+ white-space: nowrap;
+ float: right;
}
.NB-button.NB-share-button {
@@ -507,18 +512,18 @@ a.NB-show-profile {
padding: 2px 6px;
background: -webkit-gradient(
linear, left top, left bottom,
- from(#ffffff),
- color-stop(0.50, #ebebeb),
- color-stop(0.50, #dbdbdb),
- to(#b5b5b5));
+ from(#F0F0F0),
+ color-stop(0.50, #EBEBEB),
+ color-stop(0.50, #E4E4E4),
+ to(#C0C0C0));
border-radius: 3px;
border: 1px solid #949494;
- box-shadow: inset 0px 0px 2px rgba(255,255,255,1);
+ box-shadow: inset 0px 1px 0px rgba(255,255,255,1);
}
.NB-iphone .NB-button div {
- padding: 1px 5px 0px;
+ padding: 0px 5px 0px;
}
.NB-iphone #story_pane .NB-story-comment .NB-story-comment-content {
@@ -533,7 +538,7 @@ a.NB-show-profile {
linear, left top, left bottom,
from(#42aaff),
to(#1e78c1));
- box-shadow: inset 0 0 1px 1px rgba(255, 255, 255, 1);
+ box-shadow: inset 0 0 0px 1px rgba(255, 255, 255, .6);
text-shadow: 0 1px 0 #003366;
}
@@ -548,21 +553,17 @@ a.NB-show-profile {
.NB-iphone .NB-button .NB-story-comment-like-button-wrapper,
.NB-button .NB-story-comment-like-button-wrapper {
- padding-left: 22px;
position: relative;
+ overflow: hidden;
}
.NB-button .NB-story-comment-like-button-wrapper span {
- background: transparent url("data:image/png;charset=utf-8;base64,iVBORw0KGgoAAAANSUhEUgAAAAwAAAAMCAYAAABWdVznAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEgAACxIB0t1+/AAAABx0RVh0U29mdHdhcmUAQWRvYmUgRmlyZXdvcmtzIENTNui8sowAAAGmSURBVCiRbZG/axRBHMXfzO7tbvYua+IFJQa0sRBs1IiQFIEIgvgDEUSs7CSFCJLaA1MJYjrFI5VgmkBiCDYWNgZJlaB/wgknxOT0Lnt7s7Mz852xOgzxXvne98OXxwMG6PXm3PSbzblbgzJ21Kit3mcT4ye34NyI0AeT87PvxeGcHwVGj0d34lJyJQ6Gz1myDwZ+eLpxOapGp8Y95lVPVM4sDUdjF8kSOmK3sZ81HhpGP4XMfi3e3eqx+tcnzyM/ngVjlzjjlcgvIy1aUEaiHIwg110oynNjzXep0h1OVjeMVTNJWK34Xoh2vous6ECoA7R6TRhSiEvJEFk1Rc40+OOZ+rtU7l9r9ZopA1BoAecsHIBcZ/B4CZ18L8uK9r3a9Y+LHADmry5/TmXrmabCDQUJFEkYKhD6EcgZ9FT77cKNT2sA4PfbO7jMWA3OfBwLxwDmILUAOQ1jSPbv/gHOnvdZiWlXQFulyGrle0GFgUFJOj0ImPgtmhCq+6or/6wbp1TIyzc9imq6oNH/AHJmZS/78fLF7S/fDu20/ah+4UMcJGf7xl8kb9PTscP82wAAAABJRU5ErkJggg==") no-repeat left 1px;
+ background: transparent url("data:image/png;charset=utf-8;base64,iVBORw0KGgoAAAANSUhEUgAAAAwAAAAMCAYAAABWdVznAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEgAACxIB0t1+/AAAABx0RVh0U29mdHdhcmUAQWRvYmUgRmlyZXdvcmtzIENTNui8sowAAAGmSURBVCiRbZG/axRBHMXfzO7tbvYua+IFJQa0sRBs1IiQFIEIgvgDEUSs7CSFCJLaA1MJYjrFI5VgmkBiCDYWNgZJlaB/wgknxOT0Lnt7s7Mz852xOgzxXvne98OXxwMG6PXm3PSbzblbgzJ21Kit3mcT4ye34NyI0AeT87PvxeGcHwVGj0d34lJyJQ6Gz1myDwZ+eLpxOapGp8Y95lVPVM4sDUdjF8kSOmK3sZ81HhpGP4XMfi3e3eqx+tcnzyM/ngVjlzjjlcgvIy1aUEaiHIwg110oynNjzXep0h1OVjeMVTNJWK34Xoh2vous6ECoA7R6TRhSiEvJEFk1Rc40+OOZ+rtU7l9r9ZopA1BoAecsHIBcZ/B4CZ18L8uK9r3a9Y+LHADmry5/TmXrmabCDQUJFEkYKhD6EcgZ9FT77cKNT2sA4PfbO7jMWA3OfBwLxwDmILUAOQ1jSPbv/gHOnvdZiWlXQFulyGrle0GFgUFJOj0ImPgtmhCq+6or/6wbp1TIyzc9imq6oNH/AHJmZS/78fLF7S/fDu20/ah+4UMcJGf7xl8kb9PTscP82wAAAABJRU5ErkJggg==") no-repeat center center;
width: 16px;
- position: absolute;
height: 16px;
- top: 3px;
- left: 6px;
-}
-
-.NB-iphone .NB-button .NB-story-comment-like-button-wrapper span {
- top: 2px;
+ display: block;
+ float: left;
+ margin: 0 6px;
}
.NB-button.selected div {
@@ -579,15 +580,13 @@ a.NB-show-profile {
}
.NB-button a {
- display: block;
+ display: inline-block;
padding-top: 1px;
line-height: 16px;
font-family: Helvetica, sans-serif;
font-size: 11px;
color: #606060;
- text-shadow:
- 0px 0px 0px rgba(000,000,000,0),
- 0px 1px 0px rgba(255,255,255,1);
+ text-shadow: 0px 1px 0px rgba(255, 255, 255, 0.8);
}
.NB-button.NB-share-button a {
@@ -328,7 +328,7 @@ _.extend(NEWSBLUR.ReaderTutorial.prototype, {
$.make('li', [
$.make('div', { className: 'NB-modal-submit-button NB-modal-submit-green NB-javascript NB-tutorial-finish-newsblur-blog', style: 'float: right;margin-top: -2px' }, [
'Finish Tutorial and Load',
- $.make('img', { src: NEWSBLUR.Globals.MEDIA_URL+'/img/favicon.png', style: "margin: -3px 0px 0px 4px; vertical-align: middle;" }),
+ $.make('img', { src: NEWSBLUR.Globals.MEDIA_URL+'/img/favicon_32.png', style: "margin: -3px 0px 0px 4px; vertical-align: middle;width: 16px;height: 16px;" }),
' the NewsBlur Blog ',
$.make('span', { className: 'NB-raquo' }, '&raquo;')
]),
Oops, something went wrong.

0 comments on commit 9626f48

Please sign in to comment.