twisterarmy/twister-html
1
0
Fork 0
mirror of https://github.com/twisterarmy/twister-html.git synced 2025-01-13 08:27:51 +00:00
Code Issues Projects Releases Wiki Activity

fixing #122 and unfollow button position

Browse Source
This commit is contained in:
erqan 2014-04-11 18:47:26 +03:00
parent bcc51d9613
commit 58c8b47a44
5 changed files with 49 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
css/profile.css
View File

@ -59,7 +59,8 @@
}
.profile-card .direct-messages,
.profile-card .direct-messages-with-user,
.profile-card .follow
.profile-card .follow,
.profile-card .unfollow
{
display: block;
position: absolute;
@ -74,16 +75,25 @@
border: none;
transition: all .2s linear;
}
.profile-card .follow
.profile-card .follow,
.profile-card .unfollow
{
right: 135px;
}
.profile-card .unfollow
{
background-color: rgba( 0, 0, 0, .3 );
}
.profile-card .direct-messages:hover,
.profile-card .direct-messages-with-user:hover,
.profile-card .follow:hover
{
background: rgba( 0, 0, 0, .3 );
}
.profile-card .unfollow:hover
{
background: rgba( 0, 0, 0, .1 );
}
.profile-card.forEdition
{
margin: 0 auto;
@ -178,11 +188,6 @@
padding: 3px;
height: 90%;
}
.profile-modal .profile-bio,
{
min-height: 27px;
overflow-y: visible;
}
#msngrswr {
display: none;
margin-top: 20px;
@ -297,7 +302,8 @@
*/
.profile-modal .direct-messages,
.profile-modal .direct-messages-with-user,
.profile-modal .follow
.profile-modal .follow,
.profile-modal .unfollow
{
bottom: 10px;
}

7
css/style.css
View File

@ -74,6 +74,13 @@ h3
font-size: 14px;
color: rgba( 0, 0, 0, .5 );
}
.clearfix:before,
.clearfix:after
{
display: block;
content: "";
clear: both;
}
/*************************************
**************************** BUTTONS **
**************************************/

23
following.html
View File

@ -349,18 +349,27 @@
<img class="profile-card-photo" src="img/grayed_avatar_placeholder_24.png"/>
<h1 class="profile-name"></h1>
<h2 class="profile-screen-name">@<b></b></h2>
<div class="profile-contact">
<div>
<span class="profile-location"></span>
<a class="profile-url" rel="nofollow" target="_blank"></a>
</div>
<div class="profile-bio">
<div class="profile-bio"></div>
<div id="msngrswr">
<div id="toxbtnwr">
<a class="profile-tox"></a><a class="tox-ctc"></a>
</div>
<div id="bmbtnwr">
<a class="profile-bitmessage"></a><a class="bitmessage-ctc"></a>
</div>
</div>
</div>
<ul class="module profile-data">
<li><a href="#"><span class="posts-count">&nbsp;</span><span class="label">Posts</span></a></li>
<li><a href="#" class="open-following-modal"><span class="following-count">&nbsp;</span><span class="label">Following</span></a></li>
<li><a href="#"><span class="followers-count">&nbsp;</span><span class="label">Followers</span></a></li>
</ul>
<div class="clearfix">
<ul class="module profile-data">
<li><a href="#"><span class="posts-count">&nbsp;</span><span class="label">Posts</span></a></li>
<li><a href="#" class="open-following-modal"><span class="following-count">&nbsp;</span><span class="label">Following</span></a></li>
<li><a href="#"><span class="followers-count">&nbsp;</span><span class="label">Followers</span></a></li>
</ul>
</div>
<button class="follow" href="#">Follow</button>
<button class="direct-messages-with-user" href="#">Direct Messages</button>

18
home.html
View File

@ -373,8 +373,10 @@
<img class="profile-card-photo" src="img/grayed_avatar_placeholder_24.png"/>
<h1 class="profile-name"></h1>
<h2 class="profile-screen-name">@<b></b></h2>
<span class="profile-location"></span>
<a class="profile-url" rel="nofollow" target="_blank"></a>
<div>
<span class="profile-location"></span>
<a class="profile-url" rel="nofollow" target="_blank"></a>
</div>
<div class="profile-bio"></div>
<div id="msngrswr">
<div id="toxbtnwr">
@ -385,11 +387,13 @@
</div>
</div>
</div>
<ul class="module profile-data">
<li><a href="#"><span class="posts-count">&nbsp;</span><span class="label">Posts</span></a></li>
<li><a href="#" class="open-following-modal"><span class="following-count">&nbsp;</span><span class="label">Following</span></a></li>
<li><a href="#"><span class="followers-count">&nbsp;</span><span class="label">Followers</span></a></li>
</ul>
<div class="clearfix">
<ul class="module profile-data">
<li><a href="#"><span class="posts-count">&nbsp;</span><span class="label">Posts</span></a></li>
<li><a href="#" class="open-following-modal"><span class="following-count">&nbsp;</span><span class="label">Following</span></a></li>
<li><a href="#"><span class="followers-count">&nbsp;</span><span class="label">Followers</span></a></li>
</ul>
</div>
<button class="followButton follow" href="#">Follow</button>
<button class="direct-messages-with-user" href="#">Direct Messages</button>

2
js/interface_common.js
View File

@ -123,7 +123,7 @@ function openProfileModal(e)
//hed//add dinamic follow button in profile modal window
if(followingUsers.indexOf(username) != -1){
$('.profile-card button.followButton').first().removeClass('follow').addClass('profileUnfollow').text(polyglot.t('Unfollow')).on('click', function(){
$('.profile-card button.followButton').first().removeClass('follow').addClass('unfollow').text(polyglot.t('Unfollow')).on('click', function(){
unfollow(username);
});
};