summaryrefslogtreecommitdiffstats
path: root/apps/files_sharing
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@users.noreply.github.com>2018-10-30 19:27:05 +0100
committerGitHub <noreply@github.com>2018-10-30 19:27:05 +0100
commit41ff001b77abbf29d8341d2b4d5647bb92632f11 (patch)
tree2b77af83a4c84a5525555aeae4bf86a0b90daa19 /apps/files_sharing
parent514185820e1e1ad1a82648eb3c927552357e0f5f (diff)
parentffc32222f1686d520c0d27a482f45d1c258c64de (diff)
downloadnextcloud-server-41ff001b77abbf29d8341d2b4d5647bb92632f11.tar.gz
nextcloud-server-41ff001b77abbf29d8341d2b4d5647bb92632f11.zip
Merge pull request #11899 from nextcloud/enhancement/noid/sharing-consolidation
Sharing user consolidation
Diffstat (limited to 'apps/files_sharing')
-rw-r--r--apps/files_sharing/css/sharetabview.scss29
1 files changed, 27 insertions, 2 deletions
diff --git a/apps/files_sharing/css/sharetabview.scss b/apps/files_sharing/css/sharetabview.scss
index 14be9562228..0d277c58bd7 100644
--- a/apps/files_sharing/css/sharetabview.scss
+++ b/apps/files_sharing/css/sharetabview.scss
@@ -4,6 +4,10 @@
.share-autocomplete-item {
display: flex;
+
+ &.merged {
+ margin-left: 32px;
+ }
.autocomplete-item-text {
margin-left: 10px;
margin-right: 10px;
@@ -12,6 +16,27 @@
overflow: hidden;
line-height: 32px;
vertical-align: middle;
+ flex-grow: 1;
+ .ui-state-highlight {
+ border: none;
+ margin: 0;
+ }
+ }
+ &.with-description {
+ .autocomplete-item-text {
+ line-height: 100%;
+ }
+ }
+ .autocomplete-item-details {
+ display: block;
+ line-height: 130%;
+ font-size: 90%;
+ opacity: 0.7;
+ }
+
+ .icon {
+ opacity: .7;
+ margin-right: 7px;
}
}
@@ -204,8 +229,8 @@
}
.ui-autocomplete {
- /* limit dropdown height to 4 1/2 entries */
- max-height: calc(36px * 4.5);;
+ /* limit dropdown height to 6 1/2 entries */
+ max-height: calc(36px * 6.5);
overflow-y: auto;
overflow-x: hidden;
z-index: 1550 !important;