[scaladoc] Fix alignment of "Inherited" and "Vi...

[scaladoc] Fix alignment of "Inherited" and "Visibility" labels in the
page filter area. Review by dubochet.

2 files changed, 7 insertions, 6 deletions

diff --git a/src/compiler/scala/tools/nsc/doc/html/page/Template.scala b/src/compiler/scala/tools/nsc/doc/html/page/Template.scala
index 41a7de93bd..12d24a7953 100644
--- a/src/compiler/scala/tools/nsc/doc/html/page/Template.scala
+++ b/src/compiler/scala/tools/nsc/doc/html/page/Template.scala
@@ -60,13 +60,13 @@ class Template(tpl: DocTemplateEntity) extends HtmlPage {
         <div id="mbrsel">
           { if (tpl.linearization.isEmpty) NodeSeq.Empty else
               <div id="ancestors">
-                <h3>Inherited</h3>
+                <span class="filtertype">Inherited</span>
                 <ol><li class="hideall">Hide All</li><li class="showall">Show all</li></ol>
                 <ol id="linearization">{ tpl.linearization map { wte => <li class="in" name={ wte.qualifiedName }>{ wte.name }</li> } }</ol>
               </div>
           }
           <div id="visbl">
-            <h3>Visibility</h3>
+            <span class="filtertype">Visibility</span>
             <ol><li class="public in">Public</li><li class="all out">All</li></ol>
           </div>
         </div>
@@ -263,8 +263,7 @@ class Template(tpl: DocTemplateEntity) extends HtmlPage {
     }
 
   def kindToString(mbr: MemberEntity): String = mbr match {
-    case tpl: DocTemplateEntity =>
-      if (tpl.isPackage) "package" else if (tpl.isClass) "class" else if (tpl.isTrait) "trait" else "object"
+    case tpl: DocTemplateEntity => docEntityKindToString(tpl)
     case ctor: Constructor => "new"
     case tme: MemberEntity =>
       ( if (tme.isImplicit) "implicit " else "" ) +
diff --git a/src/compiler/scala/tools/nsc/doc/html/resource/lib/template.css b/src/compiler/scala/tools/nsc/doc/html/resource/lib/template.css
index f315a283b6..e4c3c610de 100644
--- a/src/compiler/scala/tools/nsc/doc/html/resource/lib/template.css
+++ b/src/compiler/scala/tools/nsc/doc/html/resource/lib/template.css
@@ -329,10 +329,12 @@ div.fullcomment dl.paramcmts > dd + dt + dd {
   margin-bottom: 10px;
 }
 
-#mbrsel > div > h3 {
+#mbrsel > div > span.filtertype {
   padding: 4px;
-  display: inline;
+  float: left;
+  display: inline-block;
   color: white;
+  width: 4.5em;
 }
 
 #mbrsel > div > ol {