From f4ead96b1ff980db6bce104abaa202bdd1d3663c Mon Sep 17 00:00:00 2001 From: Hakim El Hattab Date: Mon, 26 May 2014 11:25:47 +0200 Subject: [PATCH] move paragraph styles to theme --- css/reveal.css | 5 ----- css/theme/beige.css | 10 ++++++++-- css/theme/blood.css | 9 ++++++++- css/theme/default.css | 10 ++++++++-- css/theme/moon.css | 10 ++++++++-- css/theme/night.css | 11 +++++++++-- css/theme/serif.css | 7 +++++++ css/theme/simple.css | 11 +++++++++-- css/theme/sky.css | 11 +++++++++-- css/theme/solarized.css | 10 ++++++++-- css/theme/template/theme.scss | 10 ++++++++++ 11 files changed, 84 insertions(+), 20 deletions(-) diff --git a/css/reveal.css b/css/reveal.css index 7f56e76..55f6a34 100644 --- a/css/reveal.css +++ b/css/reveal.css @@ -299,11 +299,6 @@ body { margin-left: 40px; } -.reveal p { - margin-bottom: 10px; - line-height: 1.2em; -} - .reveal q, .reveal blockquote { quotes: none; diff --git a/css/theme/beige.css b/css/theme/beige.css index 0c31929..55aaf22 100644 --- a/css/theme/beige.css +++ b/css/theme/beige.css @@ -1,16 +1,15 @@ -@import url(https://fonts.googleapis.com/css?family=Lato:400,700,400italic,700italic); /** * Beige theme for reveal.js. * * Copyright (C) 2011-2012 Hakim El Hattab, http://hakim.se */ +@import url(https://fonts.googleapis.com/css?family=Lato:400,700,400italic,700italic); @font-face { font-family: 'League Gothic'; src: url("../../lib/font/league_gothic-webfont.eot"); src: url("../../lib/font/league_gothic-webfont.eot?#iefix") format("embedded-opentype"), url("../../lib/font/league_gothic-webfont.woff") format("woff"), url("../../lib/font/league_gothic-webfont.ttf") format("truetype"), url("../../lib/font/league_gothic-webfont.svg#LeagueGothicRegular") format("svg"); font-weight: normal; font-style: normal; } - /********************************************* * GLOBAL STYLES *********************************************/ @@ -56,6 +55,13 @@ body { .reveal h1 { text-shadow: 0 1px 0 #cccccc, 0 2px 0 #c9c9c9, 0 3px 0 #bbbbbb, 0 4px 0 #b9b9b9, 0 5px 0 #aaaaaa, 0 6px 1px rgba(0, 0, 0, 0.1), 0 0 5px rgba(0, 0, 0, 0.1), 0 1px 3px rgba(0, 0, 0, 0.3), 0 3px 5px rgba(0, 0, 0, 0.2), 0 5px 10px rgba(0, 0, 0, 0.25), 0 20px 20px rgba(0, 0, 0, 0.15); } +/********************************************* + * OTHER + *********************************************/ +.reveal p { + margin-bottom: 10px; + line-height: 1.3; } + /********************************************* * LINKS *********************************************/ diff --git a/css/theme/blood.css b/css/theme/blood.css index 32a768a..658cb3d 100644 --- a/css/theme/blood.css +++ b/css/theme/blood.css @@ -1,4 +1,3 @@ -@import url(https://fonts.googleapis.com/css?family=Ubuntu:300,700,300italic,700italic); /** * Blood theme for reveal.js * Author: Walther http://github.com/Walther @@ -10,6 +9,7 @@ * For other themes, change $codeBackground accordingly. * */ +@import url(https://fonts.googleapis.com/css?family=Ubuntu:300,700,300italic,700italic); /********************************************* * GLOBAL STYLES *********************************************/ @@ -55,6 +55,13 @@ body { .reveal h1 { text-shadow: 0 1px 0 #cccccc, 0 2px 0 #c9c9c9, 0 3px 0 #bbbbbb, 0 4px 0 #b9b9b9, 0 5px 0 #aaaaaa, 0 6px 1px rgba(0, 0, 0, 0.1), 0 0 5px rgba(0, 0, 0, 0.1), 0 1px 3px rgba(0, 0, 0, 0.3), 0 3px 5px rgba(0, 0, 0, 0.2), 0 5px 10px rgba(0, 0, 0, 0.25), 0 20px 20px rgba(0, 0, 0, 0.15); } +/********************************************* + * OTHER + *********************************************/ +.reveal p { + margin-bottom: 10px; + line-height: 1.3; } + /********************************************* * LINKS *********************************************/ diff --git a/css/theme/default.css b/css/theme/default.css index da34170..7b197d4 100644 --- a/css/theme/default.css +++ b/css/theme/default.css @@ -1,16 +1,15 @@ -@import url(https://fonts.googleapis.com/css?family=Lato:400,700,400italic,700italic); /** * Default theme for reveal.js. * * Copyright (C) 2011-2012 Hakim El Hattab, http://hakim.se */ +@import url(https://fonts.googleapis.com/css?family=Lato:400,700,400italic,700italic); @font-face { font-family: 'League Gothic'; src: url("../../lib/font/league_gothic-webfont.eot"); src: url("../../lib/font/league_gothic-webfont.eot?#iefix") format("embedded-opentype"), url("../../lib/font/league_gothic-webfont.woff") format("woff"), url("../../lib/font/league_gothic-webfont.ttf") format("truetype"), url("../../lib/font/league_gothic-webfont.svg#LeagueGothicRegular") format("svg"); font-weight: normal; font-style: normal; } - /********************************************* * GLOBAL STYLES *********************************************/ @@ -56,6 +55,13 @@ body { .reveal h1 { text-shadow: 0 1px 0 #cccccc, 0 2px 0 #c9c9c9, 0 3px 0 #bbbbbb, 0 4px 0 #b9b9b9, 0 5px 0 #aaaaaa, 0 6px 1px rgba(0, 0, 0, 0.1), 0 0 5px rgba(0, 0, 0, 0.1), 0 1px 3px rgba(0, 0, 0, 0.3), 0 3px 5px rgba(0, 0, 0, 0.2), 0 5px 10px rgba(0, 0, 0, 0.25), 0 20px 20px rgba(0, 0, 0, 0.15); } +/********************************************* + * OTHER + *********************************************/ +.reveal p { + margin-bottom: 10px; + line-height: 1.3; } + /********************************************* * LINKS *********************************************/ diff --git a/css/theme/moon.css b/css/theme/moon.css index 0525420..01d410c 100644 --- a/css/theme/moon.css +++ b/css/theme/moon.css @@ -1,15 +1,14 @@ -@import url(https://fonts.googleapis.com/css?family=Lato:400,700,400italic,700italic); /** * Solarized Dark theme for reveal.js. * Author: Achim Staebler */ +@import url(https://fonts.googleapis.com/css?family=Lato:400,700,400italic,700italic); @font-face { font-family: 'League Gothic'; src: url("../../lib/font/league_gothic-webfont.eot"); src: url("../../lib/font/league_gothic-webfont.eot?#iefix") format("embedded-opentype"), url("../../lib/font/league_gothic-webfont.woff") format("woff"), url("../../lib/font/league_gothic-webfont.ttf") format("truetype"), url("../../lib/font/league_gothic-webfont.svg#LeagueGothicRegular") format("svg"); font-weight: normal; font-style: normal; } - /** * Solarized colors by Ethan Schoonover */ @@ -56,6 +55,13 @@ body { .reveal h1 { text-shadow: 0px 0px 6px rgba(0, 0, 0, 0.2); } +/********************************************* + * OTHER + *********************************************/ +.reveal p { + margin-bottom: 10px; + line-height: 1.3; } + /********************************************* * LINKS *********************************************/ diff --git a/css/theme/night.css b/css/theme/night.css index 25711db..d94bec1 100644 --- a/css/theme/night.css +++ b/css/theme/night.css @@ -1,10 +1,10 @@ -@import url(https://fonts.googleapis.com/css?family=Montserrat:700); -@import url(https://fonts.googleapis.com/css?family=Open+Sans:400,700,400italic,700italic); /** * Black theme for reveal.js. * * Copyright (C) 2011-2012 Hakim El Hattab, http://hakim.se */ +@import url(https://fonts.googleapis.com/css?family=Montserrat:700); +@import url(https://fonts.googleapis.com/css?family=Open+Sans:400,700,400italic,700italic); /********************************************* * GLOBAL STYLES *********************************************/ @@ -44,6 +44,13 @@ body { .reveal h1 { text-shadow: 0px 0px 6px rgba(0, 0, 0, 0.2); } +/********************************************* + * OTHER + *********************************************/ +.reveal p { + margin-bottom: 10px; + line-height: 1.3; } + /********************************************* * LINKS *********************************************/ diff --git a/css/theme/serif.css b/css/theme/serif.css index 93ee54f..a5ebcb1 100644 --- a/css/theme/serif.css +++ b/css/theme/serif.css @@ -46,6 +46,13 @@ body { .reveal h1 { text-shadow: 0px 0px 6px rgba(0, 0, 0, 0.2); } +/********************************************* + * OTHER + *********************************************/ +.reveal p { + margin-bottom: 10px; + line-height: 1.3; } + /********************************************* * LINKS *********************************************/ diff --git a/css/theme/simple.css b/css/theme/simple.css index 0237f24..4334171 100644 --- a/css/theme/simple.css +++ b/css/theme/simple.css @@ -1,5 +1,3 @@ -@import url(https://fonts.googleapis.com/css?family=News+Cycle:400,700); -@import url(https://fonts.googleapis.com/css?family=Lato:400,700,400italic,700italic); /** * A simple theme for reveal.js presentations, similar * to the default theme. The accent color is darkblue. @@ -7,6 +5,8 @@ * This theme is Copyright (C) 2012 Owen Versteeg, https://github.com/StereotypicalApps. It is MIT licensed. * reveal.js is Copyright (C) 2011-2012 Hakim El Hattab, http://hakim.se */ +@import url(https://fonts.googleapis.com/css?family=News+Cycle:400,700); +@import url(https://fonts.googleapis.com/css?family=Lato:400,700,400italic,700italic); /********************************************* * GLOBAL STYLES *********************************************/ @@ -46,6 +46,13 @@ body { .reveal h1 { text-shadow: 0px 0px 6px rgba(0, 0, 0, 0.2); } +/********************************************* + * OTHER + *********************************************/ +.reveal p { + margin-bottom: 10px; + line-height: 1.3; } + /********************************************* * LINKS *********************************************/ diff --git a/css/theme/sky.css b/css/theme/sky.css index a4f1d2a..febfdfe 100644 --- a/css/theme/sky.css +++ b/css/theme/sky.css @@ -1,10 +1,10 @@ -@import url(https://fonts.googleapis.com/css?family=Quicksand:400,700,400italic,700italic); -@import url(https://fonts.googleapis.com/css?family=Open+Sans:400italic,700italic,400,700); /** * Sky theme for reveal.js. * * Copyright (C) 2011-2012 Hakim El Hattab, http://hakim.se */ +@import url(https://fonts.googleapis.com/css?family=Quicksand:400,700,400italic,700italic); +@import url(https://fonts.googleapis.com/css?family=Open+Sans:400italic,700italic,400,700); .reveal a { line-height: 1.3em; } @@ -53,6 +53,13 @@ body { .reveal h1 { text-shadow: 0px 0px 6px rgba(0, 0, 0, 0.2); } +/********************************************* + * OTHER + *********************************************/ +.reveal p { + margin-bottom: 10px; + line-height: 1.3; } + /********************************************* * LINKS *********************************************/ diff --git a/css/theme/solarized.css b/css/theme/solarized.css index b632062..8c414c8 100644 --- a/css/theme/solarized.css +++ b/css/theme/solarized.css @@ -1,15 +1,14 @@ -@import url(https://fonts.googleapis.com/css?family=Lato:400,700,400italic,700italic); /** * Solarized Light theme for reveal.js. * Author: Achim Staebler */ +@import url(https://fonts.googleapis.com/css?family=Lato:400,700,400italic,700italic); @font-face { font-family: 'League Gothic'; src: url("../../lib/font/league_gothic-webfont.eot"); src: url("../../lib/font/league_gothic-webfont.eot?#iefix") format("embedded-opentype"), url("../../lib/font/league_gothic-webfont.woff") format("woff"), url("../../lib/font/league_gothic-webfont.ttf") format("truetype"), url("../../lib/font/league_gothic-webfont.svg#LeagueGothicRegular") format("svg"); font-weight: normal; font-style: normal; } - /** * Solarized colors by Ethan Schoonover */ @@ -56,6 +55,13 @@ body { .reveal h1 { text-shadow: 0px 0px 6px rgba(0, 0, 0, 0.2); } +/********************************************* + * OTHER + *********************************************/ +.reveal p { + margin-bottom: 10px; + line-height: 1.3; } + /********************************************* * LINKS *********************************************/ diff --git a/css/theme/template/theme.scss b/css/theme/template/theme.scss index 1e01763..10b4689 100644 --- a/css/theme/template/theme.scss +++ b/css/theme/template/theme.scss @@ -49,6 +49,16 @@ body { } +/********************************************* + * OTHER + *********************************************/ + +.reveal p { + margin-bottom: 10px; + line-height: 1.3; +} + + /********************************************* * LINKS *********************************************/