aboutsummaryrefslogtreecommitdiff
path: root/css/theme/source
diff options
context:
space:
mode:
authorHakim El Hattab <hakim.elhattab@gmail.com>2015-01-06 17:36:53 +0100
committerHakim El Hattab <hakim.elhattab@gmail.com>2015-01-06 17:37:14 +0100
commit06ad3bf4c2692baf758c9ed3bd4b3bb8be1940c1 (patch)
treef3ba716b173f712d6be37765e07c489654b54fc0 /css/theme/source
parent40f12acf2dc2996ab8db81f474e8903364e94d87 (diff)
downloadfreenode-live-2017-presentation-06ad3bf4c2692baf758c9ed3bd4b3bb8be1940c1.tar
freenode-live-2017-presentation-06ad3bf4c2692baf758c9ed3bd4b3bb8be1940c1.tar.gz
reorganize fonts, include source sans pro for offline use
Diffstat (limited to 'css/theme/source')
-rw-r--r--css/theme/source/beige.scss13
-rw-r--r--css/theme/source/black.scss4
-rw-r--r--css/theme/source/league.scss12
-rw-r--r--css/theme/source/moon.scss13
-rw-r--r--css/theme/source/solarized.scss13
-rw-r--r--css/theme/source/white.scss6
6 files changed, 9 insertions, 52 deletions
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)