summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIain McGinniss <iainmcgin@gmail.com>2013-03-02 05:28:56 -0800
committerIain McGinniss <iainmcgin@gmail.com>2013-03-02 05:28:56 -0800
commit907038c130c6d7e446153d6f1f227c24a2c842b5 (patch)
treef6e5fb289a460156ca4b3e93652cc3f755e0a17d
parent9cee3832d2285c562c3aa88f9c0c847f6f9e1ef5 (diff)
parenta80a8940d673bde0129fb528e45dc9103891d6ba (diff)
downloadscala-907038c130c6d7e446153d6f1f227c24a2c842b5.tar.gz
scala-907038c130c6d7e446153d6f1f227c24a2c842b5.tar.bz2
scala-907038c130c6d7e446153d6f1f227c24a2c842b5.zip
Merge pull request #22 from soc/fonts2
Adjustments to typography and design
-rw-r--r--resources/Heuristica-Bold.woffbin109784 -> 106188 bytes
-rw-r--r--resources/Heuristica-BoldItalic.woffbin108416 -> 104316 bytes
-rw-r--r--resources/Heuristica-Regular.woffbin146792 -> 141416 bytes
-rw-r--r--resources/Heuristica-RegularItalic.woffbin108852 -> 104700 bytes
-rw-r--r--resources/blueprint-screen.css6
-rw-r--r--resources/style.css20
6 files changed, 22 insertions, 4 deletions
diff --git a/resources/Heuristica-Bold.woff b/resources/Heuristica-Bold.woff
index 570c956738..904579683d 100644
--- a/resources/Heuristica-Bold.woff
+++ b/resources/Heuristica-Bold.woff
Binary files differ
diff --git a/resources/Heuristica-BoldItalic.woff b/resources/Heuristica-BoldItalic.woff
index f16d85a365..a3c5234453 100644
--- a/resources/Heuristica-BoldItalic.woff
+++ b/resources/Heuristica-BoldItalic.woff
Binary files differ
diff --git a/resources/Heuristica-Regular.woff b/resources/Heuristica-Regular.woff
index 7c1ed46798..f5c1f8b2db 100644
--- a/resources/Heuristica-Regular.woff
+++ b/resources/Heuristica-Regular.woff
Binary files differ
diff --git a/resources/Heuristica-RegularItalic.woff b/resources/Heuristica-RegularItalic.woff
index 9f89dec97f..d2c8664593 100644
--- a/resources/Heuristica-RegularItalic.woff
+++ b/resources/Heuristica-RegularItalic.woff
Binary files differ
diff --git a/resources/blueprint-screen.css b/resources/blueprint-screen.css
index a34d48e39a..2e3600079f 100644
--- a/resources/blueprint-screen.css
+++ b/resources/blueprint-screen.css
@@ -28,7 +28,7 @@ a img {border:none;}
html {font-size:100.01%;}
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;}
+h1 {font-size:3em;line-height:1;margin-top:1em;margin-bottom:0.5em;}
h2 {font-size:2em;margin-bottom:0.75em;}
h3 {font-size:1.5em;line-height:1;margin-bottom:1em;}
h4 {font-size:1.2em;line-height:1.25;margin-bottom:1.25em;}
@@ -40,8 +40,8 @@ p {margin:0 0 0.5em;}
p .left {margin:0.5em 0.5em 0.5em 0;padding:0;}
.right {float:right !important;}
p .right {margin:0.5em 0 0.5em 0.5em;padding:0;}
-a:focus, a:hover {color:#09f;}
-a {color:#06c;text-decoration:underline;}
+a:focus, a:hover {color:#09f;text-decoration:underline;}
+a {color:#06c;text-decoration:none;}
blockquote {margin:1.5em;color:#666;font-style:italic;}
strong, dfn {font-weight:bold;}
em, dfn {font-style:italic;}
diff --git a/resources/style.css b/resources/style.css
index 3b753b563d..17d13741a7 100644
--- a/resources/style.css
+++ b/resources/style.css
@@ -6,6 +6,10 @@ header .date {
text-align: center;
}
+nav ul {
+ list-style-type: none;
+}
+
.container > h1 a,
.container > h2 a,
.container > h3 a,
@@ -16,6 +20,13 @@ header .date {
color: #111;
}
+p {
+ -moz-font-feature-settings: "onum";
+ -ms-font-feature-settings: "onum";
+ -webkit-font-feature-settings: "onum";
+ font-feature-settings: "onum";
+}
+
pre {
margin-left: 1em;
margin-right: 1em;
@@ -30,6 +41,13 @@ pre.math {
border: 0;
}
+pre[class="grammar"]:before {
+ content: "Syntax\A";
+ font-family: Heuristica;
+ font-size:110%;
+ font-weight:bold;
+}
+
code > span {
font-weight: normal !important;
}
@@ -54,7 +72,7 @@ ol[type="1"] > li {
}
ol[type="1"] > li:before {
- content: "Example ";
+ content: "Example";
font-weight:bold;
}