diff --git a/web/app/assets/javascripts/bandProfile.js b/web/app/assets/javascripts/bandProfile.js index 994ea1838..668154b78 100644 --- a/web/app/assets/javascripts/bandProfile.js +++ b/web/app/assets/javascripts/bandProfile.js @@ -404,9 +404,6 @@ rest.getBandMembers(bandId, false) .done(function(response) { bindMusicians(response, false); - if (isMember) { - bindPendingMembers(); - } }) .fail(function(xhr) { if(xhr.status >= 500) { @@ -437,7 +434,15 @@ } function bindMusicians(musicians, isPending) { - $('#band-profile-members').empty(); // for race conditions seen most often in testing + + if (!isPending && isMember) { + bindPendingMembers(); + } + + if(!isPending) { + $('#band-profile-members').empty(); // for race conditions seen most often in testing + } + $.each(musicians, function(index, musician) { var instrumentLogoHtml = ''; if ("instruments" in musician && musician.instruments != null) { diff --git a/web/app/assets/stylesheets/client/profile.css.scss b/web/app/assets/stylesheets/client/profile.css.scss index 2f481f330..932b7c797 100644 --- a/web/app/assets/stylesheets/client/profile.css.scss +++ b/web/app/assets/stylesheets/client/profile.css.scss @@ -49,6 +49,10 @@ .playable { display:block; } + + .band-actions { + margin-top:4px; + } } .profile-head { @@ -268,6 +272,7 @@ -moz-box-sizing: border-box; -ms-box-sizing: border-box; box-sizing:border-box; + padding-top:1px; .result-name { font-size: 12px; diff --git a/web/app/views/clients/_bandProfile.html.erb b/web/app/views/clients/_bandProfile.html.erb index 8b0f819ce..a39424347 100644 --- a/web/app/views/clients/_bandProfile.html.erb +++ b/web/app/views/clients/_bandProfile.html.erb @@ -14,7 +14,7 @@