Merge pull request #13276 from Sugaroverdose/fix_#11348

fix safari rename button positioning #11348
owncloud · Jan 18, 2015 · aff22b3 · aff22b3
2 parents 48126c3 + 141908b
commit aff22b3
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/apps/files/css/files.css b/apps/files/css/files.css
@@ -298,6 +298,10 @@ table td.filename .nametext {
 	max-width: 800px;
 	height: 100%;
 }
+/* IE8 text-overflow: ellipsis support */
+.ie8 table td.filename .nametext {
+	min-width: 50%;
+}
 .has-favorites #fileList td.filename a.name {
 	left: 50px;
 	margin-right: 50px;
@@ -308,6 +312,14 @@ table td.filename .nametext .innernametext {
 	overflow: hidden;
 	position: relative;
 	display: inline-block;
+	vertical-align: top;
+}
+/* IE8 text-overflow: ellipsis support */
+.ie8 table td.filename .nametext .innernametext {
+	white-space: nowrap;
+	word-wrap: normal;
+	-ms-text-overflow: ellipsis;
+	max-width: 47%;
 }
 
 @media only screen and (min-width: 1366px) {
@@ -520,9 +532,9 @@ a.action>img {
 
 #fileList a.action[data-action="Rename"] {
 	padding: 16px 14px 17px !important;
-	position: relative;
-	top: -21px;
 }
+
+.ie8 #fileList a.action img,
 #fileList tr:hover a.action,
 #fileList a.action.permanent,
 #fileList tr:focus a.action,
@@ -533,6 +545,7 @@ a.action>img {
 	opacity: .5;
 	display:inline;
 }
+.ie8 #fileList a.action:hover img,
 #fileList tr:hover a.action:hover,
 #fileList tr:focus a.action:focus,
 #fileList .name:focus a.action:focus {
@@ -627,4 +640,4 @@ table.dragshadow td.size {
 	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)";
 	filter: alpha(opacity=50);
 	opacity: .5;
-}
+}
diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js
@@ -247,8 +247,9 @@
 				html += '<img class="svg" alt="" src="' + img + '" />';
 			}
 			if (actionSpec.displayName) {
-				html += '<span> ' + actionSpec.displayName + '</span></a>';
+				html += '<span> ' + actionSpec.displayName + '</span>';
 			}
+			html += '</a>';
 
 			return $(html);
 		},