diff options
| author | Tim Zallmann <tzallmann@gitlab.com> | 2017-06-22 19:19:48 +0200 |
|---|---|---|
| committer | Tim Zallmann <tzallmann@gitlab.com> | 2017-06-22 19:19:48 +0200 |
| commit | bba08f7bbf901a50a30a7cf4119da19488307134 (patch) | |
| tree | e46b87a3984eb46c27bf6f379d327c6a0d693842 | |
| parent | 0add79e621dcb564fa9e737907e57bcc2af9974c (diff) | |
| download | gitlab-ce-33981-add-members-drop-down-doesn-t-separate-name-username.tar.gz | |
Added the User select classes that already exist for single users to the multi select so the use both the same33981-add-members-drop-down-doesn-t-separate-name-username
Updated to an 32px Avatar
| -rw-r--r-- | app/assets/javascripts/users_select.js | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/selects.scss | 10 |
2 files changed, 1 insertions, 11 deletions
diff --git a/app/assets/javascripts/users_select.js b/app/assets/javascripts/users_select.js index a7b332d7360..46efdcf4202 100644 --- a/app/assets/javascripts/users_select.js +++ b/app/assets/javascripts/users_select.js @@ -643,7 +643,7 @@ UsersSelect.prototype.formatResult = function(user) { } else { avatar = gon.default_avatar_url; } - return "<div class='user-result " + (!user.username ? 'no-username' : void 0) + "'> <div class='user-image'><img class='avatar avatar-inline s24' src='" + avatar + "'></div> <div class='user-name'>" + user.name + "</div> <div class='user-username'>" + ("@" + user.username || "") + "</div> </div>"; + return "<div class='user-result " + (!user.username ? 'no-username' : void 0) + "'> <div class='user-image'><img class='avatar avatar-inline s32' src='" + avatar + "'></div> <div class='user-name dropdown-menu-user-full-name'>" + user.name + "</div> <div class='user-username dropdown-menu-user-username'>" + ("@" + user.username || "") + "</div> </div>"; }; UsersSelect.prototype.formatSelection = function(user) { diff --git a/app/assets/stylesheets/framework/selects.scss b/app/assets/stylesheets/framework/selects.scss index 0dcf19cdb08..40e654f4838 100644 --- a/app/assets/stylesheets/framework/selects.scss +++ b/app/assets/stylesheets/framework/selects.scss @@ -240,7 +240,6 @@ .user-image { float: left; - margin: -2px 5px 0 0; } &.no-username { @@ -248,15 +247,6 @@ line-height: 24px; } } - - .user-name { - font-weight: bold; - display: inline-block; - } - - .user-username { - display: inline-block; - } } .namespace-result { |