Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[stable12] Fix sharer name overlap with filename #6524

Merged
merged 2 commits into from
Sep 20, 2017
Merged

[stable12] Fix sharer name overlap with filename #6524

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
64dd1f6
Ellipsize sharer name, ref #6498
jancborchardt Sep 14, 2017
f987347
Correctly ellipsize file names, fix #6498
jancborchardt Sep 14, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions apps/files/css/files.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,6 +350,10 @@ table td.filename .nametext {
max-width: 800px;
height: 100%;
}
/* ellipsis on file names */
table td.filename .nametext .innernametext {
max-width: calc(100% - 100px) !important;
}
.has-favorites #fileList td.filename a.name {
left: 50px;
margin-right: 50px;
Expand Down Expand Up @@ -617,6 +621,16 @@ a.action > img {
opacity: .7;
}

// Ellipsize long sharer names
#fileList .action.action-share.permanent.shared-style span:not(.icon) {
display: inline-block;
max-width: 70px;
overflow: hidden;
text-overflow: ellipsis;
vertical-align: bottom;
padding-left: 6px;
}

#fileList .fileActionsMenu a.action:hover,
#fileList .fileActionsMenu a.action:focus,
/* show share action of shared items darker to distinguish from non-shared */
Expand Down
6 changes: 3 additions & 3 deletions apps/files/css/mobile.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ table td.filename .nametext {
margin-right: 6px;
}
/* hide text of the share action on mobile */
#fileList a.action-share span {
display: none;
#fileList a.action-share span:not(.icon) {
display: none !important;
}
#fileList a.action.action-favorite {
-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=70)" !important;
Expand All @@ -61,7 +61,7 @@ table td.filename .nametext {

/* ellipsis on file names */
table td.filename .nametext .innernametext {
max-width: calc(100% - 175px);
max-width: calc(100% - 175px) !important;
}

/* proper notification area for multi line messages */
Expand Down