From 4d2ae71bf2bb6d5ac4179bcaca87a7ec13bb9d5f Mon Sep 17 00:00:00 2001 From: Sergei Shuykov Date: Mon, 12 Jan 2015 17:08:15 +0300 Subject: [PATCH 1/3] fix_#11348 Safari rename button positioning --- apps/files/css/files.css | 8 ++++---- apps/files/js/fileactions.js | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/apps/files/css/files.css b/apps/files/css/files.css index 5b947fa326..74227216bf 100644 --- a/apps/files/css/files.css +++ b/apps/files/css/files.css @@ -305,7 +305,6 @@ table td.filename .nametext .innernametext { text-overflow: ellipsis; overflow: hidden; position: relative; - display: inline-block; } @media only screen and (min-width: 1366px) { @@ -518,9 +517,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, @@ -531,6 +530,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 { @@ -625,4 +625,4 @@ table.dragshadow td.size { -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)"; filter: alpha(opacity=50); opacity: .5; -} \ No newline at end of file +} diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js index 9412e510a5..b335f1f643 100644 --- a/apps/files/js/fileactions.js +++ b/apps/files/js/fileactions.js @@ -247,8 +247,9 @@ html += ''; } if (actionSpec.displayName) { - html += ' ' + actionSpec.displayName + ''; + html += ' ' + actionSpec.displayName + ''; } + html += ''; return $(html); }, From b2879d3a994c2b1b64e0ddfa560da3a8814153d3 Mon Sep 17 00:00:00 2001 From: Sugaroverdose Date: Fri, 16 Jan 2015 23:36:35 +0300 Subject: [PATCH 2/3] use some magic to make 'popular browsers' work as expected with inline-block span --- apps/files/css/files.css | 2 ++ 1 file changed, 2 insertions(+) diff --git a/apps/files/css/files.css b/apps/files/css/files.css index 74227216bf..7c825c965a 100644 --- a/apps/files/css/files.css +++ b/apps/files/css/files.css @@ -305,6 +305,8 @@ table td.filename .nametext .innernametext { text-overflow: ellipsis; overflow: hidden; position: relative; + display: inline-block; + vertical-align: top; } @media only screen and (min-width: 1366px) { From 141908bd9ca84dea65be4bb4a953a91d76bd48eb Mon Sep 17 00:00:00 2001 From: Sugaroverdose Date: Sat, 17 Jan 2015 01:43:42 +0300 Subject: [PATCH 3/3] Add ie8 text-overflow: ellipsis support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit minimum browser window width ≈ 1280px --- apps/files/css/files.css | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/apps/files/css/files.css b/apps/files/css/files.css index 7c825c965a..45be6e8b3b 100644 --- a/apps/files/css/files.css +++ b/apps/files/css/files.css @@ -296,6 +296,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,13 @@ table td.filename .nametext .innernametext { 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) { table td.filename .nametext .innernametext {