diff --git a/media/css/seahub.css b/media/css/seahub.css index 4d752327e1..7a4c498c59 100644 --- a/media/css/seahub.css +++ b/media/css/seahub.css @@ -1829,7 +1829,6 @@ button.sf-dropdown-toggle:focus { } .select2-container .select2-selection .select2-selection__rendered { padding:0; - line-height:1.5; } .select2-container .select2-selection .select2-selection__choice { border:none; @@ -1837,7 +1836,7 @@ button.sf-dropdown-toggle:focus { border-radius:2px; margin:4px 0 0 5px; } -.select2-container .select2-search--inline .select2-search__field { +.select2-container--default .select2-search--inline .select2-search__field { padding:0 5px; min-width: 2em; /* make sure there is enough space */ } @@ -1848,6 +1847,9 @@ button.sf-dropdown-toggle:focus { display:inline-block; width:calc(100% - 42px); } +.select2-container .select2-selection__rendered { + line-height:1.5; +} /**** custom magnificPopup ****/ .mfp-bottom-bar { position:relative; diff --git a/static/scripts/common.js b/static/scripts/common.js index 6ccc6619d0..48ef5e44dc 100644 --- a/static/scripts/common.js +++ b/static/scripts/common.js @@ -759,12 +759,6 @@ define([ // format items shown in the drop-down menu templateResult: function(item) { - // show 'searching' tip - // item: {disabled: true, loading: true, text: "Searching..."} - if (item.loading) { - return item.text; - } - if (item.avatar_url) { return '' + _this.HTMLescape(item.name) + '
' + _this.HTMLescape(item.contact_email) + '
'; } else {