diff options
| author | Julius Härtl <jus@bitgrid.net> | 2018-08-15 14:46:45 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-15 14:46:45 +0200 |
| commit | f7ae4771c8b056c72dc0a68e0d62be7d2407c0d2 (patch) | |
| tree | 66810c1e866f5c95d1385d0d7542a52d0e463c2a /apps | |
| parent | 52995a017599e286aafc4ef55425cd55179eee3d (diff) | |
| parent | 0e23193b324f0dd62369bd48709809ed03bca02c (diff) | |
| download | nextcloud-server-f7ae4771c8b056c72dc0a68e0d62be7d2407c0d2.tar.gz nextcloud-server-f7ae4771c8b056c72dc0a68e0d62be7d2407c0d2.zip | |
Merge pull request #10691 from nextcloud/various-beta14-design-fixes
Various beta14 design fixes
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/files_sharing/css/sharetabview.scss | 6 | ||||
| -rw-r--r-- | apps/theming/css/settings-admin.scss | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/apps/files_sharing/css/sharetabview.scss b/apps/files_sharing/css/sharetabview.scss index 83790c9ec4f..61a310447d3 100644 --- a/apps/files_sharing/css/sharetabview.scss +++ b/apps/files_sharing/css/sharetabview.scss @@ -168,6 +168,7 @@ margin-left: auto; display: flex; align-items: center; + white-space: nowrap; // can edit label > .shareOption > label { padding: 13px; @@ -196,12 +197,15 @@ } .username { padding: 0 8px; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; } } .ui-autocomplete { /* limit dropdown height to 4 1/2 entries */ - max-height: 200px; + max-height: calc(36px * 4.5);; overflow-y: auto; overflow-x: hidden; z-index: 1550 !important; diff --git a/apps/theming/css/settings-admin.scss b/apps/theming/css/settings-admin.scss index c67d48d46fe..1915a953f4a 100644 --- a/apps/theming/css/settings-admin.scss +++ b/apps/theming/css/settings-admin.scss @@ -26,6 +26,8 @@ vertical-align: top; display: inline-block; visibility: hidden; + height: 32px; + width: 32px; } form.uploadButton { width: 411px; |