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

Fixing loading color on blurblogs.

Browse source
This commit is contained in:
Samuel Clay 2013-05-22 18:44:56 -07:00
parent 57267207dd
commit 29d9ff46e8
3 changed files with 24 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/social/views.py
View file

@ -340,7 +340,7 @@ def load_social_page(request, user_id, username=None, **kwargs):
elif username == "popular.global":
current_tab = "global"
global_feed = True
if social_profile.private and (not user.is_authenticated() or
not social_profile.is_followed_by_user(user.pk)):
stories = []

36
media/css/circular/css/social_page.css
View file

@ -55,7 +55,7 @@ article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav,
}
body {
background: #ebedee url('/../../../media/img/circular/background.png?1368646587') repeat 0 0;
background: #ebedee url('/../../../media/img/circular/background.png?1369142701') repeat 0 0;
font-family: Helvetica, arial, sans-serif;
color: #333333;
-webkit-text-size-adjust: 100%;
@ -381,51 +381,51 @@ blockquote {
}
}
.NB-header .NB-header-tabs .NB-header-tab.NB-blurblog-tab {
background: url('/../../../media/img/circular/header/icon_activity_active.png?1368646587') no-repeat -9999px -9999px;
background: url('/../../../media/img/circular/header/icon_activity_active.png?1369142701') no-repeat -9999px -9999px;
}
.NB-header .NB-header-tabs .NB-header-tab.NB-blurblog-tab .NB-icon {
background: url('/../../../media/img/circular/header/icon_activity.png?1368646587') no-repeat center bottom;
background: url('/../../../media/img/circular/header/icon_activity.png?1369142701') no-repeat center bottom;
background-size: 17px;
}
.NB-header .NB-header-tabs .NB-header-tab.NB-active.NB-blurblog-tab .NB-icon, .NB-header .NB-header-tabs .NB-header-tab.NB-blurblog-tab:hover .NB-icon {
background: url('/../../../media/img/circular/header/icon_activity_active.png?1368646587') no-repeat center bottom;
background: url('/../../../media/img/circular/header/icon_activity_active.png?1369142701') no-repeat center bottom;
background-size: 17px;
}
.NB-header .NB-header-tabs .NB-header-tab.NB-trending-tab {
background: url('/../../../media/img/circular/header/icon_trending_active.png?1368646587') no-repeat -9999px -9999px;
background: url('/../../../media/img/circular/header/icon_trending_active.png?1369142701') no-repeat -9999px -9999px;
}
.NB-header .NB-header-tabs .NB-header-tab.NB-trending-tab .NB-icon {
background: url('/../../../media/img/circular/header/icon_trending.png?1368646587') no-repeat center bottom;
background: url('/../../../media/img/circular/header/icon_trending.png?1369142701') no-repeat center bottom;
background-size: 17px;
}
.NB-header .NB-header-tabs .NB-header-tab.NB-active.NB-trending-tab .NB-icon, .NB-header .NB-header-tabs .NB-header-tab.NB-trending-tab:hover .NB-icon {
background: url('/../../../media/img/circular/header/icon_trending_active.png?1368646587') no-repeat center bottom;
background: url('/../../../media/img/circular/header/icon_trending_active.png?1369142701') no-repeat center bottom;
background-size: 17px;
}
.NB-header .NB-header-tabs .NB-header-tab.NB-following-tab {
background: url('/../../../media/img/circular/header/icon_follow_active.png?1368646587') no-repeat -9999px -9999px;
background: url('/../../../media/img/circular/header/icon_follow_active.png?1369142701') no-repeat -9999px -9999px;
}
.NB-header .NB-header-tabs .NB-header-tab.NB-following-tab .NB-icon {
background: url('/../../../media/img/circular/header/icon_follow.png?1368646587') no-repeat center bottom;
background: url('/../../../media/img/circular/header/icon_follow.png?1369142701') no-repeat center bottom;
background-size: 17px;
}
.NB-header .NB-header-tabs .NB-header-tab.NB-active.NB-following-tab .NB-icon, .NB-header .NB-header-tabs .NB-header-tab.NB-following-tab:hover .NB-icon {
background: url('/../../../media/img/circular/header/icon_follow_active.png?1368646587') no-repeat center bottom;
background: url('/../../../media/img/circular/header/icon_follow_active.png?1369142701') no-repeat center bottom;
background-size: 17px;
}
.NB-header .NB-header-tabs .NB-header-tab.NB-user-tab {
background: url('/../../../media/img/circular/header/icon_circular_active.png?1368646587') no-repeat -9999px -9999px;
background: url('/../../../media/img/circular/header/icon_circular_active.png?1369142701') no-repeat -9999px -9999px;
}
.NB-header .NB-header-tabs .NB-header-tab.NB-user-tab .NB-icon {
background: url('/../../../media/img/circular/header/icon_circular.png?1368646587') no-repeat center bottom;
background: url('/../../../media/img/circular/header/icon_circular.png?1369142701') no-repeat center bottom;
background-size: 17px;
}
.NB-header .NB-header-tabs .NB-header-tab.NB-active.NB-user-tab .NB-icon, .NB-header .NB-header-tabs .NB-header-tab.NB-user-tab:hover .NB-icon {
background: url('/../../../media/img/circular/header/icon_circular_active.png?1368646587') no-repeat center bottom;
background: url('/../../../media/img/circular/header/icon_circular_active.png?1369142701') no-repeat center bottom;
background-size: 17px;
}
.NB-header .NB-header-tabs .NB-header-tab.NB-active {
background: url('/../../../media/img/circular/header_highlight_border.png?1368646587') no-repeat center bottom;
background: url('/../../../media/img/circular/header_highlight_border.png?1369142701') no-repeat center bottom;
}
.NB-header .NB-header-tabs .NB-header-tab.NB-active div.NB-tab-inner {
color: #62a4d3;
@ -677,7 +677,7 @@ blockquote {
width: 100%;
height: 14px;
z-index: 0;
background: transparent url('/../../../media/img/circular/module_cutoff.png?1368646587') repeat-x left bottom;
background: transparent url('/../../../media/img/circular/module_cutoff.png?1369142701') repeat-x left bottom;
}
.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 {
@ -1201,7 +1201,8 @@ blockquote {
padding: 20px 28px 20px;
position: relative;
overflow: hidden;
text-shadow: 0 1px 0 rgba(0, 0, 0, 0.6);
color: rgba(0, 0, 0, 0.5);
text-shadow: 0 1px 0 rgba(255, 255, 255, 0.6);
-webkit-transition: all 0.32s ease-out;
-moz-transition: all 0.32s ease-out;
-o-transition: all 0.32s ease-out;
@ -1215,7 +1216,6 @@ blockquote {
height: 20px;
bottom: 20px;
font-size: 20px;
color: white;
}
.NB-page-controls-next:not(.NB-loaded,.NB-loading):hover,
.NB-page-controls-end:not(.NB-loaded,.NB-loading):hover {
@ -1227,6 +1227,8 @@ blockquote {
.NB-page-controls-end.NB-loaded {
cursor: default;
background-color: rgba(0, 0, 0, 0.3);
color: white;
text-shadow: 0 1px 0 rgba(0, 0, 0, 0.6);
}
.NB-page-controls-next.NB-loading,
.NB-page-controls-end.NB-loading {

6
media/css/circular/sass/social_page.scss
View file

@ -1130,7 +1130,8 @@ blockquote {
padding: 20px 28px 20px;
position: relative;
overflow: hidden;
text-shadow: 0 1px 0 rgba(0, 0, 0, .6);
color: rgba(0, 0, 0, .5);
text-shadow: 0 1px 0 rgba(255, 255, 255, .6);
-webkit-transition: all .32s ease-out;
-moz-transition: all .32s ease-out;
@ -1144,7 +1145,6 @@ blockquote {
height: 20px;
bottom: 20px;
font-size: 20px;
color: white;
}
&:not(.NB-loaded,.NB-loading):hover {
@ -1155,6 +1155,8 @@ blockquote {
&.NB-loaded {
cursor: default;
background-color: rgba(0, 0, 0, .3);
color: white;
text-shadow: 0 1px 0 rgba(0, 0, 0, .6);
}
&.NB-loading {
cursor: wait;