diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/css/inputs.css | 7 | ||||
| -rw-r--r-- | core/js/sharedialogview.js | 12 |
2 files changed, 6 insertions, 13 deletions
diff --git a/core/css/inputs.css b/core/css/inputs.css index 3d74ff38271..f2233395658 100644 --- a/core/css/inputs.css +++ b/core/css/inputs.css @@ -243,8 +243,8 @@ select:hover { #select2-drop .select2-search input { width: calc(100% - 14px); min-height: auto; - background: url('../img/actions/search.svg') no-repeat right center; - background-origin: content-box; + background: url('../img/actions/search.svg') no-repeat right center !important; + background-origin: content-box !important; } #select2-drop .select2-results { max-height: 250px; @@ -252,7 +252,6 @@ select:hover { padding: 0; } #select2-drop .select2-results .select2-result-label { - padding: 12px !important; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; @@ -340,7 +339,7 @@ select:hover { border: none; } .select2-container .select2-choice .select2-arrow b { - background: url('../img/actions/triangle-s.svg') no-repeat center; + background: url('../img/actions/triangle-s.svg') no-repeat center !important; opacity: .5; } .select2-container .select2-choice:hover .select2-arrow b, diff --git a/core/js/sharedialogview.js b/core/js/sharedialogview.js index 6377d16dd4c..f83a2675958 100644 --- a/core/js/sharedialogview.js +++ b/core/js/sharedialogview.js @@ -265,17 +265,11 @@ var text = item.label; if (item.value.shareType === OC.Share.SHARE_TYPE_GROUP) { - text = t('core', '{sharee} (group)', { - sharee: text - }); + text = t('core', '{sharee} (group)', { sharee: text }, undefined, { escape: false }); } else if (item.value.shareType === OC.Share.SHARE_TYPE_REMOTE) { - text = t('core', '{sharee} (remote)', { - sharee: text - }); + text = t('core', '{sharee} (remote)', { sharee: text }, undefined, { escape: false }); } else if (item.value.shareType === OC.Share.SHARE_TYPE_EMAIL) { - text = t('core', '{sharee} (email)', { - sharee: text - }); + text = t('core', '{sharee} (email)', { sharee: text }, undefined, { escape: false }); } var insert = $("<div class='share-autocomplete-item'/>"); var avatar = $("<div class='avatardiv'></div>").appendTo(insert); |