diff options
author | Felix Mulder <felix.mulder@gmail.com> | 2017-01-23 11:15:56 +0100 |
---|---|---|
committer | Felix Mulder <felix.mulder@gmail.com> | 2017-01-31 14:32:40 +0100 |
commit | c3b463a04141e67ee8559c8b422c0229a1a6351b (patch) | |
tree | 0a4809614058df75f307482922b433d8cdae39cf /doc-tool | |
parent | fda992e84db55c4f769cd7e4407e863c76a44b06 (diff) | |
download | dotty-c3b463a04141e67ee8559c8b422c0229a1a6351b.tar.gz dotty-c3b463a04141e67ee8559c8b422c0229a1a6351b.tar.bz2 dotty-c3b463a04141e67ee8559c8b422c0229a1a6351b.zip |
Add links for companions in toc
Diffstat (limited to 'doc-tool')
-rw-r--r-- | doc-tool/resources/_includes/toc.html | 2 | ||||
-rw-r--r-- | doc-tool/resources/_layouts/doc.html | 12 | ||||
-rw-r--r-- | doc-tool/resources/css/dottydoc.css | 82 |
3 files changed, 87 insertions, 9 deletions
diff --git a/doc-tool/resources/_includes/toc.html b/doc-tool/resources/_includes/toc.html index bfe275f8b..0ff3f9586 100644 --- a/doc-tool/resources/_includes/toc.html +++ b/doc-tool/resources/_includes/toc.html @@ -1,6 +1,6 @@ {% assign parent = page.path | first %} <ul class="toc"> - <li> + <li class="logo-li"> <a id="home-button" href="{{ site.baseurl }}/index.html"> {% include "scala-logo.svg" %} </a> diff --git a/doc-tool/resources/_layouts/doc.html b/doc-tool/resources/_layouts/doc.html index b6c9a7053..b3947c884 100644 --- a/doc-tool/resources/_layouts/doc.html +++ b/doc-tool/resources/_layouts/doc.html @@ -13,13 +13,19 @@ layout: main {% endif %} {% for pkg in docs %} <li class="index-entity entity-package"> - <a href="{{ site.baseurl }}/api/{{ pkg.path | join: "/" }}/index.html">{{ pkg.name }}</a> + <a class="entity-name" href="{{ site.baseurl }}/api/{{ pkg.path | join: "/" }}/index.html">{{ pkg.name }}</a> </li> {% for member in pkg.children %} {% if member.kind == "object" and member.hasCompanion %} {% elsif member.kind != "package" %} - <li class="index-entity"> - <a href="{{ site.baseurl }}/api/{{ member.path | join: "/" }}.html">{{ member.kind }} {{ member.name }}</a> + <li class="index-entity {% if member.hasCompanion %} with-companion {% endif %}"> + <div class="entity-kinds"> + {% if member.hasCompanion %} + <a class="letter-anchor object" href="{{ site.baseurl }}/api/{{ member.companionPath | join: "/" }}.html">O</a> + {% endif %} + <a class="letter-anchor {{ member.kind }}" href="{{ site.baseurl }}/api/{{ member.path | join: "/" }}.html">{{ member.kind | first | capitalize }}</a> + </div> + <a class="entity-name" href="{{ site.baseurl }}/api/{{ member.path | join: "/" }}.html">{{ member.name }}</a> </li> {% endif %} {% endfor %} diff --git a/doc-tool/resources/css/dottydoc.css b/doc-tool/resources/css/dottydoc.css index 6551950ca..bb0d6506b 100644 --- a/doc-tool/resources/css/dottydoc.css +++ b/doc-tool/resources/css/dottydoc.css @@ -58,10 +58,17 @@ ul.toc { padding-left: 0; } +ul.toc > li:hover { + background-color: transparent; +} + +ul.toc > li.toc-title { + margin-top: 1rem; +} + ul.toc > li.toc-title > a { font-size: 16px; font-weight: bold; - margin-top: 1rem; } ul.toc > li > a#home-button, @@ -78,24 +85,84 @@ ul.toc > li > a#home-button svg g#logo-background { fill: rgba(202, 68, 94, 0.45); } +ul.toc > li > a.toggle-children { + width: 100%; + user-select: none; +} + ul.toc > li, ul.index-entities > li { line-height: 40px; + display: inline-block; + width: 100%; +} + +ul.index-entities > li.index-entity:not(.entity-package) { + width: calc(100% + 40px); + transition: all 0.2s ease; + margin-left: -40px; } -li.index-entity.entity-package > a { +ul.index-entities > li.index-entity.with-companion { + width: calc(100% + 80px); + margin-left: -80px; +} + +ul.index-entities > li.index-entity:hover { + margin-left: 0; +} + +ul.toc > li.logo-li > a { + margin: 0; + padding: 0; + float: none; +} + +li.index-entity.entity-package > a.entity-name { color: #ff4081; text-decoration: none; } ul.toc > li > a, -ul.index-entities > li > a { +ul.index-entities > li > a.entity-name { font-size: 13px; display: block; - padding: 0 24px; + padding: 0 0 0 24px; color: rgba(0,0,0,.87); background: transparent; cursor: pointer; + float: left; +} + +ul.index-entities > li > div.entity-kinds { + float: left; +} + +ul.index-entities > li > div.entity-kinds > a.letter-anchor { + float: left; + width: 40px; + height: 40px; + color: white; + display: block; + text-align: center; + text-decoration: none; +} + +ul.index-entities > li > div.entity-kinds > a.letter-anchor:focus, +ul.index-entities > li > div.entity-kinds > a.letter-anchor:hover { + text-decoration: none; +} + +ul.index-entities > li > div.entity-kinds > a.letter-anchor.object { + background-color: rgb(44, 108, 141); +} + +ul.index-entities > li > div.entity-kinds > a.letter-anchor.class { + background-color: rgb(68, 173, 125); +} + +ul.index-entities > li > div.entity-kinds > a.letter-anchor.trait { + background-color: rgb(25, 170, 207); } ul.toc > li > ul.show { @@ -119,10 +186,15 @@ li.index-entity > a:focus { text-decoration: none; } +ul.index-entities > li:hover, +ul.toc > li.toc-title:hover, +ul.toc > li > a.toggle-children:hover { + background-color: rgba(0, 0, 0, 0.2); +} + ul.index-entities > li > a:hover, ul.toc > li > a:hover { text-decoration: none; - background-color: rgba(0, 0, 0, 0.2); } .darken { |