Skip to content
Browse files

Fonts, typography, and styling

New fonts (Oswald and Open Sans), slight color changes, mdashes instead
of -, tweak to ul margins. Could possibly use proper curly quotes but
they are not very pretty in Open Sans.
  • Loading branch information...
1 parent aaea969 commit 8485fdc8caa233bc96c2d15e7f56f27d193a98a3 @helen helen committed Mar 21, 2012
Showing with 22 additions and 22 deletions.
  1. +10 −10 index.html
  2. +1 −1 slides.js
  3. +11 −11 styles.css
View
20 index.html
@@ -199,7 +199,7 @@ <h3 class="second-header" style="margin-top:40px;">Gameplan</h3>
</article>
<article>
- <h3>When to Cache - A Common Solution</h3>
+ <h3>When to Cache &mdash; A Common Solution</h3>
<p>Cache when the data is not cached</p>
@@ -222,7 +222,7 @@ <h3 class="second-header" style="margin-top:40px;">Gameplan</h3>
</article>
<article>
- <h3>When to Cache - When the Data Changes</h3>
+ <h3>When to Cache &mdash; When the Data Changes</h3>
<ul>
<li>
@@ -245,7 +245,7 @@ <h3 class="second-header" style="margin-top:40px;">Gameplan</h3>
</article>
<article>
- <h3>When to Cache - When the Data Changes</h3>
+ <h3>When to Cache &mdash; When the Data Changes</h3>
<pre>
function zt_set_best_games( $new_status, $old_status, $post ) {
@@ -265,7 +265,7 @@ <h3 class="second-header" style="margin-top:40px;">Gameplan</h3>
</article>
<article>
- <h3>When to Cache - On an Interval</h3>
+ <h3>When to Cache &mdash; On an Interval</h3>
<ul>
<li>
@@ -281,7 +281,7 @@ <h3 class="second-header" style="margin-top:40px;">Gameplan</h3>
</article>
<article>
- <h3>When to Cache - On an Interval</h3>
+ <h3>When to Cache &mdash; On an Interval</h3>
<pre>
function zt_get_tweet() {
@@ -302,7 +302,7 @@ <h3 class="second-header" style="margin-top:40px;">Gameplan</h3>
</article>
<article>
- <h3>When to Cache - Failing Gracefully</h3>
+ <h3>When to Cache &mdash; Failing Gracefully</h3>
<ul>
<li>Never trust that data is in the cache</li>
@@ -318,7 +318,7 @@ <h3 class="second-header" style="margin-top:40px;">Gameplan</h3>
</article>
<article>
- <h3>When to Cache - Failing Gracefully</h3>
+ <h3>When to Cache &mdash; Failing Gracefully</h3>
<p>Placeholder text</p>
@@ -341,7 +341,7 @@ <h3 class="second-header" style="margin-top:40px;">Gameplan</h3>
</article>
<article>
- <h3>When to Cache - Failing Gracefully</h3>
+ <h3>When to Cache &mdash; Failing Gracefully</h3>
<p>Storing a "backup"</p>
@@ -369,7 +369,7 @@ <h3 class="second-header" style="margin-top:40px;">Gameplan</h3>
</article>
<article>
- <h3>When to Cache - Failing Gracefully</h3>
+ <h3>When to Cache &mdash; Failing Gracefully</h3>
<p>Using the "backup"</p>
@@ -387,7 +387,7 @@ <h3 class="second-header" style="margin-top:40px;">Gameplan</h3>
</article>
<article>
- <h3>When to Cache - Avoid Front End Caching</h3>
+ <h3>When to Cache &mdash; Avoid Front End Caching</h3>
<ul>
<li>Flooding
View
2 slides.js
@@ -547,7 +547,7 @@ function addFontStyle() {
el.rel = 'stylesheet';
el.type = 'text/css';
el.href = 'http://fonts.googleapis.com/css?family=' +
- 'Rokkitt:400,700|Lato:300,300italic,700,700italic';
+ 'Oswald:400,700|Open+Sans:300,300italic,700,700italic';
document.body.appendChild(el);
};
View
22 styles.css
@@ -227,12 +227,12 @@ body {
/* Styles for slides */
.slides > article {
- font-family: 'Lato', sans-serif;
+ font-family: 'Open Sans', sans-serif;
color: #444;
text-shadow: 0 1px 1px rgba(0, 0, 0, .1);
- font-size: 30px;
+ font-size: 28px;
line-height: 1.3;
font-weight: 300;
}
@@ -261,7 +261,7 @@ b {
}
a {
- color: #2aa198;
+ color: #dc322f;
}
a:hover {
text-decoration: none;
@@ -278,8 +278,8 @@ p:first-child {
}
h1, h2, h3, h4, h5, h6 {
- font-family: "Rokkitt", sans-serif;
- letter-spacing: -.02em;
+ font-family: "Oswald", sans-serif;
+ letter-spacing: -.01em;
padding: 0;
margin: 0;
@@ -289,12 +289,12 @@ h1, h2, h3, h4, h5, h6 {
h1 {
font-size: 72px;
- line-height: 1;
+ line-height: 1.15;
- margin-top: 200px;
+ margin-top: 150px;
padding-right: 40px;
- color: #cb4b16;
+ color: #268bd2;
}
h2 {
@@ -306,7 +306,7 @@ h2 {
padding-right: 40px;
- color: #cb4b16;
+ color: #268bd2;
}
h3 {
@@ -336,11 +336,11 @@ ul {
margin-left: .75em;
}
-ul:first-child {
+ul li:first-child {
margin-top: 0;
}
ul ul {
- margin-top: .5em;
+ margin-top: .3em;
}
li {
padding: 0;

0 comments on commit 8485fdc

Please sign in to comment.
Something went wrong with that request. Please try again.