From d6a39403e28d6c65ebf0e89d1e4e950d9531ee3f Mon Sep 17 00:00:00 2001 From: Naoki Takezoe Date: Sat, 16 Jan 2016 14:18:03 +0900 Subject: [PATCH] (refs #1035)Fixup --- .../gitbucket/core/repo/files.scala.html | 36 +++++++++---------- .../webapp/assets/common/css/gitbucket.css | 5 --- 2 files changed, 17 insertions(+), 24 deletions(-) diff --git a/src/main/twirl/gitbucket/core/repo/files.scala.html b/src/main/twirl/gitbucket/core/repo/files.scala.html index d1b31cb6d..235cc2c77 100644 --- a/src/main/twirl/gitbucket/core/repo/files.scala.html +++ b/src/main/twirl/gitbucket/core/repo/files.scala.html @@ -106,27 +106,25 @@ } - - @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 - - } + @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 + + @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 5b33e1a37..4215dea4f 100644 --- a/src/main/webapp/assets/common/css/gitbucket.css +++ b/src/main/webapp/assets/common/css/gitbucket.css @@ -829,11 +829,6 @@ table.table-file-list .file-icon { table.table-file-list .content-name { max-width: 180px; -} - -table.table-file-list .content-name .content-name-truncate { - display: inline-block; - max-width: 100%; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;