From 06ad3bf4c2692baf758c9ed3bd4b3bb8be1940c1 Mon Sep 17 00:00:00 2001 From: Hakim El Hattab Date: Tue, 6 Jan 2015 17:36:53 +0100 Subject: reorganize fonts, include source sans pro for offline use --- css/theme/beige.css | 8 +------- css/theme/black.css | 4 ++-- css/theme/league.css | 8 +------- css/theme/moon.css | 8 +------- css/theme/solarized.css | 8 +------- css/theme/source/beige.scss | 13 +------------ css/theme/source/black.scss | 4 ++-- css/theme/source/league.scss | 12 +----------- css/theme/source/moon.scss | 13 +------------ css/theme/source/solarized.scss | 13 +------------ css/theme/source/white.scss | 6 +++--- css/theme/white.css | 6 +++--- 12 files changed, 18 insertions(+), 85 deletions(-) (limited to 'css') diff --git a/css/theme/beige.css b/css/theme/beige.css index 72a6de4..514427c 100644 --- a/css/theme/beige.css +++ b/css/theme/beige.css @@ -1,16 +1,10 @@ +@import url(../../lib/font/league-gothic/league-gothic.css); @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 */ -@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 *********************************************/ diff --git a/css/theme/black.css b/css/theme/black.css index 700fd46..7d3bee4 100644 --- a/css/theme/black.css +++ b/css/theme/black.css @@ -1,6 +1,6 @@ -@import url(http://fonts.googleapis.com/css?family=Source+Sans+Pro:400,600,400italic,600italic&subset=latin,latin-ext); +@import url(../../lib/font/source-sans-pro/source-sans-pro.css); /** - * Black theme for reveal.js. + * Black theme for reveal.js. This is the opposite of the 'white' theme. * * Copyright (C) 2015 Hakim El Hattab, http://hakim.se */ diff --git a/css/theme/league.css b/css/theme/league.css index 2e8abc7..c6d07f6 100644 --- a/css/theme/league.css +++ b/css/theme/league.css @@ -1,3 +1,4 @@ +@import url(../../lib/font/league-gothic/league-gothic.css); @import url(https://fonts.googleapis.com/css?family=Lato:400,700,400italic,700italic); /** * League theme for reveal.js. @@ -6,13 +7,6 @@ * * Copyright (C) 2011-2012 Hakim El Hattab, http://hakim.se */ -@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'); - font-weight: normal; - font-style: normal; } - /********************************************* * GLOBAL STYLES *********************************************/ diff --git a/css/theme/moon.css b/css/theme/moon.css index 5f0ef06..4817c18 100644 --- a/css/theme/moon.css +++ b/css/theme/moon.css @@ -1,15 +1,9 @@ +@import url(../../lib/font/league-gothic/league-gothic.css); @import url(https://fonts.googleapis.com/css?family=Lato:400,700,400italic,700italic); /** * Solarized Dark theme for reveal.js. * Author: Achim Staebler */ -@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 */ diff --git a/css/theme/solarized.css b/css/theme/solarized.css index bef58a0..583201a 100644 --- a/css/theme/solarized.css +++ b/css/theme/solarized.css @@ -1,15 +1,9 @@ +@import url(../../lib/font/league-gothic/league-gothic.css); @import url(https://fonts.googleapis.com/css?family=Lato:400,700,400italic,700italic); /** * Solarized Light theme for reveal.js. * Author: Achim Staebler */ -@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 */ diff --git a/css/theme/source/beige.scss b/css/theme/source/beige.scss index c31956c..5564f53 100644 --- a/css/theme/source/beige.scss +++ b/css/theme/source/beige.scss @@ -13,18 +13,7 @@ // Include theme-specific fonts -@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; -} - +@import url(../../lib/font/league-gothic/league-gothic.css); @import url(https://fonts.googleapis.com/css?family=Lato:400,700,400italic,700italic); diff --git a/css/theme/source/black.scss b/css/theme/source/black.scss index 571a156..73dfecb 100644 --- a/css/theme/source/black.scss +++ b/css/theme/source/black.scss @@ -1,5 +1,5 @@ /** - * Black theme for reveal.js. + * Black theme for reveal.js. This is the opposite of the 'white' theme. * * Copyright (C) 2015 Hakim El Hattab, http://hakim.se */ @@ -12,7 +12,7 @@ // Include theme-specific fonts -@import url(http://fonts.googleapis.com/css?family=Source+Sans+Pro:400,600,400italic,600italic&subset=latin,latin-ext); +@import url(../../lib/font/source-sans-pro/source-sans-pro.css); // Override theme settings (see ../template/settings.scss) diff --git a/css/theme/source/league.scss b/css/theme/source/league.scss index 3b9d733..46ea04a 100644 --- a/css/theme/source/league.scss +++ b/css/theme/source/league.scss @@ -15,17 +15,7 @@ // Include theme-specific fonts -@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'); - - font-weight: normal; - font-style: normal; -} - +@import url(../../lib/font/league-gothic/league-gothic.css); @import url(https://fonts.googleapis.com/css?family=Lato:400,700,400italic,700italic); // Override theme settings (see ../template/settings.scss) diff --git a/css/theme/source/moon.scss b/css/theme/source/moon.scss index a722adc..e47e5b5 100644 --- a/css/theme/source/moon.scss +++ b/css/theme/source/moon.scss @@ -12,18 +12,7 @@ // Include theme-specific fonts -@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; -} - +@import url(../../lib/font/league-gothic/league-gothic.css); @import url(https://fonts.googleapis.com/css?family=Lato:400,700,400italic,700italic); /** diff --git a/css/theme/source/solarized.scss b/css/theme/source/solarized.scss index 8217b8f..912be56 100644 --- a/css/theme/source/solarized.scss +++ b/css/theme/source/solarized.scss @@ -12,18 +12,7 @@ // Include theme-specific fonts -@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; -} - +@import url(../../lib/font/league-gothic/league-gothic.css); @import url(https://fonts.googleapis.com/css?family=Lato:400,700,400italic,700italic); diff --git a/css/theme/source/white.scss b/css/theme/source/white.scss index d470dfe..4c5b647 100644 --- a/css/theme/source/white.scss +++ b/css/theme/source/white.scss @@ -1,7 +1,7 @@ /** - * White theme for reveal.js. + * White theme for reveal.js. This is the opposite of the 'black' theme. * - * Copyright (C) 2014 Hakim El Hattab, http://hakim.se + * Copyright (C) 2015 Hakim El Hattab, http://hakim.se */ @@ -12,7 +12,7 @@ // Include theme-specific fonts -@import url(http://fonts.googleapis.com/css?family=Source+Sans+Pro:400,600,400italic,600italic&subset=latin,latin-ext); +@import url(../../lib/font/source-sans-pro/source-sans-pro.css); // Override theme settings (see ../template/settings.scss) diff --git a/css/theme/white.css b/css/theme/white.css index 4efdf41..5fdb2fc 100644 --- a/css/theme/white.css +++ b/css/theme/white.css @@ -1,8 +1,8 @@ -@import url(http://fonts.googleapis.com/css?family=Source+Sans+Pro:400,600,400italic,600italic&subset=latin,latin-ext); +@import url(../../lib/font/source-sans-pro/source-sans-pro.css); /** - * White theme for reveal.js. + * White theme for reveal.js. This is the opposite of the 'black' theme. * - * Copyright (C) 2014 Hakim El Hattab, http://hakim.se + * Copyright (C) 2015 Hakim El Hattab, http://hakim.se */ section.has-dark-background, section.has-dark-background h1, section.has-dark-background h2, section.has-dark-background h3, section.has-dark-background h4, section.has-dark-background h5, section.has-dark-background h6 { color: #fff; } -- cgit v1.2.3