-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Some enhancements for Dottydoc and ScalaDays #2477
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
felixmulder
merged 13 commits into
scala:master
from
dotty-staging:topic/dottydoc-scaladays-enhancements
May 19, 2017
Merged
Changes from all commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
1fbf68d
Make sidebar an include instead of a layout
felixmulder 030c0d6
Add vertical line left of package children in sidebar
felixmulder 0bf6f9e
Fix #2466: broken CONTRIBUTING link
felixmulder 227a9b0
Add @biboudis to people working on the project
felixmulder 8ff4927
Make blog posts use correct layout
felixmulder efebc38
Inline toc in sidebar
felixmulder f917317
Break out toolbar to its own include
felixmulder cc0748e
Fix #2471: broken favicon
felixmulder 4e9f00f
Update Dottydoc look
felixmulder c14aa53
Add version to docs toolbar
felixmulder 86868c3
Fix synthetic members being added to docs
felixmulder e80f4fb
Make sure objects don't get `final` modifier
felixmulder 4046ac4
Make sure anchor linking jumps to correct location
felixmulder File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
File renamed without changes.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,38 @@ | ||
<div class="index-wrapper" style="top: {{ sidebarTop }};"> | ||
<ul class="toc"> | ||
{% assign parent = page.path | first %} | ||
{% for title in sidebar %} | ||
<li>{% renderTitle title, parent %}</li> | ||
{% endfor %} | ||
</ul> | ||
|
||
<ul class="index-entities"> | ||
{% if docs.size > 0 %} | ||
<li class="index-title"> | ||
<span>API</span> | ||
</li> | ||
{% endif %} | ||
{% for pkg in docs %} | ||
<li class="index-entity entity-package"> | ||
<h1><a class="entity-name" href="{{ site.baseurl }}/api/{{ pkg.path | join: "/" }}/index.html">{{ pkg.name }}</a></h1> | ||
<ul class="package-entities"> | ||
<div id="cover-block"></div> | ||
{% for member in pkg.children %} | ||
{% if member.kind == "object" and member.hasCompanion %} | ||
{% elsif member.kind != "package" %} | ||
<li class="{% 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 %} | ||
</ul> | ||
</li> | ||
{% endfor %} | ||
</ul> | ||
</div> |
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
<div id="toolbar"> | ||
<a id="home-button" href="{{ site.baseurl }}/index.html"> | ||
{% include "scala-logo.svg" %} | ||
</a> | ||
<div id="project-details"> | ||
<h1 id="project-name">{{ site.project }} Documentation</h1> | ||
<h2 id="project-version">{{ site.version }}</h2> | ||
</div> | ||
</div> |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why is it empty?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If the version isn't specified, it falls back to an empty string. This renders nicely on the site.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ok