Skip to content

Sharing layout fixes #2136

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

Merged
jancborchardt merged 6 commits into from
Nov 17, 2016
Merged

Sharing layout fixes #2136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
64be760
remove Unshare icon in list
jancborchardt Nov 15, 2016
5eab1cd
fix layout of sharing list
jancborchardt Nov 15, 2016
88865e9
properly align input box items in share tab view
jancborchardt Nov 17, 2016
cf78942
fix spacing in sidebar tabs
jancborchardt Nov 17, 2016
9f5d019
resize and pixel-perfectly align copy icon
jancborchardt Nov 17, 2016
a32c781
use copy icon for local link rather than link icon to prevent confusi…
jancborchardt Nov 17, 2016
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
4 changes: 2 additions & 2 deletions apps/files/css/detailsView.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
}

#app-sidebar .mainFileInfoView .permalink {
margin-left: 10px;
opacity: .5;
padding: 6px 10px;
vertical-align: text-top;
}
#app-sidebar .mainFileInfoView .permalink-field>input {
clear: both;
Expand Down
4 changes: 2 additions & 2 deletions apps/files/css/mobile.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,9 @@ table td.filename .nametext .innernametext {
max-width: 50%;
}

/* ellipsis on user names in share sidebar */
/* ellipsis on user names in share sidebar, less on mobile */
#shareWithList .username {
max-width: 80px !important;
max-width: 80px !important;
Copy link
Member

@MorrisJobke MorrisJobke Nov 17, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is still not used, because the one in sharetabview.css also has the !important

}

/* proper notification area for multi line messages */
Expand Down
4 changes: 2 additions & 2 deletions apps/files/js/mainfileinfodetailview.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
'<div class="fileName">' +
'<h3 title="{{name}}" class="ellipsis">{{name}}</h3>' +
'<a class="permalink" href="{{permalink}}" title="{{permalinkTitle}}">' +
'<span class="icon icon-public"></span>' +
'<span class="icon icon-clippy"></span>' +
'<span class="hidden-visually">{{permalinkTitle}}</span>' +
'</a>' +
'</div>' +
Expand Down Expand Up @@ -157,7 +157,7 @@
starAltText: isFavorite ? t('files', 'Favorited') : t('files', 'Favorite'),
starIcon: OC.imagePath('core', isFavorite ? 'actions/starred' : 'actions/star'),
permalink: this._makePermalink(this.model.get('id')),
permalinkTitle: t('files', 'Local link')
permalinkTitle: t('files', 'Copy local link')
}));

// TODO: we really need OC.Previews
Expand Down
48 changes: 30 additions & 18 deletions apps/files_sharing/css/sharetabview.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@
min-height: 100px;
}

.shareTabView .oneline { white-space: nowrap; }
.shareTabView .oneline {
white-space: nowrap;
position: relative;
}

.shareTabView .shareWithLoading {
padding-left: 10px;
Expand All @@ -12,7 +15,10 @@

.shareTabView .shareWithRemoteInfo,
.shareTabView .clipboardButton {
padding-left: 10px;
position: absolute;
right: -7px;
top: -4px;
padding: 14px;
}

.shareTabView label {
Expand All @@ -24,15 +30,14 @@
vertical-align: middle;
}

.shareTabView input[type="text"],
.shareTabView input[type="password"] {
width: 94%;
margin-left: 0;
}
.shareTabView input[type="text"].shareWithField,
.shareTabView input[type="text"].emailField,
.shareTabView input[type="text"].linkText {
width: 80%;
.shareTabView input[type="text"].linkText,
.shareTabView input[type="password"] {
width: 100%;
box-sizing: border-box;
padding-right: 32px;
text-overflow: ellipsis;
}

.shareTabView form {
Expand All @@ -54,38 +59,45 @@
}

#shareWithList .unshare img, #shareWithList .showCruds img {
vertical-align:text-bottom; /* properly align icons */
vertical-align: text-bottom; /* properly align icons */
}

#shareWithList .sharingOptionsGroup .icon-more,
#shareWithList .unshare .icon-delete {
vertical-align: sub;
#shareWithList .sharingOptionsGroup .icon-more {
padding: 7px;
vertical-align: middle;
opacity: .5;
}

#shareWithList .unshare {
padding: 0;
padding: 4px;
vertical-align: text-bottom;
}
#shareWithList .unshare .icon {
vertical-align: text-top;
}

#shareWithList .unshare .icon-delete {
padding-right: 4px;
background-position-x: 0;
}

#shareWithList label input[type=checkbox]{
#shareWithList label input[type=checkbox] {
margin-left: 0;
position: relative;
}
#shareWithList .username{
#shareWithList .username {
padding-right: 8px;
white-space: nowrap;
text-overflow: ellipsis;
max-width: 254px;
max-width: 110px;
display: inline-block;
overflow: hidden;
vertical-align: middle;
}
#shareWithList li label{
#shareWithList li label {
padding: 6px;
margin-right: 8px;
vertical-align: text-top;
}

.shareTabView .icon-loading-small {
Expand Down
2 changes: 1 addition & 1 deletion core/css/apps.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -632,7 +632,7 @@ em {
clear: left;
}
.tabsContainer .tab {
padding: 15px;
padding: 0 15px 15px;
}

/* popover menu styles (use together with "bubble" class) */
Expand Down
8 changes: 4 additions & 4 deletions core/css/icons.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,10 @@ img.icon-loading-small-dark, object.icon-loading-small-dark, video.icon-loading-
background-image: url('../img/actions/checkmark-color.svg?v=1');
}

.icon-clippy {
background-image: url('../img/actions/clippy.svg?v=2');
}

.icon-close {
background-image: url('../img/actions/close.svg?v=1');
}
Expand Down Expand Up @@ -422,7 +426,3 @@ img.icon-loading-small-dark, object.icon-loading-small-dark, video.icon-loading-
.icon-picture {
background-image: url('../img/places/picture.svg?v=1');
}

.icon-clippy {
background-image: url('../img/actions/clippy.svg?v=1');
}
4 changes: 2 additions & 2 deletions core/css/share.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,8 @@
}

#shareWithList .sharingOptionsGroup .popovermenu {
right: -22px;
top: 30px;
right: -14px;
top: 40px;
}

#shareWithList .shareOption {
Expand Down
5 changes: 4 additions & 1 deletion core/img/actions/clippy.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 0 additions & 1 deletion core/js/sharedialogshareelistview.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,6 @@
'</ul>' +
'</div>' +
'{{/unless}}' +
'<a href="#" class="unshare"><span class="icon-loading-small hidden"></span><span class="icon icon-delete"></span><span class="hidden-visually">{{unshareLabel}}</span></a>' +
'</span>' +
'</li>' +
'{{/each}}' +
Expand Down