diff options
Diffstat (limited to 'apps/files/css')
| -rw-r--r-- | apps/files/css/files.scss | 38 | ||||
| -rw-r--r-- | apps/files/css/upload.scss | 16 |
2 files changed, 30 insertions, 24 deletions
diff --git a/apps/files/css/files.scss b/apps/files/css/files.scss index 83a7abddd13..502f8ea1f73 100644 --- a/apps/files/css/files.scss +++ b/apps/files/css/files.scss @@ -857,18 +857,27 @@ table.dragshadow td.size { .nametext { display: flex; height: 44px; - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; margin-top: $grid-size - $grid-pad; - padding-right: 0; - text-align: right; + text-align: center; line-height: 44px; - padding-left: $grid-pad; // same as action icon right padding + padding: 0; .innernametext { display: inline-block; - max-width: 80px; + text-align: center; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + } + &:before { + content: ''; + flex: 1; + min-width: 14px; + } + &:after { + content: ''; + flex: 1; + min-width: 44px; } /* No space for extension in grid view */ @@ -882,6 +891,8 @@ table.dragshadow td.size { margin-top: $grid-size - $grid-pad; display: flex; align-items: center; + position: absolute; + right: 0; .action { padding: $grid-pad; @@ -891,17 +902,8 @@ table.dragshadow td.size { align-items: center; justify-content: center; - &.action-share.permanent.shared-style span { - /* Do not show "Shared" text next to icon as there is no space */ - &:not(.icon) { - display: none; - } - - /* If an avatar is present, show that instead of the icon */ - &.avatar { - display: inline-block; - position: absolute; - } + &.action.action-share.permanent { + display: none; } /* In "Deleted files", do not show "Restore" text next to icon as there is no space */ diff --git a/apps/files/css/upload.scss b/apps/files/css/upload.scss index 00c77100a23..17ccf04d783 100644 --- a/apps/files/css/upload.scss +++ b/apps/files/css/upload.scss @@ -38,6 +38,9 @@ margin-left: 3px; } #uploadprogressbar { + border-color: var(--color-border-dark); + border-radius: 18px 0 0 18px; + border-right: 0; position:relative; float: left; width: 200px; @@ -50,15 +53,15 @@ } } #uploadprogressbar .ui-progressbar-value.ui-widget-header.ui-corner-left { - height: 100%; - top: 0px; - left: 0px; + height: calc(100% + 2px); + top: -1px; + left: -1px; position: absolute; overflow: hidden; background-color: var(--color-primary); } #uploadprogressbar .label { - top: 6px; + top: 8px; opacity: 1; overflow: hidden; white-space: nowrap; @@ -81,8 +84,9 @@ display: none; } -#uploadprogressbar + stop { - font-size: 13px; +#uploadprogressbar + .stop { + border-top-left-radius: 0; + border-bottom-left-radius: 0; } .oc-dialog .fileexists { |