diff --git a/media/ios/Classes/FeedTableCell.m b/media/ios/Classes/FeedTableCell.m index 2bf1cc0dc..f328e3b9e 100644 --- a/media/ios/Classes/FeedTableCell.m +++ b/media/ios/Classes/FeedTableCell.m @@ -104,7 +104,7 @@ static UIFont *textFont = nil; UIColor *textColor = highlighted ? [UIColor blackColor]: - UIColorFromRGB(0x4a4a4a); + UIColorFromRGB(0x3a3a3a); [textColor set]; UIFont *font; diff --git a/media/ios/Classes/StoryDetailViewController.m b/media/ios/Classes/StoryDetailViewController.m index b096592ee..cd505538e 100644 --- a/media/ios/Classes/StoryDetailViewController.m +++ b/media/ios/Classes/StoryDetailViewController.m @@ -156,7 +156,6 @@ // set up layout values based on iPad/iPhone headerString = [NSString stringWithFormat:@ - "" "" "", diff --git a/media/ios/Classes/StoryPageControl.xib b/media/ios/Classes/StoryPageControl.xib index 08402ed4e..3f31e8ded 100644 --- a/media/ios/Classes/StoryPageControl.xib +++ b/media/ios/Classes/StoryPageControl.xib @@ -1,14 +1,14 @@ - 1536 + 1552 12C3006 - 2840 + 3084 1187.34 625.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1926 + 2083 IBProxyObject @@ -104,8 +104,8 @@ - 1 - MC4yMjcwMjkxMjggMC4zNjIxMzU3NzY0IDAuNDU2NTIxNzM5MQA + 2 + MC45MDk4MDM5ODY1IDAuOTE3NjQ3MTIzMyAwLjg5NDExNzcxMwA @@ -114,6 +114,7 @@ {{125, 417}, {70, 43}} + _NS:9 NO IBCocoaTouchFramework @@ -5699,6 +5700,7 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE ShareViewController StoryDetailViewController StoryPageControl + TrainerViewController UserProfileViewController UIWindow @@ -5795,6 +5797,10 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE storyPageControl StoryPageControl + + trainerViewController + TrainerViewController + userProfileViewController UserProfileViewController @@ -6185,6 +6191,57 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE ./Classes/StoryPageControl.h + + TrainerViewController + BaseViewController + + doCloseDialog: + id + + + doCloseDialog: + + doCloseDialog: + id + + + + NewsBlurAppDelegate + UIBarButtonItem + UINavigationBar + TrainerWebView + + + + appDelegate + NewsBlurAppDelegate + + + closeButton + UIBarButtonItem + + + navBar + UINavigationBar + + + webView + TrainerWebView + + + + IBProjectSource + ./Classes/TrainerViewController.h + + + + TrainerWebView + UIWebView + + IBProjectSource + ./Classes/TrainerWebView.h + + UserProfileViewController UIViewController @@ -6199,6 +6256,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE IBCocoaTouchFramework YES 3 - 1926 + 2083 diff --git a/media/ios/Entitlements.entitlements b/media/ios/Entitlements.entitlements index fe238e5c4..c468210c7 100644 --- a/media/ios/Entitlements.entitlements +++ b/media/ios/Entitlements.entitlements @@ -5,7 +5,7 @@ application-identifier $(AppIdentifierPrefix)$(CFBundleIdentifier) get-task-allow - + keychain-access-groups $(AppIdentifierPrefix)$(CFBundleIdentifier) diff --git a/media/ios/NewsBlur.xcodeproj/project.pbxproj b/media/ios/NewsBlur.xcodeproj/project.pbxproj index 38b3bcb0d..830a51952 100755 --- a/media/ios/NewsBlur.xcodeproj/project.pbxproj +++ b/media/ios/NewsBlur.xcodeproj/project.pbxproj @@ -373,7 +373,6 @@ FF67D3B7168977690057A7DA /* TrainerViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = FF67D3B6168977690057A7DA /* TrainerViewController.xib */; }; FF67D3B916897AD80057A7DA /* TrainerViewController~ipad.xib in Resources */ = {isa = PBXBuildFile; fileRef = FF67D3B816897AD80057A7DA /* TrainerViewController~ipad.xib */; }; FF67D3BB168A70630057A7DA /* trainer.css in Resources */ = {isa = PBXBuildFile; fileRef = FF67D3BA168A70630057A7DA /* trainer.css */; }; - FF67D3C0168A708D0057A7DA /* reader.css in Resources */ = {isa = PBXBuildFile; fileRef = FF67D3BC168A708D0057A7DA /* reader.css */; }; FF67D3C1168A708D0057A7DA /* storyDetailView.css in Resources */ = {isa = PBXBuildFile; fileRef = FF67D3BD168A708D0057A7DA /* storyDetailView.css */; }; FF67D3CC168A73380057A7DA /* storyDetailView.js in Resources */ = {isa = PBXBuildFile; fileRef = FF67D3BE168A708D0057A7DA /* storyDetailView.js */; }; FF67D3CD168A73380057A7DA /* zepto.js in Resources */ = {isa = PBXBuildFile; fileRef = FF67D3BF168A708D0057A7DA /* zepto.js */; }; @@ -912,7 +911,6 @@ FF67D3B6168977690057A7DA /* TrainerViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = TrainerViewController.xib; sourceTree = ""; }; FF67D3B816897AD80057A7DA /* TrainerViewController~ipad.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = "TrainerViewController~ipad.xib"; path = "Resources-iPad/Classes/TrainerViewController~ipad.xib"; sourceTree = ""; }; FF67D3BA168A70630057A7DA /* trainer.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; name = trainer.css; path = ../static/trainer.css; sourceTree = ""; }; - FF67D3BC168A708D0057A7DA /* reader.css */ = {isa = PBXFileReference; explicitFileType = text.css; fileEncoding = 4; name = reader.css; path = ../static/reader.css; sourceTree = ""; }; FF67D3BD168A708D0057A7DA /* storyDetailView.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; name = storyDetailView.css; path = ../static/storyDetailView.css; sourceTree = ""; }; FF67D3BE168A708D0057A7DA /* storyDetailView.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; name = storyDetailView.js; path = ../static/storyDetailView.js; sourceTree = ""; }; FF67D3BF168A708D0057A7DA /* zepto.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; name = zepto.js; path = ../static/zepto.js; sourceTree = ""; }; @@ -1378,7 +1376,6 @@ 431B857715A132BE00DCE497 /* css */ = { isa = PBXGroup; children = ( - FF67D3BC168A708D0057A7DA /* reader.css */, FF67D3BD168A708D0057A7DA /* storyDetailView.css */, FF67D3BA168A70630057A7DA /* trainer.css */, ); @@ -2219,7 +2216,6 @@ FF67D3B916897AD80057A7DA /* TrainerViewController~ipad.xib in Resources */, FF67D3BB168A70630057A7DA /* trainer.css in Resources */, FF67D3C1168A708D0057A7DA /* storyDetailView.css in Resources */, - FF67D3C0168A708D0057A7DA /* reader.css in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2454,8 +2450,8 @@ isa = XCBuildConfiguration; buildSettings = { ARCHS = "$(ARCHS_STANDARD_32_BIT)"; - CODE_SIGN_IDENTITY = "iPhone Distribution: NewsBlur, Inc."; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: NewsBlur, Inc."; + CODE_SIGN_IDENTITY = "iPhone Developer: Samuel Clay (3PN8E5365D)"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Samuel Clay (3PN8E5365D)"; COPY_PHASE_STRIP = NO; GCC_C_LANGUAGE_STANDARD = "compiler-default"; GCC_WARN_ABOUT_RETURN_TYPE = YES; @@ -2463,8 +2459,8 @@ HEADER_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)/**"; IPHONEOS_DEPLOYMENT_TARGET = 5.0; OTHER_LDFLAGS = "-ObjC"; - PROVISIONING_PROFILE = "548B341C-C438-40E2-943F-ACB87D42AED4"; - "PROVISIONING_PROFILE[sdk=iphoneos*]" = "548B341C-C438-40E2-943F-ACB87D42AED4"; + PROVISIONING_PROFILE = "0E4D73FC-DFF6-4E38-BA47-4A3F5AC9C6A2"; + "PROVISIONING_PROFILE[sdk=iphoneos*]" = "0E4D73FC-DFF6-4E38-BA47-4A3F5AC9C6A2"; RUN_CLANG_STATIC_ANALYZER = YES; SDKROOT = iphoneos; STRIP_INSTALLED_PRODUCT = NO; @@ -2476,8 +2472,8 @@ isa = XCBuildConfiguration; buildSettings = { ARCHS = "$(ARCHS_STANDARD_32_BIT)"; - CODE_SIGN_IDENTITY = "iPhone Distribution: NewsBlur, Inc."; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: NewsBlur, Inc."; + CODE_SIGN_IDENTITY = "iPhone Developer: Samuel Clay (3PN8E5365D)"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Samuel Clay (3PN8E5365D)"; COPY_PHASE_STRIP = NO; GCC_C_LANGUAGE_STANDARD = "compiler-default"; GCC_WARN_ABOUT_RETURN_TYPE = YES; @@ -2486,8 +2482,8 @@ IPHONEOS_DEPLOYMENT_TARGET = 5.0; OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1"; OTHER_LDFLAGS = "-ObjC"; - PROVISIONING_PROFILE = "548B341C-C438-40E2-943F-ACB87D42AED4"; - "PROVISIONING_PROFILE[sdk=iphoneos*]" = "548B341C-C438-40E2-943F-ACB87D42AED4"; + PROVISIONING_PROFILE = "0E4D73FC-DFF6-4E38-BA47-4A3F5AC9C6A2"; + "PROVISIONING_PROFILE[sdk=iphoneos*]" = "0E4D73FC-DFF6-4E38-BA47-4A3F5AC9C6A2"; SDKROOT = iphoneos; STRIP_INSTALLED_PRODUCT = NO; VALID_ARCHS = armv7; diff --git a/media/ios/static/reader.css b/media/ios/static/reader.css deleted file mode 100644 index 2bfc8711d..000000000 --- a/media/ios/static/reader.css +++ /dev/null @@ -1,309 +0,0 @@ -.NB-right { - float: right; -} - -#story_pane .NB-story-comment { - border-top: 1px solid #A6A6A6; - background:#f5f9fb; - position: relative; - padding: 0 12px 2px 64px; - line-height: 20px; - overflow: hidden; - min-height: 72px; - box-shadow: inset 1px 1px 1px rgba(255, 255, 255, 1);shar -} - -.NB-story-share-profiles-comments-friends, -.NB-story-share-profiles-comments-public { - float: left; -} - -.NB-story-share-profiles-shares-friends, -.NB-story-share-profiles-shares-public { - float: right; -} - -#story_pane .NB-story-comment .NB-user-avatar { - position: absolute; - left: 6px; - top: 8px; -} -#story_pane .NB-story-comment .NB-user-avatar.NB-story-comment-reshare { - top: 22px; - left: 6px; - z-index: 1; -} -#story_pane .NB-story-comment .NB-user-avatar img { - border-radius: 6px; - margin: 0; - width: 48px; - height: 48px; -} -#story_pane .NB-story-comment .NB-user-avatar.NB-story-comment-reshare img { - height: 36px; - width: 36px; -} -#story_pane .NB-story-comment .NB-story-comment-author-container { - padding: 8px 0 0; -} -#story_pane .NB-story-comment .NB-story-comment-reshares { - position: absolute; - top: 0; - left: 8px; - z-index: 0; -} -#story_pane .NB-story-comment .NB-story-comment-reshares .NB-user-avatar { - top: 8px; - left: 26px; -} -#story_pane .NB-story-comment .NB-story-comment-username { - float: left; - font-size: 11px; - color: #1D4BA6; - font-weight: bold; - margin: 0 4px 0 0; - text-shadow: 0 -1px 0 #F0F0F0; - cursor: pointer; - line-height: 17px; -} -#story_pane .NB-story-comment .NB-story-comment-date { - text-transform: uppercase; - font-size: 10px; - color: #9D9D9D; - font-weight: bold; - float: right; - line-height: 17px; - margin: 0 0 0; -} - -#story_pane .NB-story-comment .NB-story-comment-likes { - float: right; - margin: 0; - overflow: hidden; -} -#story_pane .NB-story-comment .NB-story-comment-likes-icon { - float: right; - 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; - height: 16px; - display: block; - margin: 0 10px 0 0; - vertical-align: top; -} -#story_pane .NB-story-comment .NB-story-comment-likes-user { - float: right; - margin: 2px 2px 0 0; -} -#story_pane .NB-story-comment .NB-story-comment-likes-user .NB-user-avatar { - position: static; -} -#story_pane .NB-story-comment .NB-story-comment-likes-user img { - width: 12px; - height: 12px; - border-radius: 2px; - vertical-align: top; -} - - -#story_pane .NB-story-comment .NB-story-comment-location { - text-transform: uppercase; - font-size: 10px; - color: #BECDD7; - font-weight: bold; - float: left; - 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; -} - - -#story_pane .NB-story-comment-reply { - border-top: 1px solid #E0E0E0; - padding: 4px 0; - overflow: hidden; - clear: both; - position: relative; - padding: 8px 0 4px 42px; - line-height: 18px; -} -#story_pane .NB-story-comment-reply .NB-story-comment-reply-photo { - width: 32px; - height: 32px; - border-radius: 3px; - position: absolute; - left: 0px; - top: 2px; - cursor: pointer; -} - -#story_pane .NB-story-comment-reply-content { - clear: both; - color: #303030; - padding: 2px 0 3px; -} - -#story_pane .NB-story-comment-reply-form { - padding-top: 11px; -} -#story_pane .NB-story-comment-reply-form .NB-story-comment-reply-username { - margin: 1px 8px 6px 0; -} -#story_pane .NB-story-comment-reply-form .NB-story-comment-reply-comments { - margin: 0 8px 4px 0; - width: 62%; - display: block; - float: left; - font-size: 12px; -} -#story_pane .NB-story-comment-reply-form .NB-modal-submit-button { - float: left; - font-size: 10px; - padding: 2px 8px; - line-height: 16px; - margin: 0; -} -#story_pane .NB-story-comment-reply-form .NB-error { - font-size: 10px; - color: #6A1000; - padding: 4px 0 0; - line-height: 14px; - font-weight: bold; - clear: both; -} -#story_pane .NB-story-comments-public-teaser-wrapper, -#story_pane .NB-story-comments-public-header-wrapper { - border-top: 1px solid #353535; - padding: 1px 0; - cursor: pointer; -} -#story_pane .NB-story-comments-public-header-wrapper { - cursor: default; -} -#story_pane .NB-story-comments-shares-teaser-wrapper { - border-top: 1px solid #fff; - padding-top: 0; -} - -#story_pane .NB-story-comments-public-teaser, -#story_pane .NB-story-comments-public-header { - background-color: #B1B6B4; - color: white; - text-shadow: 0 1px 0 #505050; - font-weight: bold; - text-transform: uppercase; - font-size: 10px; - padding: 2px 12px; - overflow: hidden; -} - -#story_pane .NB-story-comments-public-header { - background-color: whiteSmoke; - color: #404040; - text-shadow: 0 1px 0 white; -} -#story_pane .NB-story-comments-shares-teaser { - background-color: whiteSmoke; - color: #202020; - cursor: default; - text-shadow: 0 1px 0 white; - font-weight: bold; - text-transform: uppercase; - font-size: 10px; - padding: 4px 12px 0; - overflow: hidden; - min-height: 26px; - border-bottom: 1px solid #A6A6A6; - background-image: url('data:image/png;charset=utf-8;base64,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'), -webkit-gradient( - linear, - left bottom, - left top, - color-stop(0.10, #EBEBEC), - color-stop(0.84, #F5F5F5) - ); -} - - - -#story_pane .NB-story-comments-public-teaser-wrapper:hover .NB-story-comments-public-teaser { - background-color: #2B478C; - background-image: none; -} -#story_pane .NB-story-comments-public-teaser b { - padding: 0 1px; - font-size: 12px; -} - -#story_pane .NB-story-share-profiles { - float: left; - vertical-align: top; - min-height: 24px; - padding-top: 2px; - margin-top: 0px; - overflow: hidden; -} - -#story_pane .NB-story-share-profiles.NB-story-share-profiles-public { - float: right; -} -#story_pane .NB-story-share-profiles.NB-story-share-profiles-public .NB-story-share-profile { - float: right; -} - -#story_pane .NB-story-share-profile { - display: inline-block; -} - -#story_pane .NB-story-share-profile .NB-user-avatar { - float: left; - font-size: 0; - vertical-align: middle; - height: 22px; - width: 22px; - margin: 0 4px 6px 0; - cursor: pointer; -} - -#story_pane .NB-story-share-profile .NB-public-user { - opacity: 0.5; -} - -#story_pane .NB-story-share-profile .NB-user-avatar img { - width: 22px; - height: 22px; - border-radius: 3px; -} -#story_pane .NB-story-share-profile .NB-user-username { - float: left; -} -#story_pane .NB-story-comment .NB-story-comment-content { - clear: both; - padding: 2px 0 3px 0; -} - -#story_pane .NB-feed-stories .NB-feed-story { - margin: 0; - clear: both; - overflow: hidden; -} - -#story_pane .NB-feed-stories.NB-feed-view-story .NB-feed-story { - padding: 0; -} - -#story_pane .audiojs audio { - display: none; -} - - diff --git a/media/ios/static/storyDetailView.css b/media/ios/static/storyDetailView.css index 94f0fbb07..4f289375a 100644 --- a/media/ios/static/storyDetailView.css +++ b/media/ios/static/storyDetailView.css @@ -310,7 +310,7 @@ div + p { font-weight: 600; background-image: -webkit-gradient(linear, left top, left bottom, from(#FEFEFE), to(#F3F4EF)); border-bottom: 1px solid #C2C5BE; - text-shadow: 1px 1px 0 #EFEFEF; + text-shadow: 0 1px 0 rgba(255, 255, 255, .7); overflow: hidden; max-width: none; @@ -426,12 +426,12 @@ del { .nb-story-comments-label { float: left; margin-right: 2px; - margin-top: 6px; + margin-top: 2px; } .nb-story-share-label { float: right; - margin-top: 6px; + margin-top: 2px; margin-left: 2px; } @@ -456,12 +456,6 @@ a.NB-show-profile { -webkit-tap-highlight-color: rgba(0,0,0,0); } -.NB-header, -#NB-share-bar-wrapper { - -webkit-user-select: none; - -webkit-touch-callout: none; -} - .NB-button.NB-share-button { line-height: 20px; font-family: Helvetica, sans-serif; @@ -597,4 +591,312 @@ a.NB-show-profile { .NB-button.selected a { color: rgba(255,255,255,1); text-shadow: none; -} \ No newline at end of file +} + + + +/* Story Comments */ + +.NB-right { + float: right; +} + +#story_pane .NB-story-comment { + border-top: 1px solid #A6A6A6; + background:#f5f9fb; + position: relative; + padding: 0 12px 2px 64px; + line-height: 20px; + overflow: hidden; + min-height: 72px; + box-shadow: inset 1px 1px 1px rgba(255, 255, 255, 1);shar +} + +.NB-header, +#NB-share-bar-wrapper { + -webkit-user-select: none; + -webkit-touch-callout: none; +} + +.NB-story-share-profiles-comments-friends, +.NB-story-share-profiles-comments-public { + float: left; +} + +.NB-story-share-profiles-shares-friends, +.NB-story-share-profiles-shares-public { + float: right; +} + +#story_pane .NB-story-comment .NB-user-avatar { + position: absolute; + left: 6px; + top: 8px; +} +#story_pane .NB-story-comment .NB-user-avatar.NB-story-comment-reshare { + top: 22px; + left: 6px; + z-index: 1; +} +#story_pane .NB-story-comment .NB-user-avatar img { + border-radius: 6px; + margin: 0; + width: 48px; + height: 48px; +} +#story_pane .NB-story-comment .NB-user-avatar.NB-story-comment-reshare img { + height: 36px; + width: 36px; +} +#story_pane .NB-story-comment .NB-story-comment-author-container { + padding: 8px 0 0; +} +#story_pane .NB-story-comment .NB-story-comment-reshares { + position: absolute; + top: 0; + left: 8px; + z-index: 0; +} +#story_pane .NB-story-comment .NB-story-comment-reshares .NB-user-avatar { + top: 8px; + left: 26px; +} +#story_pane .NB-story-comment .NB-story-comment-username { + float: left; + font-size: 11px; + color: #1D4BA6; + font-weight: bold; + margin: 0 4px 0 0; + text-shadow: 0 -1px 0 #F0F0F0; + cursor: pointer; + line-height: 17px; +} +#story_pane .NB-story-comment .NB-story-comment-date { + text-transform: uppercase; + font-size: 10px; + color: #9D9D9D; + font-weight: bold; + float: right; + line-height: 17px; + margin: 0 0 0; +} + +#story_pane .NB-story-comment .NB-story-comment-likes { + float: right; + margin: 0; + overflow: hidden; +} +#story_pane .NB-story-comment .NB-story-comment-likes-icon { + float: right; + 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; + height: 16px; + display: block; + margin: 0 10px 0 0; + vertical-align: top; +} +#story_pane .NB-story-comment .NB-story-comment-likes-user { + float: right; + margin: 2px 2px 0 0; +} +#story_pane .NB-story-comment .NB-story-comment-likes-user .NB-user-avatar { + position: static; +} +#story_pane .NB-story-comment .NB-story-comment-likes-user img { + width: 12px; + height: 12px; + border-radius: 2px; + vertical-align: top; +} + + +#story_pane .NB-story-comment .NB-story-comment-location { + text-transform: uppercase; + font-size: 10px; + color: #BECDD7; + font-weight: bold; + float: left; + 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; +} + + +#story_pane .NB-story-comment-reply { + border-top: 1px solid #E0E0E0; + padding: 4px 0; + overflow: hidden; + clear: both; + position: relative; + padding: 8px 0 4px 42px; + line-height: 18px; +} +#story_pane .NB-story-comment-reply .NB-story-comment-reply-photo { + width: 32px; + height: 32px; + border-radius: 3px; + position: absolute; + left: 0px; + top: 2px; + cursor: pointer; +} + +#story_pane .NB-story-comment-reply-content { + clear: both; + color: #303030; + padding: 2px 0 3px; +} + +#story_pane .NB-story-comment-reply-form { + padding-top: 11px; +} +#story_pane .NB-story-comment-reply-form .NB-story-comment-reply-username { + margin: 1px 8px 6px 0; +} +#story_pane .NB-story-comment-reply-form .NB-story-comment-reply-comments { + margin: 0 8px 4px 0; + width: 62%; + display: block; + float: left; + font-size: 12px; +} +#story_pane .NB-story-comment-reply-form .NB-modal-submit-button { + float: left; + font-size: 10px; + padding: 2px 8px; + line-height: 16px; + margin: 0; +} +#story_pane .NB-story-comment-reply-form .NB-error { + font-size: 10px; + color: #6A1000; + padding: 4px 0 0; + line-height: 14px; + font-weight: bold; + clear: both; +} +#story_pane .NB-story-comments-public-teaser-wrapper, +#story_pane .NB-story-comments-public-header-wrapper { + border-top: 1px solid #353535; + padding: 1px 0; + cursor: pointer; +} +#story_pane .NB-story-comments-public-header-wrapper { + cursor: default; +} +#story_pane .NB-story-comments-shares-teaser-wrapper { + border-top: 0; + padding-top: 0; +} + +#story_pane .NB-story-comments-public-teaser, +#story_pane .NB-story-comments-public-header { + background-color: #B1B6B4; + color: white; + text-shadow: 0 1px 0 #505050; + font-weight: bold; + text-transform: uppercase; + font-size: 10px; + padding: 2px 12px; + overflow: hidden; +} + +#story_pane .NB-story-comments-public-header { + background-color: whiteSmoke; + color: #404040; + text-shadow: 0 1px 0 white; +} +#story_pane .NB-story-comments-shares-teaser { + background-color: #F5F5EF; + color: #898989; + text-shadow: 0 1px 0 #FFF; + font-weight: normal; + font-size: 10px; + padding: 8px 12px 0px 28px; + overflow: hidden; + min-height: 27px; + line-height: 14px; + border-bottom: 1px solid #E3E3DF; + -webkit-box-shadow: inset 0px 1px 1px rgba(0, 0, 0, .1); + -webkit-transition: all .12s ease-out; +} + +#story_pane .NB-story-comments-public-teaser b { + padding: 0 1px; + font-size: 12px; +} + +#story_pane .NB-story-share-profiles { + float: left; + vertical-align: top; + min-height: 24px; + padding-top: 2px; + margin-top: -4px; + overflow: hidden; +} + +#story_pane .NB-story-share-profiles.NB-story-share-profiles-public { + float: right; +} +#story_pane .NB-story-share-profiles.NB-story-share-profiles-public .NB-story-share-profile { + float: right; +} + +#story_pane .NB-story-share-profile { + display: inline-block; +} + +#story_pane .NB-story-share-profile .NB-user-avatar { + float: left; + font-size: 0; + vertical-align: middle; + height: 22px; + width: 22px; + margin: 0 4px 6px 0; + cursor: pointer; +} + +#story_pane .NB-story-share-profile .NB-public-user { + opacity: 0.5; +} + +#story_pane .NB-story-share-profile .NB-user-avatar img { + width: 22px; + height: 22px; + border-radius: 3px; +} +#story_pane .NB-story-share-profile .NB-user-username { + float: left; +} +#story_pane .NB-story-comment .NB-story-comment-content { + clear: both; + padding: 2px 0 3px 0; +} + +#story_pane .NB-feed-stories .NB-feed-story { + margin: 0; + clear: both; + overflow: hidden; +} + +#story_pane .NB-feed-stories.NB-feed-view-story .NB-feed-story { + padding: 0; +} + +#story_pane .audiojs audio { + display: none; +} + +