diff --git a/apps/social/views.py b/apps/social/views.py
index 9c6521c4c..9d83a4b47 100644
--- a/apps/social/views.py
+++ b/apps/social/views.py
@@ -334,7 +334,6 @@ def load_social_page(request, user_id, username=None, **kwargs):
has_next_page = False
feed_id = kwargs.get('feed_id') or request.REQUEST.get('feed_id')
if page: offset = limit * (int(page) - 1)
-
user_social_profile = None
user_social_services = None
user_following_social_profile = None
diff --git a/media/css/circular/css/social_page.css b/media/css/circular/css/social_page.css
index 7339ab355..bb35e65a8 100644
--- a/media/css/circular/css/social_page.css
+++ b/media/css/circular/css/social_page.css
@@ -65,7 +65,7 @@ article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav,
/* line 91, ../sass/social_page.scss */
body {
- background: #ebedee url('/../../../media/img/circular/background.png?1357348942') repeat 0 0;
+ background: #ebedee url('/../../../media/img/circular/background.png?1357864825') repeat 0 0;
font-family: Helvetica, arial, sans-serif;
color: #333333;
}
@@ -118,8 +118,8 @@ a {
/* line 130, ../sass/social_page.scss */
blockquote {
background-color: #F0F0F0;
- border-left: 1px solid #9b9b9b;
- padding: 0.5em 2em;
+ border-left: 1px solid #9B9B9B;
+ padding: .5em 2em;
margin: 10px;
}
@@ -136,7 +136,18 @@ blockquote {
display: block;
}
-/* line 150, ../sass/social_page.scss */
+/* line 146, ../sass/social_page.scss */
+.tipsy .tipsy-arrow {
+ display: none;
+}
+
+/* line 155, ../sass/social_page.scss */
+.NB-container {
+ width: 100%;
+ height: 100%;
+}
+
+/* line 164, ../sass/social_page.scss */
.NB-page {
max-width: 700px;
min-width: 300px;
@@ -144,13 +155,8 @@ blockquote {
padding: 0 10px;
}
-/* line 157, ../sass/social_page.scss */
-.NB-header {
- display: none;
-}
-
-/* line 161, ../sass/social_page.scss */
-.NC-watermark-logo {
+/* line 171, ../sass/social_page.scss */
+.NB-watermark-logo {
margin: 20px auto;
max-width: 700px;
min-width: 300px;
@@ -159,19 +165,19 @@ blockquote {
height: 60px;
}
@media screen and (max-width: 480px) {
- /* line 161, ../sass/social_page.scss */
- .NC-watermark-logo {
+ /* line 171, ../sass/social_page.scss */
+ .NB-watermark-logo {
height: 40px;
margin: 10px auto;
}
}
-/* line 174, ../sass/social_page.scss */
-.NB-authenticated .NC-watermark-logo {
+/* line 184, ../sass/social_page.scss */
+.NB-authenticated .NB-watermark-logo {
opacity: 0.4;
}
-/* line 179, ../sass/social_page.scss */
-.NC-blue-button {
+/* line 189, ../sass/social_page.scss */
+.NB-blue-button {
border: 1px solid #4388b5;
-webkit-border-radius: 4px 4px;
-moz-border-radius: 4px / 4px;
@@ -197,7 +203,7 @@ blockquote {
font-weight: normal;
}
/* line 77, ../sass/social_page.scss */
-.NC-blue-button:hover {
+.NB-blue-button:hover {
background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #6bb1e0), color-stop(100%, #6bb1e0));
background-image: -webkit-linear-gradient(#6bb1e0, #6bb1e0);
background-image: -moz-linear-gradient(#6bb1e0, #6bb1e0);
@@ -205,7 +211,7 @@ blockquote {
background-image: linear-gradient(#6bb1e0, #6bb1e0);
}
/* line 81, ../sass/social_page.scss */
-.NC-blue-button:active {
+.NB-blue-button:active {
background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #4d98d2), color-stop(100%, #4d98d2));
background-image: -webkit-linear-gradient(#4d98d2, #4d98d2);
background-image: -moz-linear-gradient(#4d98d2, #4d98d2);
@@ -216,8 +222,8 @@ blockquote {
box-shadow: inset 0px 0px 10px #1f74b8;
}
-/* line 184, ../sass/social_page.scss */
-.NC-header {
+/* line 194, ../sass/social_page.scss */
+.NB-header {
-webkit-box-shadow: 0px 0px 10px #7d7d7d;
-moz-box-shadow: 0px 0px 10px #7d7d7d;
box-shadow: 0px 0px 10px #7d7d7d;
@@ -225,8 +231,8 @@ blockquote {
left: 0;
z-index: 10;
}
-/* line 190, ../sass/social_page.scss */
-.NC-header .NC-header-inner {
+/* line 200, ../sass/social_page.scss */
+.NB-header .NB-header-inner {
padding: 0 10px;
max-width: 700px;
min-width: 300px;
@@ -234,18 +240,18 @@ blockquote {
position: relative;
}
-/* line 199, ../sass/social_page.scss */
-.NB-authenticated .NC-header {
- background: #f2f2f2 url('/../../../media/img/circular/header_background_logged_in.png?1357348942') repeat 0 0;
+/* line 209, ../sass/social_page.scss */
+.NB-authenticated .NB-header {
+ background: #f2f2f2 url('/../../../media/img/circular/header_background_logged_in.png?1357864825') repeat 0 0;
height: 44px;
bottom: 0;
}
-/* line 204, ../sass/social_page.scss */
-.NB-authenticated .NC-header ul {
+/* line 214, ../sass/social_page.scss */
+.NB-authenticated .NB-header ul {
margin: 0 70px;
}
-/* line 207, ../sass/social_page.scss */
-.NB-authenticated .NC-header ul li {
+/* line 217, ../sass/social_page.scss */
+.NB-authenticated .NB-header ul li {
height: 44px;
float: left;
vertical-align: top;
@@ -261,97 +267,97 @@ blockquote {
text-shadow: 0px 1px 1px white;
cursor: pointer;
}
-/* line 222, ../sass/social_page.scss */
-.NB-authenticated .NC-header ul li.NC-active {
- cursor: default;
- background: url('/../../../media/img/circular/header_highlight_border.png?1357348942') no-repeat center bottom;
-}
-/* line 226, ../sass/social_page.scss */
-.NB-authenticated .NC-header ul li.NC-active div.NC-tab-inner {
- color: #62a4d3;
-}
/* line 232, ../sass/social_page.scss */
-.NB-authenticated .NC-header ul li:hover div.NC-tab-inner {
+.NB-authenticated .NB-header ul li.NB-active {
+ cursor: default;
+ background: url('/../../../media/img/circular/header_highlight_border.png?1357864825') no-repeat center bottom;
+}
+/* line 236, ../sass/social_page.scss */
+.NB-authenticated .NB-header ul li.NB-active div.NB-tab-inner {
color: #62a4d3;
}
-/* line 237, ../sass/social_page.scss */
-.NB-authenticated .NC-header ul li div.NC-tab-inner {
+/* line 242, ../sass/social_page.scss */
+.NB-authenticated .NB-header ul li:hover div.NB-tab-inner {
+ color: #62a4d3;
+}
+/* line 247, ../sass/social_page.scss */
+.NB-authenticated .NB-header ul li div.NB-tab-inner {
display: inline-block;
line-height: 44px;
}
-/* line 242, ../sass/social_page.scss */
-.NB-authenticated .NC-header ul li:first-child {
+/* line 252, ../sass/social_page.scss */
+.NB-authenticated .NB-header ul li:first-child {
border-left: 1px solid #cdcdcd;
}
-/* line 246, ../sass/social_page.scss */
-.NB-authenticated .NC-header ul li.NC-user-tab img {
+/* line 256, ../sass/social_page.scss */
+.NB-authenticated .NB-header ul li.NB-user-tab img {
height: 16px;
width: 16px;
-webkit-border-radius: 3px 3px;
-moz-border-radius: 3px / 3px;
border-radius: 3px / 3px;
}
-/* line 253, ../sass/social_page.scss */
-.NB-authenticated .NC-header ul li img,
-.NB-authenticated .NC-header ul li .NC-icon {
+/* line 263, ../sass/social_page.scss */
+.NB-authenticated .NB-header ul li img,
+.NB-authenticated .NB-header ul li .NB-icon {
float: left;
margin-top: 13px;
margin-right: 7px;
}
-/* line 260, ../sass/social_page.scss */
-.NB-authenticated .NC-header ul li.NC-trending-tab .NC-icon {
+/* line 270, ../sass/social_page.scss */
+.NB-authenticated .NB-header ul li.NB-trending-tab .NB-icon {
width: 17px;
height: 17px;
- background: url('/../../../media/img/circular/header/icon_trending.png?1357348942') no-repeat center bottom;
+ background: url('/../../../media/img/circular/header/icon_trending.png?1357864825') no-repeat center bottom;
}
-/* line 267, ../sass/social_page.scss */
-.NB-authenticated .NC-header ul li.NC-active.NC-trending-tab .NC-icon, .NB-authenticated .NC-header ul li.NC-trending-tab:hover .NC-icon {
- background: url('/../../../media/img/circular/header/icon_trending_active.png?1357348942') no-repeat center bottom;
+/* line 277, ../sass/social_page.scss */
+.NB-authenticated .NB-header ul li.NB-active.NB-trending-tab .NB-icon, .NB-authenticated .NB-header ul li.NB-trending-tab:hover .NB-icon {
+ background: url('/../../../media/img/circular/header/icon_trending_active.png?1357864825') no-repeat center bottom;
}
-/* line 271, ../sass/social_page.scss */
-.NB-authenticated .NC-header ul li.NC-following-tab .NC-icon {
+/* line 281, ../sass/social_page.scss */
+.NB-authenticated .NB-header ul li.NB-following-tab .NB-icon {
width: 17px;
height: 17px;
- background: url('/../../../media/img/circular/header/icon_follow.png?1357348942') no-repeat center bottom;
+ background: url('/../../../media/img/circular/header/icon_follow.png?1357864825') no-repeat center bottom;
}
-/* line 278, ../sass/social_page.scss */
-.NB-authenticated .NC-header ul li.NC-active.NC-following-tab .NC-icon, .NB-authenticated .NC-header ul li.NC-following-tab:hover .NC-icon {
- background: url('/../../../media/img/circular/header/icon_follow_active.png?1357348942') no-repeat center bottom;
+/* line 288, ../sass/social_page.scss */
+.NB-authenticated .NB-header ul li.NB-active.NB-following-tab .NB-icon, .NB-authenticated .NB-header ul li.NB-following-tab:hover .NB-icon {
+ background: url('/../../../media/img/circular/header/icon_follow_active.png?1357864825') no-repeat center bottom;
}
-/* line 285, ../sass/social_page.scss */
-.NB-unauthenticated .NC-header {
- background: url('/../../../media/img/circular/header_background_transparent.png?1357348942') repeat 0 0;
+/* line 295, ../sass/social_page.scss */
+.NB-unauthenticated .NB-header {
+ background: url('/../../../media/img/circular/header_background_transparent.png?1357864825') repeat 0 0;
height: 72px;
top: 0;
}
@media screen and (max-width: 480px) {
- /* line 285, ../sass/social_page.scss */
- .NB-unauthenticated .NC-header {
+ /* line 295, ../sass/social_page.scss */
+ .NB-unauthenticated .NB-header {
height: 40px;
}
}
-/* line 294, ../sass/social_page.scss */
-.NB-unauthenticated .NC-header h1.NC-logo a {
+/* line 304, ../sass/social_page.scss */
+.NB-unauthenticated .NB-header h1.NB-logo a {
display: block;
float: left;
padding-top: 16px;
}
@media screen and (max-width: 480px) {
- /* line 294, ../sass/social_page.scss */
- .NB-unauthenticated .NC-header h1.NC-logo a {
+ /* line 304, ../sass/social_page.scss */
+ .NB-unauthenticated .NB-header h1.NB-logo a {
float: none;
text-align: center;
padding-top: 6px;
}
- /* line 304, ../sass/social_page.scss */
- .NB-unauthenticated .NC-header h1.NC-logo a img {
+ /* line 314, ../sass/social_page.scss */
+ .NB-unauthenticated .NB-header h1.NB-logo a img {
height: 30px;
width: 120px;
}
}
-/* line 311, ../sass/social_page.scss */
-.NB-unauthenticated .NC-header .NC-request-toggle-button {
+/* line 321, ../sass/social_page.scss */
+.NB-unauthenticated .NB-header .NB-request-toggle-button {
float: right;
border: 1px solid #4388b5;
-webkit-border-radius: 4px 4px;
@@ -380,7 +386,7 @@ blockquote {
margin-left: 10px;
}
/* line 77, ../sass/social_page.scss */
-.NB-unauthenticated .NC-header .NC-request-toggle-button:hover {
+.NB-unauthenticated .NB-header .NB-request-toggle-button:hover {
background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #6bb1e0), color-stop(100%, #6bb1e0));
background-image: -webkit-linear-gradient(#6bb1e0, #6bb1e0);
background-image: -moz-linear-gradient(#6bb1e0, #6bb1e0);
@@ -388,7 +394,7 @@ blockquote {
background-image: linear-gradient(#6bb1e0, #6bb1e0);
}
/* line 81, ../sass/social_page.scss */
-.NB-unauthenticated .NC-header .NC-request-toggle-button:active {
+.NB-unauthenticated .NB-header .NB-request-toggle-button:active {
background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #4d98d2), color-stop(100%, #4d98d2));
background-image: -webkit-linear-gradient(#4d98d2, #4d98d2);
background-image: -moz-linear-gradient(#4d98d2, #4d98d2);
@@ -398,9 +404,9 @@ blockquote {
-moz-box-shadow: inset 0px 0px 10px #1f74b8;
box-shadow: inset 0px 0px 10px #1f74b8;
}
-/* line 319, ../sass/social_page.scss */
-.NB-unauthenticated .NC-header .NC-logout-button,
-.NB-unauthenticated .NC-header .NC-login-toggle-button {
+/* line 329, ../sass/social_page.scss */
+.NB-unauthenticated .NB-header .NB-logout-button,
+.NB-unauthenticated .NB-header .NB-login-toggle-button {
float: right;
border: 1px solid #bdbdbd;
-webkit-border-radius: 4px 4px;
@@ -429,8 +435,8 @@ blockquote {
margin-left: 10px;
}
/* line 50, ../sass/social_page.scss */
-.NB-unauthenticated .NC-header .NC-logout-button:hover,
-.NB-unauthenticated .NC-header .NC-login-toggle-button:hover {
+.NB-unauthenticated .NB-header .NB-logout-button:hover,
+.NB-unauthenticated .NB-header .NB-login-toggle-button:hover {
background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #f6f6f6), color-stop(100%, #ffffff));
background-image: -webkit-linear-gradient(#f6f6f6, #ffffff);
background-image: -moz-linear-gradient(#f6f6f6, #ffffff);
@@ -438,8 +444,8 @@ blockquote {
background-image: linear-gradient(#f6f6f6, #ffffff);
}
/* line 54, ../sass/social_page.scss */
-.NB-unauthenticated .NC-header .NC-logout-button:active,
-.NB-unauthenticated .NC-header .NC-login-toggle-button:active {
+.NB-unauthenticated .NB-header .NB-logout-button:active,
+.NB-unauthenticated .NB-header .NB-login-toggle-button:active {
background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #e9e9e9), color-stop(100%, #e9e9e9));
background-image: -webkit-linear-gradient(#e9e9e9, #e9e9e9);
background-image: -moz-linear-gradient(#e9e9e9, #e9e9e9);
@@ -452,14 +458,14 @@ blockquote {
color: #333333;
}
@media screen and (max-width: 480px) {
- /* line 326, ../sass/social_page.scss */
- .NB-unauthenticated .NC-header .NC-button {
+ /* line 336, ../sass/social_page.scss */
+ .NB-unauthenticated .NB-header .NB-button {
display: none;
}
}
-/* line 333, ../sass/social_page.scss */
-.NC-popover {
+/* line 343, ../sass/social_page.scss */
+.NB-popover {
position: absolute;
top: 50px;
left: 200px;
@@ -467,43 +473,43 @@ blockquote {
opacity: 0;
display: none;
}
-/* line 341, ../sass/social_page.scss */
-.NC-popover.NC-request-popover {
+/* line 351, ../sass/social_page.scss */
+.NB-popover.NB-request-popover {
top: 50px;
left: 329px;
}
-/* line 346, ../sass/social_page.scss */
-.NC-popover.NC-login-popover {
+/* line 356, ../sass/social_page.scss */
+.NB-popover.NB-login-popover {
top: 50px;
left: 456px;
}
-/* line 351, ../sass/social_page.scss */
-.NC-popover.NC-active {
+/* line 361, ../sass/social_page.scss */
+.NB-popover.NB-active {
display: block;
}
-/* line 355, ../sass/social_page.scss */
-.NC-popover .NC-popover-inner {
+/* line 365, ../sass/social_page.scss */
+.NB-popover .NB-popover-inner {
width: 240px;
padding: 45px 38px 0 30px;
- background: transparent url('/../../../media/img/circular/popover_top.png?1357348942') no-repeat 0 0;
+ background: transparent url('/../../../media/img/circular/popover_top.png?1357864825') no-repeat 0 0;
}
-/* line 361, ../sass/social_page.scss */
-.NC-popover .NC-popover-bottom {
- background: transparent url('/../../../media/img/circular/popover_bottom.png?1357348942') no-repeat left bottom;
+/* line 371, ../sass/social_page.scss */
+.NB-popover .NB-popover-bottom {
+ background: transparent url('/../../../media/img/circular/popover_bottom.png?1357864825') no-repeat left bottom;
height: 40px;
}
-/* line 366, ../sass/social_page.scss */
-.NC-popover input {
- border: 1px solid #bdbdbd;
+/* line 376, ../sass/social_page.scss */
+.NB-popover input {
border: 1px solid #bdbdbd;
+ border: 1px solid #BDBDBD;
padding: 5px;
width: 228px;
margin-bottom: 15px;
font-size: 14px;
font-weight: normal;
}
-/* line 376, ../sass/social_page.scss */
-.NC-popover .NB-error {
+/* line 386, ../sass/social_page.scss */
+.NB-popover .NB-error {
font-size: 12px;
color: #6A1000;
padding: 15px 0 0;
@@ -513,15 +519,15 @@ blockquote {
margin: 0 10px;
}
-/* line 392, ../sass/social_page.scss */
+/* line 402, ../sass/social_page.scss */
.NB-shared-story {
margin: 20px 0 50px 0;
}
-/* line 396, ../sass/social_page.scss */
+/* line 406, ../sass/social_page.scss */
.NB-story {
- border-left: 1px solid white;
- border-right: 1px solid white;
+ border-left: 1px solid #fff;
+ border-right: 1px solid #fff;
background: #fff;
-webkit-box-shadow: 0px 0px 5px #c8c8c8;
-moz-box-shadow: 0px 0px 5px #c8c8c8;
@@ -529,22 +535,22 @@ blockquote {
position: relative;
z-index: 1;
}
-/* line 404, ../sass/social_page.scss */
+/* line 414, ../sass/social_page.scss */
.NB-story .NB-story-inner {
- border-left: 4px solid white;
- border-right: 4px solid white;
+ border-left: 4px solid #fff;
+ border-right: 4px solid #fff;
padding: 25px 25px 15px;
overflow: hidden;
position: relative;
/* contains all children */
}
@media screen and (max-width: 480px) {
- /* line 404, ../sass/social_page.scss */
+ /* line 414, ../sass/social_page.scss */
.NB-story .NB-story-inner {
padding: 12px 12px 15px;
}
}
-/* line 417, ../sass/social_page.scss */
+/* line 427, ../sass/social_page.scss */
.NB-story .NB-story-title .NB-story-title-link {
font-size: 21px;
font-weight: bold;
@@ -553,21 +559,21 @@ blockquote {
color: #333333;
}
@media screen and (max-width: 480px) {
- /* line 417, ../sass/social_page.scss */
+ /* line 427, ../sass/social_page.scss */
.NB-story .NB-story-title .NB-story-title-link {
font-size: 16px;
}
}
-/* line 428, ../sass/social_page.scss */
+/* line 438, ../sass/social_page.scss */
.NB-story .NB-story-title .NB-story-permalink {
font-size: 12px;
margin: 4px 0 0;
}
-/* line 431, ../sass/social_page.scss */
+/* line 441, ../sass/social_page.scss */
.NB-story .NB-story-title .NB-story-permalink a {
color: gray;
}
-/* line 437, ../sass/social_page.scss */
+/* line 447, ../sass/social_page.scss */
.NB-story .NB-story-metadata {
font-size: 14px;
color: gray;
@@ -577,42 +583,42 @@ blockquote {
margin: 5px 0 8px;
}
@media screen and (max-width: 480px) {
- /* line 437, ../sass/social_page.scss */
+ /* line 447, ../sass/social_page.scss */
.NB-story .NB-story-metadata {
font-size: 12px;
}
}
-/* line 449, ../sass/social_page.scss */
+/* line 459, ../sass/social_page.scss */
.NB-story .NB-feed {
margin: 2px 10px 10px 0;
text-transform: capitalize;
float: left;
white-space: nowrap;
}
-/* line 456, ../sass/social_page.scss */
+/* line 466, ../sass/social_page.scss */
.NB-story .NB-feed .NB-feed-favicon,
.NB-story .NB-feed .NB-feed-title {
float: left;
}
@media screen and (max-width: 480px) {
- /* line 449, ../sass/social_page.scss */
+ /* line 459, ../sass/social_page.scss */
.NB-story .NB-feed {
clear: both;
}
}
-/* line 465, ../sass/social_page.scss */
+/* line 475, ../sass/social_page.scss */
.NB-story .NB-feed a {
display: inline-block;
color: gray;
font-size: 12px;
}
@media screen and (max-width: 480px) {
- /* line 465, ../sass/social_page.scss */
+ /* line 475, ../sass/social_page.scss */
.NB-story .NB-feed a {
font-size: 11px;
}
}
-/* line 475, ../sass/social_page.scss */
+/* line 485, ../sass/social_page.scss */
.NB-story .NB-feed img {
float: left;
width: 16px;
@@ -620,17 +626,17 @@ blockquote {
margin-right: 4px;
}
-/* line 484, ../sass/social_page.scss */
+/* line 494, ../sass/social_page.scss */
.NB-story-content-wrapper {
max-height: 300px;
position: relative;
clear: both;
}
-/* line 489, ../sass/social_page.scss */
+/* line 499, ../sass/social_page.scss */
.NB-story-content-wrapper.NB-story-content-wrapper-height-fudged {
max-height: none;
}
-/* line 493, ../sass/social_page.scss */
+/* line 503, ../sass/social_page.scss */
.NB-story-content-wrapper .NB-story-content-expander {
display: none;
position: absolute;
@@ -642,48 +648,48 @@ blockquote {
font-size: 12px;
background: #fff;
}
-/* line 504, ../sass/social_page.scss */
+/* line 514, ../sass/social_page.scss */
.NB-story-content-wrapper .NB-story-content-expander .NB-story-content-expander-inner {
position: relative;
padding: 18px 25px 14px 0;
}
-/* line 509, ../sass/social_page.scss */
+/* line 519, ../sass/social_page.scss */
.NB-story-content-wrapper .NB-story-content-expander:hover {
color: #306187;
}
-/* line 512, ../sass/social_page.scss */
+/* line 522, ../sass/social_page.scss */
.NB-story-content-wrapper .NB-story-content-expander:active {
color: #722125;
}
-/* line 516, ../sass/social_page.scss */
-.NB-story-content-wrapper .NB-story-content-expander .NC-story-cutoff {
+/* line 526, ../sass/social_page.scss */
+.NB-story-content-wrapper .NB-story-content-expander .NB-story-cutoff {
position: absolute;
top: -14px;
left: 0;
width: 100%;
height: 14px;
z-index: 0;
- background: transparent url('/../../../media/img/circular/module_cutoff.png?1357348942') repeat-x left bottom;
+ background: transparent url('/../../../media/img/circular/module_cutoff.png?1357864825') repeat-x left bottom;
}
-/* line 527, ../sass/social_page.scss */
+/* line 537, ../sass/social_page.scss */
.NB-story-content-wrapper .NB-story-content-expander .NB-story-content-expander-text,
.NB-story-content-wrapper .NB-story-content-expander .NB-story-content-expander-pages {
display: inline-block;
}
-/* line 531, ../sass/social_page.scss */
+/* line 541, ../sass/social_page.scss */
.NB-story-content-wrapper .NB-story-content-expander .NB-story-content-expander-pages {
line-height: 8px;
padding: 0 12px;
font-size: 24px;
}
@media screen and (max-width: 480px) {
- /* line 531, ../sass/social_page.scss */
+ /* line 541, ../sass/social_page.scss */
.NB-story-content-wrapper .NB-story-content-expander .NB-story-content-expander-pages {
display: none;
}
}
-/* line 543, ../sass/social_page.scss */
+/* line 553, ../sass/social_page.scss */
.NB-story-content {
font-size: 14px;
line-height: 140%;
@@ -692,33 +698,33 @@ blockquote {
margin: 10px 0;
}
@media screen and (max-width: 480px) {
- /* line 543, ../sass/social_page.scss */
+ /* line 553, ../sass/social_page.scss */
.NB-story-content {
font-size: 12px;
line-height: 160%;
}
}
-/* line 555, ../sass/social_page.scss */
+/* line 565, ../sass/social_page.scss */
.NB-story-content p {
margin: 10px 0;
}
-/* line 559, ../sass/social_page.scss */
+/* line 569, ../sass/social_page.scss */
.NB-story-content img {
margin: 10px 0;
max-width: 100% !important;
height: auto !important;
}
-/* line 565, ../sass/social_page.scss */
+/* line 575, ../sass/social_page.scss */
.NB-story-content ins {
text-decoration: none;
color: inherit;
}
-/* line 570, ../sass/social_page.scss */
+/* line 580, ../sass/social_page.scss */
.NB-story-content del {
display: none;
}
-/* line 577, ../sass/social_page.scss */
+/* line 590, ../sass/social_page.scss */
.NB-story-shares-container {
text-align: right;
color: gray;
@@ -727,20 +733,20 @@ blockquote {
float: right;
}
@media screen and (max-width: 480px) {
- /* line 577, ../sass/social_page.scss */
+ /* line 590, ../sass/social_page.scss */
.NB-story-shares-container {
float: none;
text-align: left;
font-size: 11px;
}
}
-/* line 590, ../sass/social_page.scss */
+/* line 603, ../sass/social_page.scss */
.NB-story-shares-container .NB-story-share-label {
display: inline-block;
vertical-align: top;
margin-top: 3px;
}
-/* line 600, ../sass/social_page.scss */
+/* line 613, ../sass/social_page.scss */
.NB-story-shares-container .NB-story-share-profiles,
.NB-story-shares-container .NB-story-share-profiles-shares-friends,
.NB-story-shares-container .NB-story-share-profiles-shares-public,
@@ -748,23 +754,23 @@ blockquote {
.NB-story-shares-container .NB-story-share-profiles-comments-public {
display: inline;
}
-/* line 605, ../sass/social_page.scss */
+/* line 618, ../sass/social_page.scss */
.NB-story-shares-container .NB-story-share-profiles-shares-public,
.NB-story-shares-container .NB-story-share-profiles-comments-public {
opacity: .5;
}
-/* line 609, ../sass/social_page.scss */
+/* line 622, ../sass/social_page.scss */
.NB-story-shares-container .NB-user-avatar {
display: inline-block;
margin: 2px 1px 0 2px;
}
@media screen and (max-width: 480px) {
- /* line 609, ../sass/social_page.scss */
+ /* line 622, ../sass/social_page.scss */
.NB-story-shares-container .NB-user-avatar {
margin: 2px 3px 0 0px;
}
}
-/* line 617, ../sass/social_page.scss */
+/* line 630, ../sass/social_page.scss */
.NB-story-shares-container .NB-user-avatar img {
-webkit-box-shadow: 0px 0px 1px #bdbdbd;
-moz-box-shadow: 0px 0px 1px #bdbdbd;
@@ -774,29 +780,29 @@ blockquote {
display: block;
}
-/* line 628, ../sass/social_page.scss */
+/* line 641, ../sass/social_page.scss */
.NB-story-comments-container {
font-size: 14px;
z-index: 10;
margin: 0 30px;
background: #f6f6f6;
- border: 1px solid #cccccc;
+ border: 1px solid #CCC;
padding: 0 20px;
border-top: 0;
}
@media screen and (max-width: 480px) {
- /* line 628, ../sass/social_page.scss */
+ /* line 641, ../sass/social_page.scss */
.NB-story-comments-container {
margin: 0 10px;
padding: 0 10px;
font-size: 11px;
}
- /* line 642, ../sass/social_page.scss */
+ /* line 655, ../sass/social_page.scss */
.NB-story-comments-container .NB-story-comment-edit {
display: none;
}
}
-/* line 648, ../sass/social_page.scss */
+/* line 661, ../sass/social_page.scss */
.NB-story-comments-container .NB-user-avatar img,
.NB-story-comments-container img.NB-user-avatar {
position: absolute;
@@ -810,7 +816,7 @@ blockquote {
/* @include single-box-shadow; gets in the way of transparent PNGs */
}
@media screen and (max-width: 480px) {
- /* line 648, ../sass/social_page.scss */
+ /* line 661, ../sass/social_page.scss */
.NB-story-comments-container .NB-user-avatar img,
.NB-story-comments-container img.NB-user-avatar {
height: 24px;
@@ -818,7 +824,7 @@ blockquote {
top: 8px;
}
}
-/* line 665, ../sass/social_page.scss */
+/* line 678, ../sass/social_page.scss */
.NB-story-comments-container .NB-user-avatar.NB-story-comment-reshare img {
top: 27px;
left: 0px;
@@ -827,14 +833,14 @@ blockquote {
height: 24px;
}
@media screen and (max-width: 480px) {
- /* line 665, ../sass/social_page.scss */
+ /* line 678, ../sass/social_page.scss */
.NB-story-comments-container .NB-user-avatar.NB-story-comment-reshare img {
height: 24px;
width: 24px;
top: 8px;
}
}
-/* line 679, ../sass/social_page.scss */
+/* line 692, ../sass/social_page.scss */
.NB-story-comments-container .NB-story-comment {
margin-top: -1px;
padding: 15px 0 18px 44px;
@@ -843,33 +849,25 @@ blockquote {
min-height: 32px;
}
@media screen and (max-width: 480px) {
- /* line 679, ../sass/social_page.scss */
+ /* line 692, ../sass/social_page.scss */
.NB-story-comments-container .NB-story-comment {
padding: 8px 0 8px 34px;
}
}
-/* line 689, ../sass/social_page.scss */
+/* line 702, ../sass/social_page.scss */
.NB-story-comments-container .NB-story-comment .NB-story-comment-username {
float: left;
font-size: 12px;
font-weight: bold;
}
-/* line 695, ../sass/social_page.scss */
+/* line 708, ../sass/social_page.scss */
.NB-story-comments-container .NB-story-comment .NB-story-comment-date {
float: right;
font-size: 12px;
color: gray;
text-shadow: 0px 1px 1px white;
}
-@media screen and (max-width: 480px) {
- /* line 695, ../sass/social_page.scss */
- .NB-story-comments-container .NB-story-comment .NB-story-comment-date {
- float: left;
- clear: both;
- margin-top: 4px;
- }
-}
-/* line 707, ../sass/social_page.scss */
+/* line 715, ../sass/social_page.scss */
.NB-story-comments-container .NB-story-comment .NB-story-comment-location {
float: left;
font-size: 12px;
@@ -878,23 +876,23 @@ blockquote {
margin-left: 15px;
}
@media screen and (max-width: 480px) {
- /* line 707, ../sass/social_page.scss */
+ /* line 715, ../sass/social_page.scss */
.NB-story-comments-container .NB-story-comment .NB-story-comment-location {
display: none;
}
}
-/* line 720, ../sass/social_page.scss */
+/* line 728, ../sass/social_page.scss */
.NB-story-comments-container .NB-story-comment .NB-story-comment-reply-button,
.NB-story-comments-container .NB-story-comment .NB-story-comment-edit-button {
display: none;
}
-/* line 724, ../sass/social_page.scss */
+/* line 732, ../sass/social_page.scss */
.NB-story-comments-container .NB-story-comment .NB-story-comment-content {
padding-top: 4px;
line-height: 18px;
clear: both;
}
-/* line 730, ../sass/social_page.scss */
+/* line 738, ../sass/social_page.scss */
.NB-story-comments-container .NB-story-comment .NB-story-comment-reshares .NB-user-avatar img {
top: 15px;
left: 12px;
@@ -903,12 +901,12 @@ blockquote {
height: 20px;
}
@media screen and (max-width: 480px) {
- /* line 730, ../sass/social_page.scss */
+ /* line 738, ../sass/social_page.scss */
.NB-story-comments-container .NB-story-comment .NB-story-comment-reshares .NB-user-avatar img {
display: none;
}
}
-/* line 743, ../sass/social_page.scss */
+/* line 751, ../sass/social_page.scss */
.NB-story-comments-container .NB-story-comment-reply {
margin-top: 15px;
padding: 15px 0 0px 44px;
@@ -917,18 +915,18 @@ blockquote {
min-height: 32px;
}
@media screen and (max-width: 480px) {
- /* line 743, ../sass/social_page.scss */
+ /* line 751, ../sass/social_page.scss */
.NB-story-comments-container .NB-story-comment-reply {
padding: 8px 0 0px 32px;
}
}
-/* line 754, ../sass/social_page.scss */
+/* line 762, ../sass/social_page.scss */
.NB-story-comments-container .NB-story-comment-reply .NB-story-comment-reply-content {
padding-top: 4px;
line-height: 18px;
clear: both;
}
-/* line 761, ../sass/social_page.scss */
+/* line 769, ../sass/social_page.scss */
.NB-story-comments-container .NB-story-comment-input {
width: 371px;
height: 16px;
@@ -937,7 +935,7 @@ blockquote {
margin-top: 1px;
border: 1px solid #bdbdbd;
}
-/* line 771, ../sass/social_page.scss */
+/* line 779, ../sass/social_page.scss */
.NB-story-comments-container .NB-story-comment-buttons .NB-story-comment-save {
position: absolute;
top: 16px;
@@ -988,11 +986,11 @@ blockquote {
text-shadow: 0px -1px 1px white;
color: #333333;
}
-/* line 779, ../sass/social_page.scss */
+/* line 787, ../sass/social_page.scss */
.NB-story-comments-container .NB-story-comment-buttons .NB-story-comment-delete {
display: none;
}
-/* line 784, ../sass/social_page.scss */
+/* line 792, ../sass/social_page.scss */
.NB-story-comments-container .NB-story-comments-public-header-wrapper {
color: gray;
font-size: 12px;
@@ -1000,120 +998,73 @@ blockquote {
padding: 3px 0;
}
-/* line 793, ../sass/social_page.scss */
+/* line 804, ../sass/social_page.scss */
+.NB-page-controls {
+ margin: 0 auto 54px;
+ border-top: 2px solid #626262;
+ border-bottom: 2px solid #626262;
+ padding: 1px 0;
+ text-align: center;
+ max-width: 800px;
+ overflow: hidden;
+}
+
+/* line 815, ../sass/social_page.scss */
.NB-page-controls-next,
.NB-page-controls-end {
background-color: #6eb4e3;
- border: 1px solid #4388b5;
- -webkit-border-radius: 4px 4px;
- -moz-border-radius: 4px / 4px;
- border-radius: 4px / 4px;
- -webkit-box-shadow: inset 0px 0px 2px #80c5f2;
- -moz-box-shadow: inset 0px 0px 2px #80c5f2;
- box-shadow: inset 0px 0px 2px #80c5f2;
- background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #6eb4e3), color-stop(100%, #4d98d2));
- background-image: -webkit-linear-gradient(#6eb4e3, #4d98d2);
- background-image: -moz-linear-gradient(#6eb4e3, #4d98d2);
- background-image: -o-linear-gradient(#6eb4e3, #4d98d2);
- background-image: linear-gradient(#6eb4e3, #4d98d2);
- -webkit-box-shadow: rgba(153, 153, 153, 0.4) 0 0 5px, #70b5e3 0 2px 1px inset;
- -moz-box-shadow: rgba(153, 153, 153, 0.4) 0 0 5px, #70b5e3 0 2px 1px inset;
- box-shadow: rgba(153, 153, 153, 0.4) 0 0 5px, #70b5e3 0 2px 1px inset;
- color: white;
height: 20px;
- line-height: 20px;
- text-align: center;
- cursor: pointer;
- padding: 4px 12px;
- font-size: 14px;
- font-weight: normal;
+ padding: 20px 28px 20px;
position: relative;
overflow: hidden;
- -webkit-transition: all 0.12s ease-out;
- -moz-transition: all 0.12s ease-out;
- -o-transition: all 0.12s ease-out;
- -ms-transition: all 0.12s ease-out;
+ text-shadow: 0 1px 0 #141F48;
+ -webkit-transition: all .12s ease-out;
+ -moz-transition: all .12s ease-out;
+ -o-transition: all .12s ease-out;
+ -ms-transition: all .12s ease-out;
}
-/* line 77, ../sass/social_page.scss */
-.NB-page-controls-next:hover,
-.NB-page-controls-end:hover {
- background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #6bb1e0), color-stop(100%, #6bb1e0));
- background-image: -webkit-linear-gradient(#6bb1e0, #6bb1e0);
- background-image: -moz-linear-gradient(#6bb1e0, #6bb1e0);
- background-image: -o-linear-gradient(#6bb1e0, #6bb1e0);
- background-image: linear-gradient(#6bb1e0, #6bb1e0);
-}
-/* line 81, ../sass/social_page.scss */
-.NB-page-controls-next:active,
-.NB-page-controls-end:active {
- background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #4d98d2), color-stop(100%, #4d98d2));
- background-image: -webkit-linear-gradient(#4d98d2, #4d98d2);
- background-image: -moz-linear-gradient(#4d98d2, #4d98d2);
- background-image: -o-linear-gradient(#4d98d2, #4d98d2);
- background-image: linear-gradient(#4d98d2, #4d98d2);
- -webkit-box-shadow: inset 0px 0px 10px #1f74b8;
- -moz-box-shadow: inset 0px 0px 10px #1f74b8;
- box-shadow: inset 0px 0px 10px #1f74b8;
-}
-/* line 805, ../sass/social_page.scss */
+/* line 829, ../sass/social_page.scss */
.NB-page-controls-next .NB-page-controls-text,
.NB-page-controls-end .NB-page-controls-text {
position: absolute;
left: 0;
width: 100%;
- margin-bottom: -15px;
- bottom: 20px;
-}
-
-/* line 814, ../sass/social_page.scss */
-.NB-page-controls-end {
- border: 1px solid #bdbdbd;
- -webkit-border-radius: 4px 4px;
- -moz-border-radius: 4px / 4px;
- border-radius: 4px / 4px;
- -webkit-box-shadow: inset 0px 0px 2px white;
- -moz-box-shadow: inset 0px 0px 2px white;
- box-shadow: inset 0px 0px 2px white;
- -webkit-box-shadow: rgba(153, 153, 153, 0.4) 0 0 5px, white 0 2px 1px inset;
- -moz-box-shadow: rgba(153, 153, 153, 0.4) 0 0 5px, white 0 2px 1px inset;
- box-shadow: rgba(153, 153, 153, 0.4) 0 0 5px, white 0 2px 1px inset;
- background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(100%, #f6f6f6));
- background-image: -webkit-linear-gradient(#ffffff, #f6f6f6);
- background-image: -moz-linear-gradient(#ffffff, #f6f6f6);
- background-image: -o-linear-gradient(#ffffff, #f6f6f6);
- background-image: linear-gradient(#ffffff, #f6f6f6);
- color: gray;
height: 20px;
- line-height: 20px;
- text-align: center;
- cursor: pointer;
- padding: 4px 12px;
- font-size: 14px;
- font-weight: normal;
+ bottom: 20px;
+ font-size: 20px;
+ color: white;
}
-/* line 50, ../sass/social_page.scss */
+/* line 839, ../sass/social_page.scss */
+.NB-page-controls-next:hover,
.NB-page-controls-end:hover {
- background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #f6f6f6), color-stop(100%, #ffffff));
- background-image: -webkit-linear-gradient(#f6f6f6, #ffffff);
- background-image: -moz-linear-gradient(#f6f6f6, #ffffff);
- background-image: -o-linear-gradient(#f6f6f6, #ffffff);
- background-image: linear-gradient(#f6f6f6, #ffffff);
+ background-color: #2B478C;
+ background-image: none;
+ cursor: pointer;
}
-/* line 54, ../sass/social_page.scss */
-.NB-page-controls-end:active {
- background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #e9e9e9), color-stop(100%, #e9e9e9));
- background-image: -webkit-linear-gradient(#e9e9e9, #e9e9e9);
- background-image: -moz-linear-gradient(#e9e9e9, #e9e9e9);
- background-image: -o-linear-gradient(#e9e9e9, #e9e9e9);
- background-image: linear-gradient(#e9e9e9, #e9e9e9);
- -webkit-box-shadow: inset 0px 0px 10px #c1c1c1;
- -moz-box-shadow: inset 0px 0px 10px #c1c1c1;
- box-shadow: inset 0px 0px 10px #c1c1c1;
- text-shadow: 0px -1px 1px white;
- color: #333333;
+/* line 844, ../sass/social_page.scss */
+.NB-page-controls-next.NB-loaded,
+.NB-page-controls-end.NB-loaded {
+ cursor: default;
+}
+/* line 847, ../sass/social_page.scss */
+.NB-page-controls-next.NB-loading,
+.NB-page-controls-end.NB-loading {
+ cursor: wait;
}
-/* line 819, ../sass/social_page.scss */
-.tipsy .tipsy-arrow {
- display: none;
+/* line 852, ../sass/social_page.scss */
+.NB-page-controls-end {
+ background-color: #3B3E49;
+ cursor: default;
+}
+/* line 856, ../sass/social_page.scss */
+.NB-page-controls-end:hover {
+ background-color: #3B3E49;
+ background-image: none;
+ cursor: default;
+}
+
+/* line 863, ../sass/social_page.scss */
+footer {
+ overflow: hidden;
}
diff --git a/media/css/circular/sass/social_page.scss b/media/css/circular/sass/social_page.scss
index 809b97cc4..36f58773b 100644
--- a/media/css/circular/sass/social_page.scss
+++ b/media/css/circular/sass/social_page.scss
@@ -32,7 +32,7 @@ $default-box-shadow-blur: 1px;
// = Mixins =
// ==========
-@mixin NC-default-button {
+@mixin NB-default-button {
border: 1px solid $border-color;
@include border-radius(4px, 4px);
@include single-box-shadow(white, 0px, 0px, 2px, false, true);
@@ -59,7 +59,7 @@ $default-box-shadow-blur: 1px;
}
}
-@mixin NC-blue-button {
+@mixin NB-blue-button {
border: 1px solid #4388b5;
@include border-radius(4px, 4px);
@include single-box-shadow(#80c5f2, 0px, 0px, 2px, false, true);
@@ -142,6 +142,20 @@ blockquote {
.NB-spinner.NB-active {
display: block;
}
+.tipsy {
+ .tipsy-arrow {
+ display: none;
+ }
+}
+
+// ========
+// = Page =
+// ========
+
+.NB-container {
+ width: 100%;
+ height: 100%;
+}
// ==========
// = Header =
@@ -154,11 +168,7 @@ blockquote {
padding: 0 10px;
}
-.NB-header {
- display: none;
-}
-
-.NC-watermark-logo {
+.NB-watermark-logo {
margin: 20px auto;
max-width: $page-width;
min-width: 300px;
@@ -176,18 +186,18 @@ blockquote {
}
}
-.NC-blue-button {
- @include NC-blue-button;
+.NB-blue-button {
+ @include NB-blue-button;
}
-.NC-header {
+.NB-header {
@include single-box-shadow(#7d7d7d, 0px, 0px, 10px, false, false);
width: 100%;
left: 0;
z-index: 10;
- .NC-header-inner {
+ .NB-header-inner {
padding: 0 10px;
max-width: $page-width;
min-width: 300px;
@@ -196,7 +206,7 @@ blockquote {
}
}
-.NB-authenticated .NC-header {
+.NB-authenticated .NB-header {
background: #f2f2f2 image-url('header_background_logged_in.png') repeat 0 0;
height: 44px;
bottom: 0;
@@ -219,22 +229,22 @@ blockquote {
cursor: pointer;
- &.NC-active {
+ &.NB-active {
cursor: default;
background: image-url('header_highlight_border.png') no-repeat center bottom;
- div.NC-tab-inner {
+ div.NB-tab-inner {
color: $highlight-text-color;
}
}
&:hover {
- div.NC-tab-inner {
+ div.NB-tab-inner {
color: $highlight-text-color;
}
}
- div.NC-tab-inner {
+ div.NB-tab-inner {
display: inline-block;
line-height: 44px;
}
@@ -243,46 +253,46 @@ blockquote {
border-left: 1px solid #cdcdcd;
}
- &.NC-user-tab img {
+ &.NB-user-tab img {
height: 16px;
width: 16px;
@include border-radius(3px, 3px);
}
img,
- .NC-icon {
+ .NB-icon {
float: left;
margin-top: 13px;
margin-right: 7px;
}
- &.NC-trending-tab .NC-icon {
+ &.NB-trending-tab .NB-icon {
width: 17px;
height: 17px;
background: image-url('header/icon_trending.png') no-repeat center bottom;
}
- &.NC-active.NC-trending-tab .NC-icon,
- &.NC-trending-tab:hover .NC-icon {
+ &.NB-active.NB-trending-tab .NB-icon,
+ &.NB-trending-tab:hover .NB-icon {
background: image-url('header/icon_trending_active.png') no-repeat center bottom;
}
- &.NC-following-tab .NC-icon {
+ &.NB-following-tab .NB-icon {
width: 17px;
height: 17px;
background: image-url('header/icon_follow.png') no-repeat center bottom;
}
- &.NC-active.NC-following-tab .NC-icon,
- &.NC-following-tab:hover .NC-icon {
+ &.NB-active.NB-following-tab .NB-icon,
+ &.NB-following-tab:hover .NB-icon {
background: image-url('header/icon_follow_active.png') no-repeat center bottom;
}
}
}
}
-.NB-unauthenticated .NC-header {
+.NB-unauthenticated .NB-header {
background: image-url('header_background_transparent.png') repeat 0 0;
height: 72px;
top: 0;
@@ -291,7 +301,7 @@ blockquote {
height: 40px;
}
- h1.NC-logo a {
+ h1.NB-logo a {
display: block;
float: left;
padding-top: 16px;
@@ -308,29 +318,29 @@ blockquote {
}
}
- .NC-request-toggle-button {
+ .NB-request-toggle-button {
float: right;
- @include NC-blue-button;
+ @include NB-blue-button;
margin-top: 20px;
margin-left: 10px;
}
- .NC-logout-button,
- .NC-login-toggle-button {
+ .NB-logout-button,
+ .NB-login-toggle-button {
float: right;
- @include NC-default-button;
+ @include NB-default-button;
margin-top: 20px;
margin-left: 10px;
}
- .NC-button {
+ .NB-button {
@media screen and ( max-width: 480px) {
display: none;
}
}
}
-.NC-popover {
+.NB-popover {
position: absolute;
top: 50px;
left: 200px;
@@ -338,27 +348,27 @@ blockquote {
opacity: 0;
display: none;
- &.NC-request-popover {
+ &.NB-request-popover {
top: 50px;
left: 329px;
}
- &.NC-login-popover {
+ &.NB-login-popover {
top: 50px;
left: 456px;
}
- &.NC-active {
+ &.NB-active {
display: block;
}
- .NC-popover-inner {
+ .NB-popover-inner {
width: 240px;
padding: 45px 38px 0 30px;
background: transparent image-url('popover_top.png') no-repeat 0 0;
}
- .NC-popover-bottom {
+ .NB-popover-bottom {
background: transparent image-url('popover_bottom.png') no-repeat left bottom;
height: 40px;
}
@@ -513,7 +523,7 @@ blockquote {
color: $more-text-color-active;
}
- .NC-story-cutoff {
+ .NB-story-cutoff {
position: absolute;
top: -14px;
left: 0;
@@ -573,6 +583,9 @@ blockquote {
}
+// ==========
+// = Shares =
+// ==========
.NB-story-shares-container {
text-align: right;
@@ -697,11 +710,6 @@ blockquote {
font-size: $smallest-font-size;
color: $light-text-color;
@include single-text-shadow;
- @media screen and ( max-width: 480px) {
- float: left;
- clear: both;
- margin-top: 4px;
- }
}
.NB-story-comment-location {
@@ -773,7 +781,7 @@ blockquote {
top: 16px;
right: 0;
width: 140px;
- @include NC-default-button;
+ @include NB-default-button;
}
.NB-story-comment-delete {
@@ -789,13 +797,29 @@ blockquote {
}
}
+// ==========
+// = Footer =
+// ==========
+
+.NB-page-controls {
+ margin: 0 auto 54px;
+ border-top: 2px solid #626262;
+ border-bottom: 2px solid #626262;
+ padding: 1px 0;
+ text-align: center;
+ max-width: 800px;
+ overflow: hidden;
+}
+
.NB-page-controls-next,
.NB-page-controls-end {
background-color: #6eb4e3;
- @include NC-blue-button;
+ height: 20px;
+ padding: 20px 28px 20px;
position: relative;
overflow: hidden;
+ text-shadow: 0 1px 0 #141F48;
-webkit-transition: all .12s ease-out;
-moz-transition: all .12s ease-out;
@@ -806,17 +830,36 @@ blockquote {
position: absolute;
left: 0;
width: 100%;
- margin-bottom: -15px;
+ height: 20px;
bottom: 20px;
+ font-size: 20px;
+ color: white;
+ }
+
+ &:hover {
+ background-color: #2B478C;
+ background-image: none;
+ cursor: pointer;
+ }
+ &.NB-loaded {
+ cursor: default;
+ }
+ &.NB-loading {
+ cursor: wait;
}
}
.NB-page-controls-end {
- @include NC-default-button;
+ background-color: #3B3E49;
+ cursor: default;
+
+ &:hover {
+ background-color: #3B3E49;
+ background-image: none;
+ cursor: default;
+ }
}
-.tipsy {
- .tipsy-arrow {
- display: none;
- }
-}
\ No newline at end of file
+footer {
+ overflow: hidden;
+}
diff --git a/media/css/social/social_page.css b/media/css/social/old_social_page.css
similarity index 100%
rename from media/css/social/social_page.css
rename to media/css/social/old_social_page.css
diff --git a/media/js/newsblur/social_page/social_page.js b/media/js/newsblur/social_page/social_page.js
index c2cfe065e..6b0192a0f 100644
--- a/media/js/newsblur/social_page/social_page.js
+++ b/media/js/newsblur/social_page/social_page.js
@@ -72,11 +72,14 @@ NEWSBLUR.Views.SocialPage = Backbone.View.extend({
return;
}
- var page_control_y = this.$('.NB-page-controls').last().offset().top - 500;
- if (viewport_y > page_control_y) {
- this.cached_page_control_y = page_control_y;
- this.flags.loading_page = true;
- this.next_page();
+ var $controls = this.$('.NB-page-controls');
+ if ($controls.length) {
+ var page_control_y = $controls.last().offset().top - 500;
+ if (viewport_y > page_control_y) {
+ this.cached_page_control_y = page_control_y;
+ this.flags.loading_page = true;
+ this.next_page();
+ }
}
},
@@ -100,7 +103,7 @@ NEWSBLUR.Views.SocialPage = Backbone.View.extend({
scroll_to_story: function(story_view, run) {
$('html,body').stop().animate({
- scrollTop: story_view.$mark.offset().top - 8
+ scrollTop: story_view.$mark.offset().top - 12
}, {
duration: run == 1 ? 1000 : 500,
easing: run == 1 ? 'easeInQuint' : 'easeOutQuint',
diff --git a/media/js/newsblur/social_page/social_page_login_view.js b/media/js/newsblur/social_page/social_page_login_view.js
index f3150d20a..e822bfd70 100644
--- a/media/js/newsblur/social_page/social_page_login_view.js
+++ b/media/js/newsblur/social_page/social_page_login_view.js
@@ -1,11 +1,11 @@
NEWSBLUR.Views.SocialPageLoginSignupView = Backbone.View.extend({
events: {
- "click .NC-login-toggle-button" : "toggle_login_dialog",
- "click .NC-request-toggle-button" : "toggle_request_dialog",
- "click .NC-logout-button" : "logout",
- "click .NC-login-button" : "login",
- "click .NC-request-button" : "request_invite"
+ "click .NB-login-toggle-button" : "toggle_login_dialog",
+ "click .NB-request-toggle-button" : "toggle_request_dialog",
+ "click .NB-logout-button" : "logout",
+ "click .NB-login-button" : "login",
+ "click .NB-request-button" : "request_invite"
},
initialize: function() {
@@ -14,14 +14,14 @@ NEWSBLUR.Views.SocialPageLoginSignupView = Backbone.View.extend({
toggle_login_dialog: function(options) {
console.log('open');
options = options || {};
- var $popover = this.$('.NC-login-popover');
- var $other_popover = this.$('.NC-request-popover');
+ var $popover = this.$('.NB-login-popover');
+ var $other_popover = this.$('.NB-request-popover');
var $login_username = this.$('input[name=login_username]');
var $login_password = this.$('input[name=login_password]');
if (options.open != true &&
(options.close ||
- ($popover.hasClass('NC-active')))) {
+ ($popover.hasClass('NB-active')))) {
// Close
$popover.animate({
'opacity': 0
@@ -31,15 +31,15 @@ NEWSBLUR.Views.SocialPageLoginSignupView = Backbone.View.extend({
'queue': false,
'complete': _.bind(function() {
this.$('.NB-error').remove();
- $popover.removeClass('NC-active');
+ $popover.removeClass('NB-active');
}, this)
});
$(document).unbind('mousedown.loginView');
} else {
// Open/resize
this.$('.NB-error').remove();
- $other_popover.removeClass('NC-active');
- $popover.addClass('NC-active');
+ $other_popover.removeClass('NB-active');
+ $popover.addClass('NB-active');
$popover.animate({
'opacity': 1
}, {
@@ -70,12 +70,12 @@ NEWSBLUR.Views.SocialPageLoginSignupView = Backbone.View.extend({
toggle_request_dialog: function(options) {
options = options || {};
- var $popover = this.$('.NC-request-popover');
- var $other_popover = this.$('.NC-login-popover');
+ var $popover = this.$('.NB-request-popover');
+ var $other_popover = this.$('.NB-login-popover');
var $request_email = this.$('input[name=request_email]');
if (options.close ||
- ($popover.hasClass('NC-active'))) {
+ ($popover.hasClass('NB-active'))) {
// Close
$popover.animate({
'opacity': 0
@@ -84,14 +84,14 @@ NEWSBLUR.Views.SocialPageLoginSignupView = Backbone.View.extend({
'easing': 'easeInOutQuint',
'queue': false,
'complete': _.bind(function() {
- $popover.removeClass('NC-active');
+ $popover.removeClass('NB-active');
}, this)
});
$(document).unbind('mousedown.loginView');
} else {
- $other_popover.removeClass('NC-active');
- $popover.addClass('NC-active');
+ $other_popover.removeClass('NB-active');
+ $popover.addClass('NB-active');
$popover.animate({
'opacity': 1
}, {
@@ -121,10 +121,10 @@ NEWSBLUR.Views.SocialPageLoginSignupView = Backbone.View.extend({
},
hide_popovers: function(e) {
- var $popover = this.$('.NC-popover');
+ var $popover = this.$('.NB-popover');
if (e) {
- if (($(e.target).closest(".NC-popover").length) || ($(e.target).closest(".NC-button").length)) return;
+ if (($(e.target).closest(".NB-popover").length) || ($(e.target).closest(".NB-button").length)) return;
}
$(document).unbind('mousedown.loginView');
@@ -136,7 +136,7 @@ NEWSBLUR.Views.SocialPageLoginSignupView = Backbone.View.extend({
'easing': 'easeInOutQuint',
'queue': false
});
- $popover.removeClass('NC-active');
+ $popover.removeClass('NB-active');
},
// ==========
@@ -165,7 +165,7 @@ NEWSBLUR.Views.SocialPageLoginSignupView = Backbone.View.extend({
this.clean();
var error = _.first(_.values(data.errors))[0];
- this.$('.NC-login-popover .NC-popover-inner').append($.make('div', { className: 'NB-error' }, error));
+ this.$('.NB-login-popover .NB-popover-inner').append($.make('div', { className: 'NB-error' }, error));
},
logout: function() {
@@ -190,7 +190,7 @@ NEWSBLUR.Views.SocialPageLoginSignupView = Backbone.View.extend({
post_request_invite: function(data) {
NEWSBLUR.log(["request data", data]);
this.hide_popovers();
- this.$('.NC-request-toggle-button').html('Invite Requested');
+ this.$('.NB-request-toggle-button').html('Invite Requested');
},
request_invite_error: function(data) {
diff --git a/media/js/newsblur/social_page/social_page_story.js b/media/js/newsblur/social_page/social_page_story.js
index 639a20264..ab8ba9339 100644
--- a/media/js/newsblur/social_page/social_page_story.js
+++ b/media/js/newsblur/social_page/social_page_story.js
@@ -90,7 +90,7 @@ NEWSBLUR.Views.SocialPageStory = Backbone.View.extend({
truncate_story_height: function() {
var $expander = this.$(".NB-story-content-expander");
- var $expander_cutoff = this.$(".NC-story-cutoff");
+ var $expander_cutoff = this.$(".NB-story-cutoff");
var $wrapper = this.$(".NB-story-content-wrapper");
var $content = this.$(".NB-story-content");
@@ -247,7 +247,7 @@ NEWSBLUR.Views.SocialPageStory = Backbone.View.extend({
expand_story: function(options) {
options = options || {};
var $expander = this.$(".NB-story-content-expander");
- var $expander_cutoff = this.$(".NC-story-cutoff");
+ var $expander_cutoff = this.$(".NB-story-cutoff");
var $wrapper = this.$(".NB-story-content-wrapper");
var $content = this.$(".NB-story-content");
var max_height = parseInt($wrapper.css('maxHeight'), 10) || this.STORY_CONTENT_MAX_HEIGHT;
diff --git a/templates/social/social_page.xhtml b/templates/social/social_page.xhtml
index 7352083a4..6e8874077 100644
--- a/templates/social/social_page.xhtml
+++ b/templates/social/social_page.xhtml
@@ -4,14 +4,14 @@
- Circular
+ {{ social_profile.title }}
-
+
{% if active_story %}
@@ -89,55 +89,56 @@
-