diff options
| author | Antoine Gourlay <antoine@gourlay.fr> | 2014-09-23 11:02:10 +0200 |
|---|---|---|
| committer | Antoine Gourlay <antoine@gourlay.fr> | 2014-09-23 11:30:17 +0200 |
| commit | 65eb42f4571ff188753fd70783619b8b7418d3d5 (patch) | |
| tree | 507b23de87a2df974b9718f8ef8ccebdb2ab0345 /spec | |
| parent | e95d91e826bc11af9aa42db45861d68211edd347 (diff) | |
| download | scala-65eb42f4571ff188753fd70783619b8b7418d3d5.tar.gz scala-65eb42f4571ff188753fd70783619b8b7418d3d5.tar.bz2 scala-65eb42f4571ff188753fd70783619b8b7418d3d5.zip | |
spec: a header that links to the index, with a scala logo
...and a Scala favicon.
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/_includes/numbering.css | 6 | ||||
| -rw-r--r-- | spec/_layouts/default.yml | 8 | ||||
| -rw-r--r-- | spec/_layouts/toc.yml | 15 | ||||
| -rw-r--r-- | spec/public/favicon.ico | bin | 0 -> 6518 bytes | |||
| -rw-r--r-- | spec/public/images/scala-logo-red-spiral-dark.png | bin | 0 -> 13021 bytes | |||
| -rw-r--r-- | spec/public/stylesheets/screen.css | 36 |
6 files changed, 60 insertions, 5 deletions
diff --git a/spec/_includes/numbering.css b/spec/_includes/numbering.css index 86b946354d..8df08098bc 100644 --- a/spec/_includes/numbering.css +++ b/spec/_includes/numbering.css @@ -54,3 +54,9 @@ h3[id*='example']:before { display: inline; margin-right: 1em; } + +.no-numbering, .no-numbering:before, .no-numbering:after { + content: normal; + counter-reset: none; + counter-increment: none; +} diff --git a/spec/_layouts/default.yml b/spec/_layouts/default.yml index e777b8f14c..64ba4a1639 100644 --- a/spec/_layouts/default.yml +++ b/spec/_layouts/default.yml @@ -2,6 +2,10 @@ <html> <head> <meta http-equiv='Content-Type' content='text/html; charset=utf-8' /> + + <link rel="icon" type="image/png" href="public/favicon.ico"> + <link rel="shortcut icon" type="image/png" href="public/favicon.ico"> + <script type="text/x-mathjax-config"> MathJax.Hub.Config({ tex2jax: { @@ -54,6 +58,10 @@ </head> <body> +<div id="header"> +<a alt="The Scala Language Specification" href="{{site.baseurl}}/"><img id="scala-logo" src="public/images/scala-logo-red-spiral-dark.png" /> +<h1 class="no-numbering">Language Specification</h1></a> +</div> <div id="container"> <div id="navigation"> <ol> diff --git a/spec/_layouts/toc.yml b/spec/_layouts/toc.yml index 85e1e6bc5c..caf0be1a3a 100644 --- a/spec/_layouts/toc.yml +++ b/spec/_layouts/toc.yml @@ -3,12 +3,25 @@ <head> <meta http-equiv='Content-Type' content='text/html; charset=utf-8' /> + <link rel="icon" type="image/png" href="public/favicon.ico"> + <link rel="shortcut icon" type="image/png" href="public/favicon.ico"> + <link rel="stylesheet" type="text/css" href="public/stylesheets/screen.css"> + <script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script> <title>{{ page.title }}</title> + + <script type="text/javascript"> + $(document).ready(function() { + $('#the-scala-language-specification').css('display','none'); + }) + </script> </head> <body> - +<div id="header"> +<a alt="The Scala Language Specification" href="{{site.baseurl}}/"><img id="scala-logo" src="public/images/scala-logo-red-spiral-dark.png" /> +<h1 class="no-numbering">Language Specification</h1></a> +</div> {{ content }} </body> diff --git a/spec/public/favicon.ico b/spec/public/favicon.ico Binary files differnew file mode 100644 index 0000000000..9eb6ef5164 --- /dev/null +++ b/spec/public/favicon.ico diff --git a/spec/public/images/scala-logo-red-spiral-dark.png b/spec/public/images/scala-logo-red-spiral-dark.png Binary files differnew file mode 100644 index 0000000000..09b66b5e6a --- /dev/null +++ b/spec/public/images/scala-logo-red-spiral-dark.png diff --git a/spec/public/stylesheets/screen.css b/spec/public/stylesheets/screen.css index ce8318f819..dbb3ebe1b3 100644 --- a/spec/public/stylesheets/screen.css +++ b/spec/public/stylesheets/screen.css @@ -4,16 +4,16 @@ body { font-family: Helvetica, arial, sans-serif; font-size: 14px; line-height: 1.6; - padding-top: 10px; + padding-bottom: 10px; background-color: white; padding-left: 30px; } -body > *:first-child { +#content-container > *:first-child { margin-top: 0 !important; } -body > *:last-child { +#content-container > *:last-child { margin-bottom: 0 !important; } @@ -347,7 +347,6 @@ code { } #navigation { - margin-top: 120px; margin-right: 10px; float: right; width: 26%; @@ -365,6 +364,7 @@ code { } #container { + padding-top: 10px; width: 100%; } @@ -398,3 +398,31 @@ code { .to_top:hover { color: black; } + +#scala-logo { + float: left; + width: 168px; + height: 48px; + margin-right: 25px; +} + +#header { + padding-top: 16px; + padding-bottom: 10px; + margin-bottom: 10px; + height: 64px; + border-bottom: 1px solid #cccccc; +} + +#header a { + height: 100%; + display: block; + text-decoration: none; +} + +#header h1 { + cursor: pointer; + padding-top: 6px; + margin-bottom: 0px; + font-size: 30px; +} |
