summaryrefslogtreecommitdiff
path: root/src/scaladoc/scala/tools/nsc/doc/html/page/Entity.scala
diff options
context:
space:
mode:
authorFelix Mulder <felix.mulder@gmail.com>2016-02-17 15:46:16 +0100
committerFelix Mulder <felix.mulder@gmail.com>2016-02-17 15:59:41 +0100
commit42ae3885c401656196fd8994d92e853b56e3fe98 (patch)
tree571e35643fde779cdb87686ed1106a50026e0ee6 /src/scaladoc/scala/tools/nsc/doc/html/page/Entity.scala
parent4e39a79e726eb2a499dd4948ef03e14b73f2e4e3 (diff)
downloadscala-42ae3885c401656196fd8994d92e853b56e3fe98.tar.gz
scala-42ae3885c401656196fd8994d92e853b56e3fe98.tar.bz2
scala-42ae3885c401656196fd8994d92e853b56e3fe98.zip
Replace UTF8 glyphs with the Material Typeface
This commit removes arrows and other symbols previously provided by UTF8-symbols. Instead it uses the Material Typeface that we've used for the search icon and graph symbols. review: @VladUreche, @lrytz
Diffstat (limited to 'src/scaladoc/scala/tools/nsc/doc/html/page/Entity.scala')
-rw-r--r--src/scaladoc/scala/tools/nsc/doc/html/page/Entity.scala29
1 files changed, 24 insertions, 5 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 556cc0a5a3..86251fe872 100644
--- a/src/scaladoc/scala/tools/nsc/doc/html/page/Entity.scala
+++ b/src/scaladoc/scala/tools/nsc/doc/html/page/Entity.scala
@@ -163,7 +163,13 @@ trait EntityPage extends HtmlPage {
<div id="mbrsel">
<div class='toggle'></div>
- <div id='memberfilter'><span class='input'><input id='mbrsel-input' placeholder='Filter members' type='text' accesskey='/'/></span><span class='clear'>✖</span></div>
+ <div id='memberfilter'>
+ <i class="material-icons arrow">&#xE037;</i>
+ <span class='input'>
+ <input id='mbrsel-input' placeholder='Filter members' type='text' accesskey='/'/>
+ </span>
+ <i class="clear material-icons">&#xE14C;</i>
+ </div>
<div id='filterby'>
<div id="order">
<span class="filtertype">Ordering</span>
@@ -540,7 +546,10 @@ trait EntityPage extends HtmlPage {
mbr match {
case nte: NonTemplateMemberEntity if nte.isUseCase =>
<div class="full-signature-block toggleContainer">
- <span class="toggle">Full Signature</span>
+ <span class="toggle">
+ <i class="material-icons">&#xE037;</i>
+ Full Signature
+ </span>
<div class="hiddenContent full-signature-usecase">{ signature(nte.useCaseOf.get,isSelf = true) }</div>
</div>
case _ => NodeSeq.Empty
@@ -682,7 +691,10 @@ trait EntityPage extends HtmlPage {
val linearization = mbr match {
case dtpl: DocTemplateEntity if isSelf && !isReduced && dtpl.linearizationTemplates.nonEmpty =>
<div class="toggleContainer block">
- <span class="toggle">Linear Supertypes</span>
+ <span class="toggle">
+ <i class="material-icons">&#xE037;</i>
+ Linear Supertypes
+ </span>
<div class="superTypes hiddenContent">{
typesToHtml(dtpl.linearizationTypes, hasLinks = true, sep = scala.xml.Text(", "))
}</div>
@@ -702,7 +714,10 @@ trait EntityPage extends HtmlPage {
transitive(dtpl)
if (subs.nonEmpty)
<div class="toggleContainer block">
- <span class="toggle">Known Subclasses</span>
+ <span class="toggle">
+ <i class="material-icons">&#xE037;</i>
+ Known Subclasses
+ </span>
<div class="subClasses hiddenContent">{
templatesToHtml(subs.toList.sorted(Entity.EntityOrdering), scala.xml.Text(", "))
}</div>
@@ -719,7 +734,10 @@ trait EntityPage extends HtmlPage {
val diagramSvg = generator.generate(diagram.get, tpl, this)
if (diagramSvg != NodeSeq.Empty) {
<div class="toggleContainer block diagram-container" id={ id + "-container"}>
- <span class="toggle diagram-link">{ description }</span>
+ <span class="toggle diagram-link">
+ <i class="material-icons">&#xE037;</i>
+ { description }
+ </span>
<div class="diagram" id={ id }>{ diagramSvg }</div>
<div id="diagram-controls" class="hiddenContent">
<button id="diagram-zoom-out" class="diagram-btn"><i class="material-icons">&#xE15B;</i></button>
@@ -773,6 +791,7 @@ trait EntityPage extends HtmlPage {
def inside(hasLinks: Boolean, nameLink: String = ""): NodeSeq =
<xml:group>
<span class="modifier_kind">
+ <i class="material-icons unfold-arrow">&#xE037;</i>
<span class="modifier">{ mbr.flags.map(flag => inlineToHtml(flag.text) ++ scala.xml.Text(" ")) }</span>
<span class="kind">{ kindToString(mbr) }</span>
</span>