haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-03 16:10:26 +00:00
Code Issues Releases Wiki Activity

Revert "[select2] show 'searching' tip"

Browse Source 
This reverts commit 7daec7d742.
This commit is contained in:
lian
2018-08-03 16:05:20 +08:00
parent 4d8b1156e1
commit 57e2cef98b
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
media/css/seahub.css
View File

@@ -1829,7 +1829,6 @@ button.sf-dropdown-toggle:focus {
} }
.select2-container .select2-selection .select2-selection__rendered { .select2-container .select2-selection .select2-selection__rendered {
padding:0; padding:0;
line-height:1.5;
} }
.select2-container .select2-selection .select2-selection__choice { .select2-container .select2-selection .select2-selection__choice {
border:none; border:none;
@@ -1837,7 +1836,7 @@ button.sf-dropdown-toggle:focus {
border-radius:2px; border-radius:2px;
margin:4px 0 0 5px; 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; padding:0 5px;
min-width: 2em; /* make sure there is enough space */ min-width: 2em; /* make sure there is enough space */
} }
@@ -1848,6 +1847,9 @@ button.sf-dropdown-toggle:focus {
display:inline-block; display:inline-block;
width:calc(100% - 42px); width:calc(100% - 42px);
} }
.select2-container .select2-selection__rendered {
line-height:1.5;
}
/**** custom magnificPopup ****/ /**** custom magnificPopup ****/
.mfp-bottom-bar { .mfp-bottom-bar {
position:relative; position:relative;

6
static/scripts/common.js
View File

@@ -759,12 +759,6 @@ define([
// format items shown in the drop-down menu // format items shown in the drop-down menu
templateResult: function(item) { templateResult: function(item) {
// show 'searching' tip
// item: {disabled: true, loading: true, text: "Searching..."}
if (item.loading) {
return item.text;
}
if (item.avatar_url) { if (item.avatar_url) {
return '<img src="' + item.avatar_url + '" width="32" height="32" class="avatar vam"><span class="text ellipsis vam">' + _this.HTMLescape(item.name) + '<br />' + _this.HTMLescape(item.contact_email) + '</span>'; return '<img src="' + item.avatar_url + '" width="32" height="32" class="avatar vam"><span class="text ellipsis vam">' + _this.HTMLescape(item.name) + '<br />' + _this.HTMLescape(item.contact_email) + '</span>';
} else { } else {