summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2019-01-15 08:47:46 +0100
committerGitHub <noreply@github.com>2019-01-15 08:47:46 +0100
commit6ac66ea0a33d04b15265a323a56faf1608fcde0f (patch)
tree2b01297e6537df5ab86c672cfd5e7ab992374dac /apps
parent56ad07b85e614e3f1125f8da96241f1a1f9b797e (diff)
parente5c1049d04f75ad6d624bab1ebd5906332eafc1c (diff)
downloadnextcloud-server-6ac66ea0a33d04b15265a323a56faf1608fcde0f.tar.gz
nextcloud-server-6ac66ea0a33d04b15265a323a56faf1608fcde0f.zip
Merge pull request #12173 from nextcloud/filename-center
Ensure filename is possibly centered below file icons in grid view
Diffstat (limited to 'apps')
-rw-r--r--apps/files/css/files.scss38
1 files changed, 20 insertions, 18 deletions
diff --git a/apps/files/css/files.scss b/apps/files/css/files.scss
index 8ad255a34bf..2c36ba8009a 100644
--- a/apps/files/css/files.scss
+++ b/apps/files/css/files.scss
@@ -852,18 +852,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 */
@@ -877,6 +886,8 @@ table.dragshadow td.size {
margin-top: $grid-size - $grid-pad;
display: flex;
align-items: center;
+ position: absolute;
+ right: 0;
.action {
padding: $grid-pad;
@@ -886,17 +897,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 */