diff options
| author | Julius Härtl <jus@bitgrid.net> | 2018-10-10 14:58:58 +0200 |
|---|---|---|
| committer | Julius Härtl <jus@bitgrid.net> | 2018-10-30 10:19:32 +0100 |
| commit | 6dde7e1183f0f5210b9d6de1e36ea7e15e58348b (patch) | |
| tree | 66fcd7099d8cf49898257e579ee6262e3c14f16a /core | |
| parent | c9e6a9963760403fe16c55e53937243563e9fa75 (diff) | |
| download | nextcloud-server-6dde7e1183f0f5210b9d6de1e36ea7e15e58348b.tar.gz nextcloud-server-6dde7e1183f0f5210b9d6de1e36ea7e15e58348b.zip | |
Improve share select list
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Diffstat (limited to 'core')
| -rw-r--r-- | core/css/jquery-ui-fixes.scss | 5 | ||||
| -rw-r--r-- | core/js/sharedialogview.js | 8 |
2 files changed, 12 insertions, 1 deletions
diff --git a/core/css/jquery-ui-fixes.scss b/core/css/jquery-ui-fixes.scss index e30beee44e5..729a6197376 100644 --- a/core/css/jquery-ui-fixes.scss +++ b/core/css/jquery-ui-fixes.scss @@ -171,9 +171,12 @@ &.ui-menu { padding: 0; .ui-menu-item a { + color: var(--color-text-lighter); + padding: 4px 4px 4px 14px; + &.ui-state-focus, &.ui-state-active { - font-weight: inherit; box-shadow: inset 4px 0 var(--color-primary); + color: var(--color-text); } } } diff --git a/core/js/sharedialogview.js b/core/js/sharedialogview.js index 9c648357e61..c8d9822d256 100644 --- a/core/js/sharedialogview.js +++ b/core/js/sharedialogview.js @@ -442,19 +442,26 @@ autocompleteRenderItem: function(ul, item) { + var icon = 'icon-user'; var text = item.label; if (item.value.shareType === OC.Share.SHARE_TYPE_GROUP) { text = t('core', '{sharee} (group)', { sharee: text }, undefined, { escape: false }); + icon = 'icon-contacts-dark'; } else if (item.value.shareType === OC.Share.SHARE_TYPE_REMOTE) { text = t('core', '{sharee} (remote)', {sharee: text}, undefined, {escape: false}); + icon = 'icon-shared'; } else if (item.value.shareType === OC.Share.SHARE_TYPE_REMOTE_GROUP) { text = t('core', '{sharee} (remote group)', { sharee: text }, undefined, { escape: false }); + icon = 'icon-shared'; } else if (item.value.shareType === OC.Share.SHARE_TYPE_EMAIL) { text = t('core', '{sharee} (email)', { sharee: text }, undefined, { escape: false }); + icon = 'icon-mail'; } else if (item.value.shareType === OC.Share.SHARE_TYPE_CIRCLE) { text = t('core', '{sharee} ({type}, {owner})', {sharee: text, type: item.value.circleInfo, owner: item.value.circleOwner}, undefined, {escape: false}); + icon = 'icon-circle'; } else if (item.value.shareType === OC.Share.SHARE_TYPE_ROOM) { text = t('core', '{sharee} (conversation)', { sharee: text }, undefined, { escape: false }); + icon = 'icon-talk'; } var insert = $("<div class='share-autocomplete-item'/>"); var avatar = $("<div class='avatardiv'></div>").appendTo(insert); @@ -468,6 +475,7 @@ .text(text) .appendTo(insert); insert.attr('title', item.value.shareWith); + insert.append('<span class="icon '+icon+'"></span>'); insert = $("<a>") .append(insert); return $("<li>") |