diff options
| -rw-r--r-- | LICENSE_HEURISTICA | 101 | ||||
| -rw-r--r-- | LICENSE_LUXIMONO | 15 | ||||
| -rw-r--r-- | resources/Heuristica-Bold.woff | bin | 0 -> 109784 bytes | |||
| -rw-r--r-- | resources/Heuristica-BoldItalic.woff | bin | 0 -> 108416 bytes | |||
| -rw-r--r-- | resources/Heuristica-Regular.woff | bin | 0 -> 146792 bytes | |||
| -rw-r--r-- | resources/Heuristica-RegularItalic.woff | bin | 0 -> 108852 bytes | |||
| -rw-r--r-- | resources/LuxiMono-Bold.woff | bin | 0 -> 26560 bytes | |||
| -rw-r--r-- | resources/LuxiMono-BoldOblique.woff | bin | 0 -> 29480 bytes | |||
| -rw-r--r-- | resources/LuxiMono-Regular.woff | bin | 0 -> 26432 bytes | |||
| -rw-r--r-- | resources/LuxiMono-RegularOblique.woff | bin | 0 -> 29300 bytes | |||
| -rwxr-xr-x | resources/blueprint-print.css | 8 | ||||
| -rw-r--r-- | resources/blueprint-screen.css | 6 | ||||
| -rw-r--r-- | resources/fonts.css | 57 | ||||
| -rw-r--r-- | resources/scala-ref-template.html5 | 1 | ||||
| -rw-r--r-- | resources/style.css | 13 |
15 files changed, 187 insertions, 14 deletions
diff --git a/LICENSE_HEURISTICA b/LICENSE_HEURISTICA new file mode 100644 index 0000000000..9693dc1db2 --- /dev/null +++ b/LICENSE_HEURISTICA @@ -0,0 +1,101 @@ +Copyright 1989, 1991 Adobe Systems Incorporated. All rights reserved. +Utopia is either a registered trademark or trademark of Adobe Systems +Incorporated in the United States and/or other countries. Used under +license. + +Copyright 2006 Han The Thanh, Vntopia font family, http://vntex.sf.net + +Copyright (c) 2008-2012, Andrey V. Panov (panov@canopus.iacp.dvo.ru), +with Reserved Font Name Heuristica. + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +http://scripts.sil.org/OFL + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/LICENSE_LUXIMONO b/LICENSE_LUXIMONO new file mode 100644 index 0000000000..2f480f664e --- /dev/null +++ b/LICENSE_LUXIMONO @@ -0,0 +1,15 @@ +Luxi fonts copyright (c) 2001 by Bigelow & Holmes Inc. Luxi font instruction code copyright (c) 2001 by URW++ GmbH. All Rights Reserved. Luxi is a registered trademark of Bigelow & Holmes Inc. + +Permission is hereby granted, free of charge, to any person obtaining a copy of these Fonts and associated documentation files (the "Font Software"), to deal in the Font Software, including without limitation the rights to use, copy, merge, publish, distribute, sublicense, and/or sell copies of the Font Software, and to permit persons to whom the Font Software is furnished to do so, subject to the following conditions: + +The above copyright and trademark notices and this permission notice shall be included in all copies of one or more of the Font Software. + +The Font Software may not be modified, altered, or added to, and in particular the designs of glyphs or characters in the Fonts may not be modified nor may additional glyphs or characters be added to the Fonts. This License becomes null and void when the Fonts or Font Software have been modified. + +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL BIGELOW & HOLMES INC. OR URW++ GMBH. BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE. + +Except as contained in this notice, the names of Bigelow & Holmes Inc. and URW++ GmbH. shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Font Software without prior written authorization from Bigelow & Holmes Inc. and URW++ GmbH. + +For further information, contact: + +info@urwpp.de or design@bigelowandholmes.com
\ No newline at end of file diff --git a/resources/Heuristica-Bold.woff b/resources/Heuristica-Bold.woff Binary files differnew file mode 100644 index 0000000000..570c956738 --- /dev/null +++ b/resources/Heuristica-Bold.woff diff --git a/resources/Heuristica-BoldItalic.woff b/resources/Heuristica-BoldItalic.woff Binary files differnew file mode 100644 index 0000000000..f16d85a365 --- /dev/null +++ b/resources/Heuristica-BoldItalic.woff diff --git a/resources/Heuristica-Regular.woff b/resources/Heuristica-Regular.woff Binary files differnew file mode 100644 index 0000000000..7c1ed46798 --- /dev/null +++ b/resources/Heuristica-Regular.woff diff --git a/resources/Heuristica-RegularItalic.woff b/resources/Heuristica-RegularItalic.woff Binary files differnew file mode 100644 index 0000000000..9f89dec97f --- /dev/null +++ b/resources/Heuristica-RegularItalic.woff diff --git a/resources/LuxiMono-Bold.woff b/resources/LuxiMono-Bold.woff Binary files differnew file mode 100644 index 0000000000..8581bb5aa4 --- /dev/null +++ b/resources/LuxiMono-Bold.woff diff --git a/resources/LuxiMono-BoldOblique.woff b/resources/LuxiMono-BoldOblique.woff Binary files differnew file mode 100644 index 0000000000..607ccf5cd0 --- /dev/null +++ b/resources/LuxiMono-BoldOblique.woff diff --git a/resources/LuxiMono-Regular.woff b/resources/LuxiMono-Regular.woff Binary files differnew file mode 100644 index 0000000000..a478ad9ef2 --- /dev/null +++ b/resources/LuxiMono-Regular.woff diff --git a/resources/LuxiMono-RegularOblique.woff b/resources/LuxiMono-RegularOblique.woff Binary files differnew file mode 100644 index 0000000000..26999f990f --- /dev/null +++ b/resources/LuxiMono-RegularOblique.woff diff --git a/resources/blueprint-print.css b/resources/blueprint-print.css index bd79afdea5..d3a9055120 100755 --- a/resources/blueprint-print.css +++ b/resources/blueprint-print.css @@ -12,12 +12,12 @@ ----------------------------------------------------------------------- */ /* print.css */ -body {line-height:1.5;font-family:"Helvetica Neue", Arial, Helvetica, sans-serif;color:#000;background:none;font-size:10pt;} +body {line-height:1.5;font-family:Heuristica,Georgia,serif;color:#000;background:none;font-size:10pt;} .container {background:none;} hr {background:#ccc;color:#ccc;width:100%;height:2px;margin:2em 0;padding:0;border:none;} hr.space {background:#fff;color:#fff;visibility:hidden;} -h1, h2, h3, h4, h5, h6 {font-family:"Helvetica Neue", Arial, "Lucida Grande", sans-serif;} -code {font:.9em "Courier New", Monaco, Courier, monospace;} +h1, h2, h3, h4, h5, h6 {font-family:Heuristica,Georgia,serif;} +code {font:.9em "Luxi Mono", "Courier New", Monaco, Courier, monospace;} a img {border:none;} p img.top {margin-top:0;} blockquote {margin:1.5em;padding:1em;font-style:italic;font-size:.9em;} @@ -26,4 +26,4 @@ blockquote {margin:1.5em;padding:1em;font-style:italic;font-size:.9em;} .quiet {color:#999;} .hide {display:none;} a:link, a:visited {background:transparent;font-weight:700;text-decoration:underline;} -a:link:after, a:visited:after {content:" (" attr(href) ")";font-size:90%;}
\ No newline at end of file +a:link:after, a:visited:after {content:" (" attr(href) ")";font-size:90%;} diff --git a/resources/blueprint-screen.css b/resources/blueprint-screen.css index dd2bdbbca7..a34d48e39a 100644 --- a/resources/blueprint-screen.css +++ b/resources/blueprint-screen.css @@ -26,7 +26,7 @@ a img {border:none;} /* typography.css */ html {font-size:100.01%;} -body {font-size:75%;color:#222;background:#fff;font-family:"Helvetica Neue", Arial, Helvetica, sans-serif;} +body {color:#222;background:#fff;font-family:Heuristica,Georgia,serif;} h1, h2, h3, h4, h5, h6 {font-weight:normal;color:#111;} h1 {font-size:3em;line-height:1;margin-bottom:0.5em;} h2 {font-size:2em;margin-bottom:0.75em;} @@ -50,7 +50,7 @@ abbr, acronym {border-bottom:1px dotted #666;} address {margin:0 0 1.5em;font-style:italic;} del {color:#666;} pre {margin:1.5em 0;white-space:pre;} -pre, code, tt {font:1em 'andale mono', 'lucida console', monospace;line-height:1.5;} +pre, code, tt {font:90% "Luxi Mono", 'andale mono', 'lucida console', monospace;line-height:1.5;} li ul, li ol {margin:0;} ul, ol {margin:0 1.5em 1.5em 0;padding-left:1.5em;} ul {list-style-type:disc;} @@ -228,4 +228,4 @@ hr {background:#ddd;color:#ddd;clear:both;float:none;width:100%;height:1px;margi hr.space {background:#fff;color:#fff;visibility:hidden;} .clearfix:after, .container:after {content:"\0020";display:block;height:0;clear:both;visibility:hidden;overflow:hidden;} .clearfix, .container {display:block;} -.clear {clear:both;}
\ No newline at end of file +.clear {clear:both;} diff --git a/resources/fonts.css b/resources/fonts.css new file mode 100644 index 0000000000..a47d453f29 --- /dev/null +++ b/resources/fonts.css @@ -0,0 +1,57 @@ +@font-face { + font-family: 'Luxi Mono'; + src: local('Luxi Mono Regular'), + url('LuxiMono-Regular.woff') format('woff'); + font-weight: normal; + font-style: normal; +} +@font-face { + font-family: 'Luxi Mono'; + src: local('Luxi Mono Oblique'), + url('LuxiMono-BoldOblique.woff') format('woff'); + font-weight: normal; + font-style: oblique; +} +@font-face { + font-family: 'Luxi Mono'; + src: local('Luxi Mono Bold'), + url('LuxiMono-Bold.woff') format('woff'); + font-weight: bold; + font-style: normal; +} +@font-face { + font-family: 'Luxi Mono'; + src: local('Luxi Mono Bold Oblique'), + url('LuxiMono-BoldOblique.woff') format('woff'); + font-weight: bold; + font-style: oblique; +} + +@font-face { + font-family: 'Heuristica'; + src: local('Heuristica Regular'), + url('Heuristica-Regular.woff') format('woff'); + font-weight: normal; + font-style: normal; +} +@font-face { + font-family: 'Heuristica'; + src: local('Heuristica Italic'), + url('Heuristica-RegularItalic.woff') format('woff'); + font-weight: normal; + font-style: italic; +} +@font-face { + font-family: 'Heuristica'; + src: local('Heuristica Bold'), + url('Heuristica-Bold.woff') format('woff'); + font-weight: bold; + font-style: normal; +} +@font-face { + font-family: 'Heuristica'; + src: local('Heuristica Bold Italic'), + url('Heuristica-BoldItalic.woff') format('woff'); + font-weight: bold; + font-style: italic; +} diff --git a/resources/scala-ref-template.html5 b/resources/scala-ref-template.html5 index 526543d69c..2ff8991df1 100644 --- a/resources/scala-ref-template.html5 +++ b/resources/scala-ref-template.html5 @@ -50,6 +50,7 @@ $endfor$ <link rel="stylesheet" href="resources/blueprint-ie.css" type="text/css" media="screen, projection"> <![endif]--> <link rel="stylesheet" href="resources/style.css" type="text/css" media="screen, projection"/> + <link rel="stylesheet" href="resources/fonts.css" type="text/css" media="screen, projection"/> </head> <body> diff --git a/resources/style.css b/resources/style.css index 54b66f43fe..3b753b563d 100644 --- a/resources/style.css +++ b/resources/style.css @@ -17,11 +17,10 @@ header .date { } pre { - margin-left: 3em; - margin-right: 3em; + margin-left: 1em; + margin-right: 1em; padding: 1em; background-color: #EEE; - border: 1px solid #333; } pre.math { @@ -43,8 +42,8 @@ code { /* examples */ ol[type="1"] { list-style-type: none; - margin-left: 3em; - margin-right: 3em; + margin-left: 1em; + margin-right: 1em; padding: 0; } @@ -52,11 +51,11 @@ ol[type="1"] > li { margin-top: 1em; padding: 1em; background-color: #E5ECF9; - border: 1px dashed black; } ol[type="1"] > li:before { content: "Example "; + font-weight:bold; } #popoutTOC { @@ -73,4 +72,4 @@ ol[type="1"] > li:before { #popoutTOC .links { display: none; -}
\ No newline at end of file +} |