diff options
author | Seth Tisue <seth@tisue.net> | 2016-10-04 14:13:37 -0500 |
---|---|---|
committer | Seth Tisue <seth@tisue.net> | 2016-10-04 14:13:37 -0500 |
commit | fb53465ca7df23aa996f4bd3c03367f98f37d283 (patch) | |
tree | ecabe92379da52cdb6c5254b5062e88bca6540a6 /spec/_layouts | |
parent | a3008d5ff4871a6f4b86b48197f01027ffee4245 (diff) | |
parent | 1f6006d0d4f8edf4db04915702f8b7e3c8ca1f5e (diff) | |
download | scala-fb53465ca7df23aa996f4bd3c03367f98f37d283.tar.gz scala-fb53465ca7df23aa996f4bd3c03367f98f37d283.tar.bz2 scala-fb53465ca7df23aa996f4bd3c03367f98f37d283.zip |
Merge remote-tracking branch 'origin/2.12.0' into merge-2.12.0-to-2.12.x-sep-24
Diffstat (limited to 'spec/_layouts')
-rw-r--r-- | spec/_layouts/default.yml | 2 | ||||
-rw-r--r-- | spec/_layouts/toc.yml | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/spec/_layouts/default.yml b/spec/_layouts/default.yml index 7e205f8835..06d8c1c118 100644 --- a/spec/_layouts/default.yml +++ b/spec/_layouts/default.yml @@ -31,7 +31,7 @@ <body> <header> - <nav id="chapters"><a id="github" href="https://github.com/scala/scala/tree/2.11.x/spec"><img src="public/images/github-logo@2x.png" alt="Edit at Github"></a>{% assign sorted_pages = site.pages | sort:"name" %}{% for post in sorted_pages %}{% if post.chapter >= 0 %}<a href="{{site.baseurl}}{{ post.url }}">{{post.chapter}} {{ post.title }}</a>{% endif %}{% endfor %}</nav> + <nav id="chapters"><a id="github" href="https://github.com/scala/scala/tree/2.12.x/spec"><img src="public/images/github-logo@2x.png" alt="Edit at GitHub"></a>{% assign sorted_pages = site.pages | sort:"name" %}{% for post in sorted_pages %}{% if post.chapter >= 0 %}<a href="{{site.baseurl}}{{ post.url }}">{{post.chapter}} {{ post.title }}</a>{% endif %}{% endfor %}</nav> </header> <aside class="left"><nav id="toc"></nav></aside> diff --git a/spec/_layouts/toc.yml b/spec/_layouts/toc.yml index 4da7d41bea..dfd92eb114 100644 --- a/spec/_layouts/toc.yml +++ b/spec/_layouts/toc.yml @@ -19,9 +19,9 @@ <div id="header-main"> <img id="scala-logo" src="public/images/scala-spiral-white.png" /> <span id="title">Scala Language Specification</span> - <a id="github" href="https://github.com/scala/scala/tree/2.11.x/spec"><img src="public/images/github-logo@2x.png" alt="Edit at Github"></a> + <a id="github" href="https://github.com/scala/scala/tree/2.12.x/spec"><img src="public/images/github-logo@2x.png" alt="Edit at GitHub"></a> </div> - <div id="header-sub">Version 2.11</div> + <div id="header-sub">Version 2.12</div> </header> <main> {{ content }} |