fix font size and typos

[chaz/talk-introduction-to-psgi] / css / common.css

diff --git a/css/common.css b/css/common.css
index 63feb097b75611a20e0fbcb0d412fbbb8444f208..5fe4e74a71a693cb24776ae2f9f7d58a17b3ef8e 100644 (file)
--- a/css/common.css
+++ b/css/common.css
@@ -1,14 +1,23 @@
-@import url(https://fonts.googleapis.com/css?family=Yanone+Kaffeesatz);
-@import url(https://fonts.googleapis.com/css?family=Droid+Serif:400,700,400italic);
-@import url(https://fonts.googleapis.com/css?family=Ubuntu+Mono:400,700,400italic);
+@import url(https://fonts.googleapis.com/css?family=Open+Sans);
+@import url(https://fonts.googleapis.com/css?family=Muli);
+@import url(https://fonts.googleapis.com/css?family=Inconsolata);
 
-body {
-    font-family: 'Droid Serif';
+.remark-slide-content {
+    font-family: 'Open Sans';
+    font-size: 22px;
 }
 
-h1, h2, h3 {
-    font-family: 'Yanone Kaffeesatz';
-    font-weight: normal;
+.remark-slide-content h1,
+.remark-slide-content h2,
+.remark-slide-content h3 {
+    font-family: Muli;
+    font-weight: bold;
+}
+.remark-slide-content h2 {
+    font-size: 40px;
+}
+.remark-slide-content h3 {
+    font-size: 30px;
 }
 
 .remark-slide-content li {
@@ -18,16 +27,15 @@ h1, h2, h3 {
     line-height: 1em;
 }
 
-
 .remark-code, .remark-inline-code {
-    font-family: Inconsolata, 'Ubuntu Mono';
+    font-family: Inconsolata, monospace;
 }
 .remark-code {
     border-radius: 5px;
     border: 1px solid #ccc;
 }
 
-blockquote {
+.remark-slide-content blockquote {
     border-radius: 5px;
     border: 1px solid #ccc;
     background: #f0f0f0;
@@ -36,7 +44,7 @@ blockquote {
     quotes: "\201C""\201D""\2018""\2019";
     position: relative;
 }
-blockquote:before {
+.remark-slide-content blockquote:before {
     color: #ccc;
     position: absolute;
     content: open-quote;
@@ -46,7 +54,7 @@ blockquote:before {
     vertical-align: -0.4em;
 }
 
-.col {
+.remark-slide-content .col {
     box-sizing: border-box;
     display: block;
     float: left;
@@ -55,25 +63,31 @@ blockquote:before {
     padding: 0;
     width: 50%;
 }
-.col:nth-of-type(odd) {
+.remark-slide-content .col:nth-of-type(odd) {
     padding: 0 1em 0 0;
 }
-.col:nth-of-type(even) {
+.remark-slide-content .col:nth-of-type(even) {
     padding: 0 0 0 1em;
 }
-.col.sep:nth-of-type(odd) {
+.remark-slide-content .col.sep:nth-of-type(odd) {
     border-right: 1px solid #ccc;
 }
-.col.sep:nth-of-type(even) {
+.remark-slide-content .col.sep:nth-of-type(even) {
     border-left: 1px solid #ccc;
 }
 
-.top-right {
+/* fix non-collapsing margin */
+.remark-slide-content .marginfix h3,
+.remark-slide-content .marginfix ul {
+    margin-top: 0;
+}
+
+.remark-slide-content .top-right {
     float: right;
     margin: 50px 0 0 2em;
 }
 
-.highlight {
+.remark-slide-content .highlight {
     color: #7d9726;
 }