mirror of
https://github.com/twisterarmy/twister-html.git
synced 2025-02-09 21:44:15 +00:00
exluding advert msg of random guy from twisterday reminder routine, fixes of its css
This commit is contained in:
parent
c149e8bbc1
commit
0a51e2f0da
@ -836,7 +836,7 @@ ol.toptrends-list {
|
|||||||
|
|
||||||
.twistday-reminder h4 {
|
.twistday-reminder h4 {
|
||||||
margin: 1% 1% 1% 16%;
|
margin: 1% 1% 1% 16%;
|
||||||
font-size: 90%;
|
font-size: 10px;
|
||||||
color: rgba(0, 0, 0, 0.5);
|
color: rgba(0, 0, 0, 0.5);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -849,6 +849,10 @@ ol.toptrends-list {
|
|||||||
padding: 5px;
|
padding: 5px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.twistday-reminder .twister-user-info {
|
||||||
|
margin: 1.2% 0 -2.8% 0;
|
||||||
|
}
|
||||||
|
|
||||||
.twistday-reminder .twister-user-tag,
|
.twistday-reminder .twister-user-tag,
|
||||||
.twistday-reminder .twister-user-full {
|
.twistday-reminder .twister-user-full {
|
||||||
display: block;
|
display: block;
|
||||||
@ -857,7 +861,7 @@ ol.toptrends-list {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.twistday-reminder .twisterday {
|
.twistday-reminder .twisterday {
|
||||||
font-size: 80%;
|
font-size: 11px;
|
||||||
margin-left: 11%;
|
margin-left: 11%;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -218,11 +218,12 @@ function refreshTwistdayReminder() {
|
|||||||
item.find('.twister-user-info').attr('data-screen-name', lucky);
|
item.find('.twister-user-info').attr('data-screen-name', lucky);
|
||||||
item.find('.twister-user-name').attr('href', $.MAL.userUrl(lucky));
|
item.find('.twister-user-name').attr('href', $.MAL.userUrl(lucky));
|
||||||
item.find('.twister-user-tag').text('@' +lucky);
|
item.find('.twister-user-tag').text('@' +lucky);
|
||||||
|
itemTwisterday = item.find('.twisterday');
|
||||||
|
itemTwisterday.bind('click', (function(e) { replyInitPopup(e, post); }).bind(post));
|
||||||
if (typeof(time) !== 'undefined')
|
if (typeof(time) !== 'undefined')
|
||||||
item.find('.twisterday').text(timeGmtToText(time));
|
itemTwisterday.text(timeGmtToText(time));
|
||||||
else
|
else
|
||||||
item.find('.twisterday').text(timeGmtToText(post.userpost.time));
|
itemTwisterday.text(timeGmtToText(post.userpost.time));
|
||||||
item.find('.twisterday').bind('click', (function(e) { replyInitPopup(e, post); }).bind(post));
|
|
||||||
|
|
||||||
getAvatar(lucky, item.find('.twister-user-photo'));
|
getAvatar(lucky, item.find('.twister-user-photo'));
|
||||||
getFullname(lucky, item.find('.twister-user-full'));
|
getFullname(lucky, item.find('.twister-user-full'));
|
||||||
@ -231,8 +232,7 @@ function refreshTwistdayReminder() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
function removeLuckyFromList(list, post) {
|
function removeLuckyFromList(list, post) {
|
||||||
var lucky = post.userpost.n;
|
list.find('[data-screen-name='+post.userpost.n+']').closest('li').remove();
|
||||||
list.find('[data-screen-name='+lucky+']').closest('li').remove();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
var showUpcomingTimer = ($.Options.getTwistdayReminderShowUpcomingOpt() === 'enable') ? $.Options.getTwistdayReminderShowUpcomingTimerOpt() *3600 : 0;
|
var showUpcomingTimer = ($.Options.getTwistdayReminderShowUpcomingOpt() === 'enable') ? $.Options.getTwistdayReminderShowUpcomingTimerOpt() *3600 : 0;
|
||||||
@ -246,30 +246,29 @@ function refreshTwistdayReminder() {
|
|||||||
var thatSec;
|
var thatSec;
|
||||||
|
|
||||||
posts.sort(function(a,b) {
|
posts.sort(function(a,b) {
|
||||||
if (parseInt(a.userpost.time) > parseInt(b.userpost.time))
|
return (parseInt(a.userpost.time) > parseInt(b.userpost.time)) ? 1 : -1;
|
||||||
return 1;
|
|
||||||
else
|
|
||||||
return -1;
|
|
||||||
});
|
});
|
||||||
|
|
||||||
for (var i = 0; i < posts.length; i++) {
|
for (var i = 0; i < posts.length; i++) {
|
||||||
d.setTime(0);
|
if (followingUsers.indexOf(posts[i].userpost.n) > -1) {
|
||||||
d.setUTCSeconds(posts[i].userpost.time);
|
d.setTime(0);
|
||||||
if (d.getUTCMonth() === todayMonth && d.getUTCDate() === todayDate) {
|
d.setUTCSeconds(posts[i].userpost.time);
|
||||||
addLuckyToList(listCurrent, posts[i]);
|
if (d.getUTCMonth() === todayMonth && d.getUTCDate() === todayDate) {
|
||||||
} else if (showUpcomingTimer > 0) {
|
addLuckyToList(listCurrent, posts[i]);
|
||||||
thatSec = Date.UTC(todayYear,d.getUTCMonth(),d.getUTCDate(),d.getUTCHours(),d.getUTCMinutes(),d.getUTCSeconds()) /1000;
|
} else if (showUpcomingTimer > 0) {
|
||||||
if (thatSec > todaySec && thatSec -todaySec <= showUpcomingTimer) {
|
thatSec = Date.UTC(todayYear,d.getUTCMonth(),d.getUTCDate(),d.getUTCHours(),d.getUTCMinutes(),d.getUTCSeconds()) /1000;
|
||||||
d.setTime(0);
|
if (thatSec > todaySec && thatSec -todaySec <= showUpcomingTimer) {
|
||||||
d.setUTCSeconds(thatSec);
|
d.setTime(0);
|
||||||
addLuckyToList(listUpcoming, posts[i], d.getTime() /1000);
|
d.setUTCSeconds(thatSec);
|
||||||
|
addLuckyToList(listUpcoming, posts[i], d.getTime() /1000);
|
||||||
|
} else {
|
||||||
|
removeLuckyFromList(listCurrent, posts[i]);
|
||||||
|
removeLuckyFromList(listUpcoming, posts[i]);
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
removeLuckyFromList(listCurrent, posts[i]);
|
removeLuckyFromList(listCurrent, posts[i]);
|
||||||
removeLuckyFromList(listUpcoming, posts[i]);
|
removeLuckyFromList(listUpcoming, posts[i]);
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
removeLuckyFromList(listCurrent, posts[i]);
|
|
||||||
removeLuckyFromList(listUpcoming, posts[i]);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1019,7 +1019,7 @@ textarea.splited-post {
|
|||||||
|
|
||||||
.twistday-reminder h4 {
|
.twistday-reminder h4 {
|
||||||
margin: 1% 1% 1% 16%;
|
margin: 1% 1% 1% 16%;
|
||||||
font-size: 90%;
|
font-size: 10px;
|
||||||
color: rgba(0, 0, 0, 0.5);
|
color: rgba(0, 0, 0, 0.5);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1032,6 +1032,10 @@ textarea.splited-post {
|
|||||||
padding: 5px;
|
padding: 5px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.twistday-reminder .twister-user-info {
|
||||||
|
margin: 1.2% 0 -2.8% 0;
|
||||||
|
}
|
||||||
|
|
||||||
.twistday-reminder .twister-user-tag,
|
.twistday-reminder .twister-user-tag,
|
||||||
.twistday-reminder .twister-user-full {
|
.twistday-reminder .twister-user-full {
|
||||||
display: block;
|
display: block;
|
||||||
@ -1040,7 +1044,7 @@ textarea.splited-post {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.twistday-reminder .twisterday {
|
.twistday-reminder .twisterday {
|
||||||
font-size: 80%;
|
font-size: 11px;
|
||||||
margin-left: 11%;
|
margin-left: 11%;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2538,12 +2538,13 @@ ol.toptrends-list a:hover {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.twistday-reminder h3 {
|
.twistday-reminder h3 {
|
||||||
|
font-size: 0.98em;
|
||||||
float: left;
|
float: left;
|
||||||
}
|
}
|
||||||
|
|
||||||
.twistday-reminder h4 {
|
.twistday-reminder h4 {
|
||||||
margin: 1% 1% 1% 16%;
|
margin: 1% 1% 1% 16%;
|
||||||
font-size: 90%;
|
font-size: 0.84em;
|
||||||
color: rgba(0, 0, 0, 0.5);
|
color: rgba(0, 0, 0, 0.5);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -2551,9 +2552,14 @@ ol.toptrends-list a:hover {
|
|||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
.twistday-reminder .twister-user-info {
|
.twistday-reminder .current .label, .twistday-reminder .upcoming .label {
|
||||||
margin-top: 8px;
|
margin-right: 10%;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.twistday-reminder .twister-user-info {
|
||||||
|
margin-top: 1.2%;
|
||||||
|
}
|
||||||
|
|
||||||
.twistday-reminder .twister-user-tag,
|
.twistday-reminder .twister-user-tag,
|
||||||
.twistday-reminder .twister-user-full {
|
.twistday-reminder .twister-user-full {
|
||||||
display: block;
|
display: block;
|
||||||
@ -2566,7 +2572,7 @@ ol.toptrends-list a:hover {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.twistday-reminder .twisterday {
|
.twistday-reminder .twisterday {
|
||||||
font-size: 80%;
|
font-size: 0.8em;
|
||||||
margin-left: 8%;
|
margin-left: 8%;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -585,15 +585,18 @@ ol.toptrends-list
|
|||||||
small
|
small
|
||||||
display: none
|
display: none
|
||||||
h3
|
h3
|
||||||
|
font-size: 0.98em
|
||||||
float: left
|
float: left
|
||||||
h4
|
h4
|
||||||
margin: 1% 1% 1% 16%
|
margin: 1% 1% 1% 16%
|
||||||
font-size: 90%
|
font-size: 0.84em
|
||||||
color: rgba(0, 0, 0, 0.5)
|
color: rgba(0, 0, 0, 0.5)
|
||||||
a:hover
|
a:hover
|
||||||
text-decoration: none
|
text-decoration: none
|
||||||
|
.current .label, .upcoming .label
|
||||||
|
margin-right: 10%
|
||||||
.twister-user-info
|
.twister-user-info
|
||||||
margin-top: 8px
|
margin-top: 1.2%
|
||||||
.twister-user-tag, .twister-user-full
|
.twister-user-tag, .twister-user-full
|
||||||
display: block
|
display: block
|
||||||
margin: 0
|
margin: 0
|
||||||
@ -601,7 +604,7 @@ ol.toptrends-list
|
|||||||
img.twister-user-photo
|
img.twister-user-photo
|
||||||
margin: 0
|
margin: 0
|
||||||
.twisterday
|
.twisterday
|
||||||
font-size: 80%
|
font-size: 0.8em
|
||||||
margin-left: 8%
|
margin-left: 8%
|
||||||
&.hover
|
&.hover
|
||||||
cursor: pointer
|
cursor: pointer
|
||||||
|
Loading…
x
Reference in New Issue
Block a user