Skip to content

Commit a889c0f

Browse files
authored
Merge pull request #37938 from nextcloud/feat/tags-files-inline
2 parents e8112ed + cab8a07 commit a889c0f

File tree

10 files changed

+180
-6
lines changed

10 files changed

+180
-6
lines changed

apps/files/css/files.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apps/files/css/files.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apps/files/css/files.scss

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -436,6 +436,41 @@ table {
436436
z-index: 10;
437437
padding: 0 20px 0 0;
438438
}
439+
440+
/* System tags */
441+
.system-tags {
442+
--min-size: 32px;
443+
display: flex;
444+
justify-content: center;
445+
align-items: center;
446+
flex: 1 1 100%;
447+
min-width: calc(var(--min-size) * 2);
448+
max-width: 300px;
449+
450+
.system-tags__tag {
451+
padding: 5px 10px;
452+
border: 1px solid;
453+
border-radius: var(--border-radius-pill);
454+
border-color: var(--color-border);
455+
color: var(--color-text-maxcontrast);
456+
height: var(--min-size);
457+
white-space: nowrap;
458+
overflow: hidden;
459+
text-overflow: ellipsis;
460+
line-height: 22px; // min-size - 2 * 5px padding
461+
text-align: center;
462+
463+
&--more {
464+
overflow: visible;
465+
text-overflow: initial;
466+
}
467+
468+
// Proper spacing if multiple shown
469+
& + .system-tags__tag {
470+
margin-left: 5px;
471+
}
472+
}
473+
}
439474
}
440475
}
441476

@@ -1111,6 +1146,11 @@ table.dragshadow td.size {
11111146
}
11121147
}
11131148

1149+
/* System tags */
1150+
.system-tags {
1151+
display: none;
1152+
}
1153+
11141154
.fileactions {
11151155
height: initial;
11161156
margin-top: $grid-size - $grid-pad;

apps/files/css/merged.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)