From 17f3cf4332cb300d08fba2b77416dd281cbebb18 Mon Sep 17 00:00:00 2001 From: Hakim El Hattab Date: Tue, 16 Oct 2012 09:27:55 -0400 Subject: [PATCH] adjust themes so that font definitions are at top, apply fonts on .reveal instead of body --- css/theme/beige.css | 31 +++++++++++++++++++++---------- css/theme/default.css | 32 ++++++++++++++++++++++---------- css/theme/serif.css | 25 ++++++++++++++++++------- css/theme/simple.css | 31 ++++++++++++++++++++++--------- css/theme/sky.css | 29 +++++++++++++++++++---------- 5 files changed, 102 insertions(+), 46 deletions(-) diff --git a/css/theme/beige.css b/css/theme/beige.css index 684f8420..4e7a9875 100644 --- a/css/theme/beige.css +++ b/css/theme/beige.css @@ -6,7 +6,7 @@ */ /********************************************* - * FONT-FACE DEFINITIONS + * FONTS *********************************************/ @font-face { @@ -21,16 +21,32 @@ font-style: normal; } +.reveal { + font-family: 'Lato', Times, 'Times New Roman', serif; + font-size: 36px; + font-weight: 200; + letter-spacing: -0.02em; +} + +.reveal h1, +.reveal h2, +.reveal h3, +.reveal h4, +.reveal h5, +.reveal h6 { + font-family: 'League Gothic', Impact, sans-serif; + line-height: 0.9em; + letter-spacing: 0.02em; + + text-transform: uppercase; +} + /********************************************* * GLOBAL STYLES *********************************************/ body { - font-family: 'Lato', Times, 'Times New Roman', serif; - font-size: 36px; - font-weight: 200; - letter-spacing: -0.02em; color: #333; background: #f7f3de; @@ -68,11 +84,6 @@ body { .reveal h6 { margin: 0 0 20px 0; color: #333; - font-family: 'League Gothic', Impact, sans-serif; - line-height: 0.9em; - letter-spacing: 0.02em; - - text-transform: uppercase; } .reveal h1 { diff --git a/css/theme/default.css b/css/theme/default.css index bd7caa7a..a937b8ef 100644 --- a/css/theme/default.css +++ b/css/theme/default.css @@ -5,7 +5,7 @@ */ /********************************************* - * FONT-FACE DEFINITIONS + * FONTS *********************************************/ @font-face { @@ -20,16 +20,32 @@ font-style: normal; } +.reveal { + font-family: 'Lato', Times, 'Times New Roman', serif; + font-size: 36px; + font-weight: 200; + letter-spacing: -0.02em; +} + +.reveal h1, +.reveal h2, +.reveal h3, +.reveal h4, +.reveal h5, +.reveal h6 { + font-family: 'League Gothic', Impact, sans-serif; + line-height: 0.9em; + letter-spacing: 0.02em; + + text-transform: uppercase; +} + /********************************************* * GLOBAL STYLES *********************************************/ body { - font-family: 'Lato', Times, 'Times New Roman', serif; - font-size: 36px; - font-weight: 200; - letter-spacing: -0.02em; color: #eee; background-image: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPHJhZGlhbEdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgY3g9IjUwJSIgY3k9IjUwJSIgcj0iNzUlIj4KICAgIDxzdG9wIG9mZnNldD0iMCUiIHN0b3AtY29sb3I9IiM1NTVhNWYiIHN0b3Atb3BhY2l0eT0iMSIvPgogICAgPHN0b3Agb2Zmc2V0PSIxMDAlIiBzdG9wLWNvbG9yPSIjMWMxZTIwIiBzdG9wLW9wYWNpdHk9IjEiLz4KICA8L3JhZGlhbEdyYWRpZW50PgogIDxyZWN0IHg9Ii01MCIgeT0iLTUwIiB3aWR0aD0iMTAxIiBoZWlnaHQ9IjEwMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+); @@ -55,11 +71,7 @@ body { .reveal h6 { margin: 0 0 20px 0; color: #eee; - font-family: 'League Gothic', Impact, sans-serif; - line-height: 0.9em; - letter-spacing: 0.02em; - - text-transform: uppercase; + text-shadow: 0px 0px 6px rgba(0,0,0,0.2); } diff --git a/css/theme/serif.css b/css/theme/serif.css index 47512fe0..690ff2d4 100644 --- a/css/theme/serif.css +++ b/css/theme/serif.css @@ -8,19 +8,32 @@ */ /********************************************* - * FONT-FACE DEFINITIONS + * FONTS *********************************************/ +.reveal { + font-family: 'Palatino Linotype', 'Book Antiqua', Palatino, FreeSerif, serif; + font-size: 36px; + font-weight: 200; + letter-spacing: -0.02em; +} + +.reveal h1, +.reveal h2, +.reveal h3, +.reveal h4, +.reveal h5, +.reveal h6 { + font-family: 'Palatino Linotype', 'Book Antiqua', Palatino, FreeSerif, serif; + line-height: 0.9em; +} + /********************************************* * GLOBAL STYLES *********************************************/ body { - font-family: 'Palatino Linotype', 'Book Antiqua', Palatino, FreeSerif, serif; - font-size: 36px; - font-weight: 200; - letter-spacing: -0.02em; color: black !important; background: #F0F1EB; @@ -51,8 +64,6 @@ body { .reveal h6 { margin: 0 0 40px 0; color: #383D3D; - font-family: 'Palatino Linotype', 'Book Antiqua', Palatino, FreeSerif, serif; - line-height: 0.9em; } /********************************************* diff --git a/css/theme/simple.css b/css/theme/simple.css index 16853be4..2d782ae2 100644 --- a/css/theme/simple.css +++ b/css/theme/simple.css @@ -8,21 +8,38 @@ */ /********************************************* - * FONT-FACE DEFINITIONS + * FONTS *********************************************/ @import url(http://fonts.googleapis.com/css?family=News+Cycle:400,700); +.reveal { + font-family: 'Lato', Times, 'Times New Roman', serif; + font-size: 36px; + font-weight: 200; + letter-spacing: -0.02em; +} + +.reveal h1, +.reveal h2, +.reveal h3, +.reveal h4, +.reveal h5, +.reveal h6 { + margin: 0 0 20px 0; + color: black; + font-family: 'News Cycle', Impact, sans-serif; + line-height: 0.9em; + + text-transform: uppercase; +} + /********************************************* * GLOBAL STYLES *********************************************/ body { - font-family: 'Lato', Times, 'Times New Roman', serif; - font-size: 36px; - font-weight: 200; - letter-spacing: -0.02em; color: black !important; background: white; @@ -53,10 +70,6 @@ body { .reveal h6 { margin: 0 0 20px 0; color: black; - font-family: 'News Cycle', Impact, sans-serif; - line-height: 0.9em; - - text-transform: uppercase; } diff --git a/css/theme/sky.css b/css/theme/sky.css index 92a91af1..71ebd2c7 100644 --- a/css/theme/sky.css +++ b/css/theme/sky.css @@ -5,12 +5,30 @@ */ /********************************************* - * FONT-FACE DEFINITIONS + * FONTS *********************************************/ @import url(http://fonts.googleapis.com/css?family=Quicksand:400,700,400italic,700italic); @import url(http://fonts.googleapis.com/css?family=Open+Sans:400italic,700italic,400,700); +.reveal { + font-family: 'Open Sans', sans-serif; + font-size: 36px; + font-weight: 200; + letter-spacing: -0.02em; +} + +.reveal h1, +.reveal h2, +.reveal h3, +.reveal h4, +.reveal h5, +.reveal h6 { + font-family: 'Quicksand', sans-serif; + line-height: 0.9em; + letter-spacing: -0.08em; + text-transform: uppercase; +} /********************************************* @@ -18,10 +36,6 @@ *********************************************/ body { - font-family: 'Open Sans', sans-serif; - font-size: 36px; - font-weight: 200; - letter-spacing: -0.02em; color: #333; background: #f7fbfc; @@ -60,11 +74,6 @@ body { .reveal h6 { margin: 0 0 20px 0; color: #333; - font-family: 'Quicksand', sans-serif; - line-height: 0.9em; - letter-spacing: -0.08em; - - text-transform: uppercase; }