Merge remote-tracking branch 'upstream/master' into fix_file_move

Signed-off-by: Tomasz Grobelny <tomasz@grobelny.net>

6 files changed, 42 insertions, 4 deletions

diff --git a/apps/files/css/detailsView.scss b/apps/files/css/detailsView.scss
index f64a3702850..71062648c97 100644
--- a/apps/files/css/detailsView.scss
+++ b/apps/files/css/detailsView.scss
@@ -15,7 +15,13 @@
 
 #app-sidebar .mainFileInfoView .permalink {
 	padding: 6px 10px;
-	vertical-align: text-top;
+	vertical-align: top;
+	opacity: .6;
+
+	&:hover,
+	&:focus {
+		opacity: 1;
+	}
 }
 #app-sidebar .mainFileInfoView .permalink-field>input {
 	clear: both;
@@ -87,7 +93,7 @@
 }
 
 #app-sidebar .fileName h3 {
-	width: calc(100% - 36px); /* 36px is the with of the copy link icon */
+	width: calc(100% - 42px); /* 36px is the with of the copy link icon, but this breaks so we add some more to be sure */
 	display: inline-block;
 	padding: 5px 0;
 	margin: -5px 0;
diff --git a/apps/files/css/files.scss b/apps/files/css/files.scss
index 4e0bc9c0160..d6f9bd6131e 100644
--- a/apps/files/css/files.scss
+++ b/apps/files/css/files.scss
@@ -8,7 +8,12 @@
 }
 
 /* FILE MENU */
-.actions { padding:5px; height:32px; display: inline-block; float: left; }
+.actions {
+	padding: 5px;
+	height: 100%;
+	display: inline-block;
+	float: left;
+}
 .actions input, .actions button, .actions .button { margin:0; float:left; }
 .actions .button a { color: #555; }
 .actions .button a:hover,
@@ -316,6 +321,7 @@ table td.filename .thumbnail {
 	background-size: 32px;
 	margin-left: 9px;
 	margin-top: 9px;
+	border-radius: var(--border-radius);
 	cursor: pointer;
 	position: absolute;
 	z-index: 4;
@@ -658,8 +664,14 @@ table.dragshadow td.size {
 	top: 100%;
 	margin-top: 4px;
 	min-width: 100px;
-	margin-left: 7px;
+	margin-left: 22px; /* Align left edge below center of + button … */
+	transform: translateX(-50%); /* … then center it below button */
 	z-index: 1001;
+
+	/* Center triangle */
+	&::after {
+		left: calc(50% - 8px) !important;
+	}
 }
 
 #filestable .filename .action .icon,
diff --git a/apps/files/js/detailsview.js b/apps/files/js/detailsview.js
index cd602961c0a..bac2a5ebd21 100644
--- a/apps/files/js/detailsview.js
+++ b/apps/files/js/detailsview.js
@@ -174,6 +174,9 @@
 			// hide other tabs
 			$tabsContainer.find('.tab').addClass('hidden');
 
+			$tabsContainer.attr('class', 'tabsContainer');
+			$tabsContainer.addClass(tabView.getTabsContainerExtraClasses());
+
 			// tab already rendered ?
 			if (!$tabEl.length) {
 				// render tab
diff --git a/apps/files/js/detailtabview.js b/apps/files/js/detailtabview.js
index a66cedbc15d..1e046f30246 100644
--- a/apps/files/js/detailtabview.js
+++ b/apps/files/js/detailtabview.js
@@ -41,6 +41,21 @@
 		},
 
 		/**
+		 * Returns the extra CSS classes used by the tabs container when this
+		 * tab is the selected one.
+		 *
+		 * In general you should not extend this method, as tabs should not
+		 * modify the classes of its container; this is reserved as a last
+		 * resort for very specific cases in which there is no other way to get
+		 * the proper style or behaviour.
+		 *
+		 * @return {String} space-separated CSS classes
+		 */
+		getTabsContainerExtraClasses: function() {
+			return '';
+		},
+
+		/**
 		 * Returns the tab label
 		 *
 		 * @return {String} label
diff --git a/apps/files/l10n/cs.js b/apps/files/l10n/cs.js
index cbd6c72d572..96b93d361e7 100644
--- a/apps/files/l10n/cs.js
+++ b/apps/files/l10n/cs.js
@@ -142,6 +142,7 @@ OC.L10N.register(
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer noopener\">access your Files via WebDAV</a>" : "Použijte tuto adresu pro <a href=\"%s\" target=\"_blank\" rel=\"noreferrer noopener\">přístup k vašim souborům přes WebDAV</a>",
     "Cancel upload" : "Zrušit nahrávání",
+    "Toggle grid view" : "Přepnout zobrazení mřížky",
     "No files in here" : "Žádné soubory",
     "Upload some content or sync with your devices!" : "Nahrajte nějaký obsah nebo synchronizujte se svými přístroji!",
     "No entries found in this folder" : "V této složce nebylo nic nalezeno",
diff --git a/apps/files/l10n/cs.json b/apps/files/l10n/cs.json
index a8f82c5c5d7..cb01165503d 100644
--- a/apps/files/l10n/cs.json
+++ b/apps/files/l10n/cs.json
@@ -140,6 +140,7 @@
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer noopener\">access your Files via WebDAV</a>" : "Použijte tuto adresu pro <a href=\"%s\" target=\"_blank\" rel=\"noreferrer noopener\">přístup k vašim souborům přes WebDAV</a>",
     "Cancel upload" : "Zrušit nahrávání",
+    "Toggle grid view" : "Přepnout zobrazení mřížky",
     "No files in here" : "Žádné soubory",
     "Upload some content or sync with your devices!" : "Nahrajte nějaký obsah nebo synchronizujte se svými přístroji!",
     "No entries found in this folder" : "V této složce nebylo nic nalezeno",