diff options
author | Adriaan Moors <adriaan@lightbend.com> | 2016-08-11 16:04:13 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-08-11 16:04:13 -0700 |
commit | 2a74683cb588d64e30be9fa66eb5f2b8027d3446 (patch) | |
tree | 08631cb37c179ade00238604143c3aaa41a9c58e | |
parent | 43d22678c251c183ca47e1bf99b41a55d74914b4 (diff) | |
parent | d4c2a091b2b6bdc02c0491d23db6aa933418672f (diff) | |
download | scala-2a74683cb588d64e30be9fa66eb5f2b8027d3446.tar.gz scala-2a74683cb588d64e30be9fa66eb5f2b8027d3446.tar.bz2 scala-2a74683cb588d64e30be9fa66eb5f2b8027d3446.zip |
Merge pull request #5329 from adriaanm/doc-version-was-too-long-begone
Remove doc-version was too long warning
-rw-r--r-- | src/scaladoc/scala/tools/nsc/doc/html/page/Entity.scala | 14 | ||||
-rw-r--r-- | src/scaladoc/scala/tools/nsc/doc/html/resource/lib/index.css | 9 |
2 files changed, 10 insertions, 13 deletions
diff --git a/src/scaladoc/scala/tools/nsc/doc/html/page/Entity.scala b/src/scaladoc/scala/tools/nsc/doc/html/page/Entity.scala index 9dd2c2184d..54bf42bbd5 100644 --- a/src/scaladoc/scala/tools/nsc/doc/html/page/Entity.scala +++ b/src/scaladoc/scala/tools/nsc/doc/html/page/Entity.scala @@ -154,19 +154,7 @@ trait EntityPage extends HtmlPage { def search = <div id="search"> - <span id="doc-title"> - {universe.settings.doctitle.value} - <span id="doc-version"> - { - val version = universe.settings.docversion.value - - if (version.length > "XX.XX.XX-XXX".length) { - docletReporter.summaryWarning(s"doc-version ($version) was too long to be displayed in the webview, and will be left out. The max length is: XX.XX.XX-XXX") - "" - } else version - } - </span> - </span> + <span id="doc-title">{universe.settings.doctitle.value}<span id="doc-version">{universe.settings.docversion.value}</span></span> <span class="close-results"><span class="left"><</span> Back</span> <div id="textfilter"> <span class="input"> diff --git a/src/scaladoc/scala/tools/nsc/doc/html/resource/lib/index.css b/src/scaladoc/scala/tools/nsc/doc/html/resource/lib/index.css index d805ccc1ac..b153113e60 100644 --- a/src/scaladoc/scala/tools/nsc/doc/html/resource/lib/index.css +++ b/src/scaladoc/scala/tools/nsc/doc/html/resource/lib/index.css @@ -167,6 +167,15 @@ textarea, input { outline: none; } color: #c2c2c2; font-weight: 100; font-size: 0.72em; + display: inline-block; + width: 12ex; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; +} + +#search > span#doc-title > span#doc-version:hover { + overflow: visible; } #search > span.toggle-sidebar:hover { |