From e7ade69a2769b04dca6c6d55122351faa154f969 Mon Sep 17 00:00:00 2001 From: Simon Ochsenreither Date: Wed, 20 Feb 2013 00:55:42 +0100 Subject: Use the original type faces - Utopia (alias Heuristica) for text - Luxi Mono for code Typography has been reworked and moved closer to the original. --- resources/Heuristica-Bold.woff | Bin 0 -> 109784 bytes resources/Heuristica-BoldItalic.woff | Bin 0 -> 108416 bytes resources/Heuristica-Regular.woff | Bin 0 -> 146792 bytes resources/Heuristica-RegularItalic.woff | Bin 0 -> 108852 bytes resources/LuxiMono-Bold.woff | Bin 0 -> 26560 bytes resources/LuxiMono-BoldOblique.woff | Bin 0 -> 29480 bytes resources/LuxiMono-Regular.woff | Bin 0 -> 26432 bytes resources/LuxiMono-RegularOblique.woff | Bin 0 -> 29300 bytes resources/blueprint-print.css | 8 ++--- resources/blueprint-screen.css | 6 ++-- resources/fonts.css | 57 ++++++++++++++++++++++++++++++++ resources/scala-ref-template.html5 | 1 + resources/style.css | 13 ++++---- 13 files changed, 71 insertions(+), 14 deletions(-) create mode 100644 resources/Heuristica-Bold.woff create mode 100644 resources/Heuristica-BoldItalic.woff create mode 100644 resources/Heuristica-Regular.woff create mode 100644 resources/Heuristica-RegularItalic.woff create mode 100644 resources/LuxiMono-Bold.woff create mode 100644 resources/LuxiMono-BoldOblique.woff create mode 100644 resources/LuxiMono-Regular.woff create mode 100644 resources/LuxiMono-RegularOblique.woff create mode 100644 resources/fonts.css (limited to 'resources') diff --git a/resources/Heuristica-Bold.woff b/resources/Heuristica-Bold.woff new file mode 100644 index 0000000000..570c956738 Binary files /dev/null and b/resources/Heuristica-Bold.woff differ diff --git a/resources/Heuristica-BoldItalic.woff b/resources/Heuristica-BoldItalic.woff new file mode 100644 index 0000000000..f16d85a365 Binary files /dev/null and b/resources/Heuristica-BoldItalic.woff differ diff --git a/resources/Heuristica-Regular.woff b/resources/Heuristica-Regular.woff new file mode 100644 index 0000000000..7c1ed46798 Binary files /dev/null and b/resources/Heuristica-Regular.woff differ diff --git a/resources/Heuristica-RegularItalic.woff b/resources/Heuristica-RegularItalic.woff new file mode 100644 index 0000000000..9f89dec97f Binary files /dev/null and b/resources/Heuristica-RegularItalic.woff differ diff --git a/resources/LuxiMono-Bold.woff b/resources/LuxiMono-Bold.woff new file mode 100644 index 0000000000..8581bb5aa4 Binary files /dev/null and b/resources/LuxiMono-Bold.woff differ diff --git a/resources/LuxiMono-BoldOblique.woff b/resources/LuxiMono-BoldOblique.woff new file mode 100644 index 0000000000..607ccf5cd0 Binary files /dev/null and b/resources/LuxiMono-BoldOblique.woff differ diff --git a/resources/LuxiMono-Regular.woff b/resources/LuxiMono-Regular.woff new file mode 100644 index 0000000000..a478ad9ef2 Binary files /dev/null and b/resources/LuxiMono-Regular.woff differ diff --git a/resources/LuxiMono-RegularOblique.woff b/resources/LuxiMono-RegularOblique.woff new file mode 100644 index 0000000000..26999f990f Binary files /dev/null and b/resources/LuxiMono-RegularOblique.woff differ 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$ + 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 +} -- cgit v1.2.3