Unclutter scaladoc entity members

This commit attempts to fix some minor annoyances regarding the UI when
it comes to how things are shown. I.e. the complete definition is now
hidden. Long signatures like:

```scala
class HashMap[A, +B] extends AbstractMap[A, B] with Map[A, B] with
MapLike[A, B, HashMap[A, B]] with Serializable with
CustomParallelizable[(A, B), ParHashMap[A, B]]
```

will be reduced to: `class HashMap[A, +B]`. Full signature will be shown
on hover and unfold.

The package-view has been tweaked to look better on non-HiDPI displays.
Also, subpackages to current package are now displayed before other
entities.

1 files changed, 5 insertions, 11 deletions

diff --git a/src/scaladoc/scala/tools/nsc/doc/html/HtmlPage.scala b/src/scaladoc/scala/tools/nsc/doc/html/HtmlPage.scala
index 0eb90d8942..038d85b7a8 100644
--- a/src/scaladoc/scala/tools/nsc/doc/html/HtmlPage.scala
+++ b/src/scaladoc/scala/tools/nsc/doc/html/HtmlPage.scala
@@ -246,8 +246,8 @@ abstract class HtmlPage extends Page { thisPage =>
 
   def permalink(template: Entity, isSelf: Boolean = true): Elem =
     <span class="permalink">
-      <a href={ memberToUrl(template, isSelf) } title="Permalink" target="_top">
-        <img src={ relativeLinkTo(List("permalink.svg", "lib")) } alt="Permalink" />
+      <a href={ memberToUrl(template, isSelf) } title="Permalink">
+        <i class="material-icons">&#xE157;</i>
       </a>
     </span>
 
@@ -263,7 +263,7 @@ abstract class HtmlPage extends Page { thisPage =>
 	  case None => baseString
 	}
 
-  def companionAndPackage(tpl: DocTemplateEntity): Elem =
+  def companionAndPackage(tpl: DocTemplateEntity): NodeSeq =
     <span class="morelinks">{
       tpl.companion match {
         case Some(companionTpl) =>
@@ -272,15 +272,9 @@ abstract class HtmlPage extends Page { thisPage =>
             else if (companionTpl.isTrait) s"trait ${companionTpl.name}"
             else s"class ${companionTpl.name}"
           <div>
-            Related Docs:
-            <a href={relativeLinkTo(tpl.companion.get)} title={docEntityKindToCompanionTitle(tpl)}>{objClassTrait}</a>
-            <span class="divider">|</span>
-            {templateToHtml(tpl.inTemplate, s"package ${tpl.inTemplate.name}")}
-          </div>
-        case None =>
-          <div>Related Doc:
-            {templateToHtml(tpl.inTemplate, s"package ${tpl.inTemplate.name}")}
+            Companion <a href={relativeLinkTo(companionTpl)} title={docEntityKindToCompanionTitle(tpl)}>{objClassTrait}</a>
           </div>
+        case None => NodeSeq.Empty
       }
     }</span>