fixing some UI issues

- overlaying issue of tox and bitmessage fields
- hovering 'retransmit' and 'reply' links at indented replies
This commit is contained in:
erqan 2014-05-19 13:25:41 +03:00
parent a23e7c97a6
commit 711e568c0a
8 changed files with 21 additions and 11 deletions

View File

@ -193,9 +193,10 @@
margin-top: 20px; margin-top: 20px;
height: 30px; height: 30px;
} }
#toxbtnwr, #bmbtnwr { .profile-extra-contact {
float: left; float: left;
display: none; display: none;
margin-right: 35px;
} }
.bitmessage-ctc, .tox-ctc { .bitmessage-ctc, .tox-ctc {
position: absolute; position: absolute;

View File

@ -1117,7 +1117,7 @@ ol.toptrends-list {
{ {
display: inline-block; display: inline-block;
} }
.post .sub-replies { .post-replies .sub-replies {
border-left: solid 3px #E34F42; border-left: solid 3px #E34F42;
margin-left: 2px; margin-left: 2px;
} }

View File

@ -359,10 +359,10 @@
</div> </div>
<div class="profile-bio"></div> <div class="profile-bio"></div>
<div id="msngrswr"> <div id="msngrswr">
<div id="toxbtnwr"> <div id="toxbtnwr" class="profile-extra-contact">
<a class="profile-tox"></a><a class="tox-ctc"></a> <a class="profile-tox"></a><a class="tox-ctc"></a>
</div> </div>
<div id="bmbtnwr"> <div id="bmbtnwr" class="profile-extra-contact">
<a class="profile-bitmessage"></a><a class="bitmessage-ctc"></a> <a class="profile-bitmessage"></a><a class="bitmessage-ctc"></a>
</div> </div>
</div> </div>

View File

@ -386,10 +386,10 @@
</div> </div>
<div class="profile-bio"></div> <div class="profile-bio"></div>
<div id="msngrswr"> <div id="msngrswr">
<div id="toxbtnwr"> <div id="toxbtnwr" class="profile-extra-contact">
<a class="profile-tox"></a><a class="tox-ctc"></a> <a class="profile-tox"></a><a class="tox-ctc"></a>
</div> </div>
<div id="bmbtnwr"> <div id="bmbtnwr" class="profile-extra-contact">
<a class="profile-bitmessage"></a><a class="bitmessage-ctc"></a> <a class="profile-bitmessage"></a><a class="bitmessage-ctc"></a>
</div> </div>
</div> </div>

View File

@ -375,10 +375,10 @@ var MAL = function()
} }
} else { } else {
var $replist = $('<ol class="sub-replies"></ol>'); var $replist = $('<ol class="sub-replies"></ol>');
var $newli = $('<li class="post open related"></li>'); var $newli = $('<li class="post-replies"></li>');
postLi.after($newli); postLi.after($newli);
$newli.append($replist); $newli.append($replist);
for (var i = 0; i < postsFromJson.length; i++) { for (var i = 0; i < postsFromJson.length && $.MAL.getExpandedPostsCount(postLi) < maxExpandPost; i++) {
var newStreamPost = postToElem(postsFromJson[i], "related"); var newStreamPost = postToElem(postsFromJson[i], "related");
newStreamPost.hide(); newStreamPost.hide();
$replist.prepend(newStreamPost); $replist.prepend(newStreamPost);
@ -388,6 +388,14 @@ var MAL = function()
} }
$.MAL.relatedPostLoaded(); $.MAL.relatedPostLoaded();
}; };
this.getExpandedPostsCount = function(postLi) {
if ($.hasOwnProperty('mobile')) {
return postLi.siblings().length;
} else {
return postLi.parents('.module.post.original.open').find('.post.related').length;
}
};
} }
jQuery.MAL = new MAL; jQuery.MAL = new MAL;

View File

@ -42,7 +42,7 @@ function requestRepliedBefore(postLi)
function requestRepliesAfter(postLi) function requestRepliesAfter(postLi)
{ {
if(postLi.parents('.module.post.original.open').find('.post.related').length >= maxExpandPost) if($.MAL.getExpandedPostsCount(postLi) >= maxExpandPost)
return; return;
var originalPost = postLi.find(".post-data"); var originalPost = postLi.find(".post-data");

View File

@ -257,9 +257,10 @@
margin-top: 20px; margin-top: 20px;
height: 30px; height: 30px;
} }
#toxbtnwr, #bmbtnwr { .profile-extra-contact {
float: left; float: left;
display: none; display: none;
margin-right: 35px;
} }
.bitmessage-ctc, .tox-ctc { .bitmessage-ctc, .tox-ctc {
position: absolute; position: absolute;

View File

@ -1449,7 +1449,7 @@ textarea.splited-post {
{ {
display: inline-block; display: inline-block;
} }
.post .sub-replies { .post-replies .sub-replies {
border-left: solid 3px #43464d; border-left: solid 3px #43464d;
margin-left: 2px; margin-left: 2px;
} }