From 9e313bb2b32a88549799221cc031dcf73f2bf1bb Mon Sep 17 00:00:00 2001 From: Takeo Tamura Date: Thu, 7 Jan 2016 16:40:44 +0900 Subject: [PATCH] fix long file name text-overflow --- .../gitbucket/core/repo/files.scala.html | 40 ++++++++++--------- .../webapp/assets/common/css/gitbucket.css | 6 +++ 2 files changed, 27 insertions(+), 19 deletions(-) diff --git a/src/main/twirl/gitbucket/core/repo/files.scala.html b/src/main/twirl/gitbucket/core/repo/files.scala.html index f8b0885c6..d1b31cb6d 100644 --- a/src/main/twirl/gitbucket/core/repo/files.scala.html +++ b/src/main/twirl/gitbucket/core/repo/files.scala.html @@ -106,25 +106,27 @@ } - @if(file.isDirectory){ - @if(file.linkUrl.isDefined){ - - @file.name.split("/").toList.init match { - case Nil => {} - case list => {@list.mkString("", "/", "/")} - }@file.name.split("/").toList.last - - } else { - - @file.name.split("/").toList.init match { - case Nil => {} - case list => {@list.mkString("", "/", "/")} - }@file.name.split("/").toList.last - - } - } else { - @file.name - } + + @if(file.isDirectory){ + @if(file.linkUrl.isDefined){ + + @file.name.split("/").toList.init match { + case Nil => {} + case list => {@list.mkString("", "/", "/")} + }@file.name.split("/").toList.last + + } else { + + @file.name.split("/").toList.init match { + case Nil => {} + case list => {@list.mkString("", "/", "/")} + }@file.name.split("/").toList.last + + } + } else { + @file.name + } + @link(file.message, repository) diff --git a/src/main/webapp/assets/common/css/gitbucket.css b/src/main/webapp/assets/common/css/gitbucket.css index 5b13ac18d..52281d289 100644 --- a/src/main/webapp/assets/common/css/gitbucket.css +++ b/src/main/webapp/assets/common/css/gitbucket.css @@ -831,6 +831,12 @@ table.table-file-list .content-name { max-width: 180px; } +table.table-file-list .content-name .content-name-truncate { + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} + table.table-file-list .commit-message { max-width: 415px; display: inline-block;