diff options
| author | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2017-12-13 11:51:54 +0100 |
|---|---|---|
| committer | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2017-12-20 13:48:09 +0100 |
| commit | 7a9e65ceed793604588399d4eaefa7908ad44379 (patch) | |
| tree | 76aa6d1119dd04ae28fdcd7e9d61a37e8cb6e84a /apps | |
| parent | dc8809e754c22addaab20401a7505dcc4082541c (diff) | |
| download | nextcloud-server-7a9e65ceed793604588399d4eaefa7908ad44379.tar.gz nextcloud-server-7a9e65ceed793604588399d4eaefa7908ad44379.zip | |
Fixed breadcrumbs calculation and actions flow
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/files/css/files.scss | 5 | ||||
| -rw-r--r-- | apps/files/js/breadcrumb.js | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/apps/files/css/files.scss b/apps/files/css/files.scss index 6135b1ceeca..a8dede66310 100644 --- a/apps/files/css/files.scss +++ b/apps/files/css/files.scss @@ -21,6 +21,11 @@ .actions.creatable { position: relative; z-index: -30; + display: flex; + flex: 1 1; + .button:not(:last-child) { + margin-right: 3px; + } } #trash { diff --git a/apps/files/js/breadcrumb.js b/apps/files/js/breadcrumb.js index 35aeb8d357d..20b15e3cb93 100644 --- a/apps/files/js/breadcrumb.js +++ b/apps/files/js/breadcrumb.js @@ -331,7 +331,7 @@ // Used for testing since this.$el.parent fails if (!this.availableWidth) { - this.usedWidth = this.$el.parent().width() - (this.$el.parent().find('.button').length + 1) * 44; + this.usedWidth = this.$el.parent().width() - this.$el.parent().find('.actions.creatable').width(); } else { this.usedWidth = this.availableWidth; } |