Use the original type faces

- Utopia (alias Heuristica) for text
- Luxi Mono                 for code

Typography has been reworked and moved closer to the original.

13 files changed, 71 insertions, 14 deletions

diff --git a/resources/Heuristica-Bold.woff b/resources/Heuristica-Bold.woff
new 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
new 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
new 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
new 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
new 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
new 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
new 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
new 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
+}