From e7fc5f1753dce30a101ccecc60f0a69ebf25ae2e Mon Sep 17 00:00:00 2001
From: Shunsuke Tadokoro <shunsuke.tadokoro@bizreach.co.jp>
Date: Mon, 12 Dec 2016 21:08:05 +0900
Subject: [PATCH] (refs #1282) Fix text-ellipsis which does't work

---
 .../gitbucket/core/repo/files.scala.html      |  8 ++++----
 .../webapp/assets/common/css/gitbucket.css    | 20 +++++++++++++------
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/src/main/twirl/gitbucket/core/repo/files.scala.html b/src/main/twirl/gitbucket/core/repo/files.scala.html
index d76d5fc45..90219c893 100644
--- a/src/main/twirl/gitbucket/core/repo/files.scala.html
+++ b/src/main/twirl/gitbucket/core/repo/files.scala.html
@@ -143,7 +143,7 @@
           <i class="octicon octicon-file-text"></i>
         }
         </td>
-        <td class="content-name">
+        <td class="ellipsis-cell" style="width: 20%; min-width: 160px;">
           @if(file.isDirectory){
             @if(file.linkUrl.isDefined){
               <a href="@file.linkUrl">
@@ -164,10 +164,10 @@
             <a href="@helpers.url(repository)/blob@{(branch :: pathList).map(helpers.encodeRefName).mkString("/", "/", "/")}@{helpers.encodeRefName(file.name)}">@file.name</a>
           }
         </td>
-        <td class="mute">
-          <a href="@helpers.url(repository)/commit/@file.commitId" class="commit-message shorten-text" title="@file.message">@helpers.link(file.message, repository)</a>
+        <td class="ellipsis-cell" style="width: 70%;">
+          <a href="@helpers.url(repository)/commit/@file.commitId" class="commit-message" title="@file.message">@helpers.link(file.message, repository)</a>
         </td>
-        <td style="text-align: right;">@gitbucket.core.helper.html.datetimeago(file.time, false)</td>
+        <td style="width: 10%; min-width: 125px; text-align: right;">@gitbucket.core.helper.html.datetimeago(file.time, false)</td>
       </tr>
       }
     </table>
diff --git a/src/main/webapp/assets/common/css/gitbucket.css b/src/main/webapp/assets/common/css/gitbucket.css
index b9c738f47..6d09e9ec3 100644
--- a/src/main/webapp/assets/common/css/gitbucket.css
+++ b/src/main/webapp/assets/common/css/gitbucket.css
@@ -174,12 +174,6 @@ span.error {
   font-weight: normal;
 }
 
-.shorten-text {
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  overflow: hidden;
-}
-
 a.commit-message, a.commit-id, a.username, a.issue-comment-count {
   color: #333333;
 }
@@ -299,6 +293,20 @@ th.box-header .octicon {
   display: inline;
 }
 
+td.ellipsis-cell {
+  position: relative;
+}
+
+td.ellipsis-cell > * {
+  position: absolute;
+  left: 0;
+  right: 0;
+  padding-right: 5px;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  overflow: hidden;
+}
+
 img.avatar {
   border-radius: 4px;
   -webkit-border-radius: 4px;