diff --git a/css/profile.css b/css/profile.css index e337f4a..ed2e6c3 100644 --- a/css/profile.css +++ b/css/profile.css @@ -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; } diff --git a/css/style.css b/css/style.css index 2a2495c..7b214b6 100644 --- a/css/style.css +++ b/css/style.css @@ -74,6 +74,13 @@ h3 font-size: 14px; color: rgba( 0, 0, 0, .5 ); } +.clearfix:before, +.clearfix:after +{ + display: block; + content: ""; + clear: both; +} /************************************* **************************** BUTTONS ** **************************************/ diff --git a/following.html b/following.html index 94b528c..5d8ca0b 100644 --- a/following.html +++ b/following.html @@ -349,18 +349,27 @@

@

-
+
-
+
+
+
+ +
+
+ +
- +
+ +
diff --git a/home.html b/home.html index 27106f8..bcddc60 100644 --- a/home.html +++ b/home.html @@ -373,8 +373,10 @@

@

- - +
+ + +
@@ -385,11 +387,13 @@
- +
+ +
diff --git a/js/interface_common.js b/js/interface_common.js index b905424..e144d06 100644 --- a/js/interface_common.js +++ b/js/interface_common.js @@ -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); }); };