diff --git a/apps/files/css/detailsView.css b/apps/files/css/detailsView.css
index 2ec16993ef53a..ec08a5d5a6f39 100644
--- a/apps/files/css/detailsView.css
+++ b/apps/files/css/detailsView.css
@@ -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;
diff --git a/apps/files/css/mobile.css b/apps/files/css/mobile.css
index 8e2ef23221d4f..c465f890ddac0 100644
--- a/apps/files/css/mobile.css
+++ b/apps/files/css/mobile.css
@@ -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;
}
/* proper notification area for multi line messages */
diff --git a/apps/files/js/mainfileinfodetailview.js b/apps/files/js/mainfileinfodetailview.js
index 20cedcf4e82f1..e9259f75ba1b5 100644
--- a/apps/files/js/mainfileinfodetailview.js
+++ b/apps/files/js/mainfileinfodetailview.js
@@ -15,7 +15,7 @@
'' +
@@ -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
diff --git a/apps/files_sharing/css/sharetabview.css b/apps/files_sharing/css/sharetabview.css
index 1de0cc7c75d9c..6ac6dff0a6634 100644
--- a/apps/files_sharing/css/sharetabview.css
+++ b/apps/files_sharing/css/sharetabview.css
@@ -2,7 +2,10 @@
min-height: 100px;
}
-.shareTabView .oneline { white-space: nowrap; }
+.shareTabView .oneline {
+ white-space: nowrap;
+ position: relative;
+}
.shareTabView .shareWithLoading {
padding-left: 10px;
@@ -12,7 +15,10 @@
.shareTabView .shareWithRemoteInfo,
.shareTabView .clipboardButton {
- padding-left: 10px;
+ position: absolute;
+ right: -7px;
+ top: -4px;
+ padding: 14px;
}
.shareTabView label {
@@ -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 {
@@ -54,16 +59,21 @@
}
#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 {
@@ -71,21 +81,23 @@
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 {
diff --git a/core/css/apps.css b/core/css/apps.css
index 440b188dc19f1..e7aad0676cdb1 100644
--- a/core/css/apps.css
+++ b/core/css/apps.css
@@ -632,7 +632,7 @@ em {
clear: left;
}
.tabsContainer .tab {
- padding: 15px;
+ padding: 0 15px 15px;
}
/* popover menu styles (use together with "bubble" class) */
diff --git a/core/css/icons.css b/core/css/icons.css
index 5e5f968a5bb05..7618491cf905f 100644
--- a/core/css/icons.css
+++ b/core/css/icons.css
@@ -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');
}
@@ -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');
-}
diff --git a/core/css/share.css b/core/css/share.css
index b2c47608933d9..bbd1ce7009174 100644
--- a/core/css/share.css
+++ b/core/css/share.css
@@ -82,8 +82,8 @@
}
#shareWithList .sharingOptionsGroup .popovermenu {
- right: -22px;
- top: 30px;
+ right: -14px;
+ top: 40px;
}
#shareWithList .shareOption {
diff --git a/core/img/actions/clippy.svg b/core/img/actions/clippy.svg
index 4a978a1beb28d..af496f39386c3 100644
--- a/core/img/actions/clippy.svg
+++ b/core/img/actions/clippy.svg
@@ -1 +1,4 @@
-
\ No newline at end of file
+
+
diff --git a/core/js/sharedialogshareelistview.js b/core/js/sharedialogshareelistview.js
index 3a72ab7266d78..96bbf94fa1cb1 100644
--- a/core/js/sharedialogshareelistview.js
+++ b/core/js/sharedialogshareelistview.js
@@ -78,7 +78,6 @@
'' +
'' +
'{{/unless}}' +
- '{{unshareLabel}}' +
'' +
'' +
'{{/each}}' +