diff --git a/css/theme/beige.css b/css/theme/beige.css index 72a6de4a..514427cd 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 700fd46b..7d3bee4f 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 2e8abc77..c6d07f69 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 5f0ef064..4817c18d 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 bef58a0b..583201a3 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 c31956c0..5564f538 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 571a1568..73dfecb0 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 3b9d7335..46ea04a0 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 a722adc7..e47e5b56 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 8217b8f8..912be56f 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 d470dfe6..4c5b647a 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 4efdf418..5fdb2fcb 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; } diff --git a/lib/font/league_gothic_license b/lib/font/league-gothic/LICENSE similarity index 100% rename from lib/font/league_gothic_license rename to lib/font/league-gothic/LICENSE diff --git a/lib/font/league-gothic/league-gothic.css b/lib/font/league-gothic/league-gothic.css new file mode 100644 index 00000000..44a33a14 --- /dev/null +++ b/lib/font/league-gothic/league-gothic.css @@ -0,0 +1,10 @@ +@font-face { + font-family: 'League Gothic'; + src: url('league-gothic.eot'); + src: url('league-gothic.eot?#iefix') format('embedded-opentype'), + url('league-gothic.woff') format('woff'), + url('league-gothic.ttf') format('truetype'); + + font-weight: normal; + font-style: normal; +} \ No newline at end of file diff --git a/lib/font/league_gothic-webfont.eot b/lib/font/league-gothic/league-gothic.eot similarity index 100% rename from lib/font/league_gothic-webfont.eot rename to lib/font/league-gothic/league-gothic.eot diff --git a/lib/font/league_gothic-webfont.ttf b/lib/font/league-gothic/league-gothic.ttf similarity index 100% rename from lib/font/league_gothic-webfont.ttf rename to lib/font/league-gothic/league-gothic.ttf diff --git a/lib/font/league_gothic-webfont.woff b/lib/font/league-gothic/league-gothic.woff similarity index 100% rename from lib/font/league_gothic-webfont.woff rename to lib/font/league-gothic/league-gothic.woff diff --git a/lib/font/source-sans-pro/LICENSE b/lib/font/source-sans-pro/LICENSE new file mode 100644 index 00000000..71b7a02a --- /dev/null +++ b/lib/font/source-sans-pro/LICENSE @@ -0,0 +1,45 @@ +SIL Open Font License + +Copyright 2010, 2012 Adobe Systems Incorporated (http://www.adobe.com/), with Reserved Font Name ‘Source’. All Rights Reserved. Source is a trademark of Adobe Systems Incorporated in the United States and/or other countries. + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: http://scripts.sil.org/OFL + +—————————————————————————————- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +—————————————————————————————- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide development of collaborative font projects, to support the font creation efforts of academic and linguistic communities, and to provide a free and open framework in which fonts may be shared and improved in partnership with others. + +The OFL allows the licensed fonts to be used, studied, modified and redistributed freely as long as they are not sold by themselves. The fonts, including any derivative works, can be bundled, embedded, redistributed and/or sold with any software provided that any reserved names are not used by derivative works. The fonts and derivatives, however, cannot be released under any other type of license. The requirement for fonts to remain under this license does not apply to any document created using the fonts or their derivatives. + +DEFINITIONS +“Font Software” refers to the set of files released by the Copyright Holder(s) under this license and clearly marked as such. This may include source files, build scripts and documentation. + +“Reserved Font Name” refers to any names specified as such after the copyright statement(s). + +“Original Version” refers to the collection of Font Software components as distributed by the Copyright Holder(s). + +“Modified Version” refers to any derivative made by adding to, deleting, or substituting—in part or in whole—any of the components of the Original Version, by changing formats or by porting the Font Software to a new environment. + +“Author” refers to any designer, engineer, programmer, technical writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining a copy of the Font Software, to use, study, copy, merge, embed, modify, redistribute, and sell modified and unmodified copies of the Font Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, redistributed and/or sold with any software, provided that each copy contains the above copyright notice and this license. These can be included either as stand-alone text files, human-readable headers or in the appropriate machine-readable metadata fields within text or binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font Name(s) unless explicit written permission is granted by the corresponding Copyright Holder. This restriction only applies to the primary font name as presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font Software shall not be used to promote, endorse or advertise any Modified Version, except to acknowledge the contribution(s) of the Copyright Holder(s) and the Author(s) or with their explicit written permission. + +5) The Font Software, modified or unmodified, in part or in whole, must be distributed entirely under this license, and must not be distributed under any other license. The requirement for fonts to remain under this license does not apply to any document created using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE. \ No newline at end of file diff --git a/lib/font/source-sans-pro/source-sans-pro-italic.eot b/lib/font/source-sans-pro/source-sans-pro-italic.eot new file mode 100755 index 00000000..32fe466b Binary files /dev/null and b/lib/font/source-sans-pro/source-sans-pro-italic.eot differ diff --git a/lib/font/source-sans-pro/source-sans-pro-italic.ttf b/lib/font/source-sans-pro/source-sans-pro-italic.ttf new file mode 100755 index 00000000..f9ac13ff Binary files /dev/null and b/lib/font/source-sans-pro/source-sans-pro-italic.ttf differ diff --git a/lib/font/source-sans-pro/source-sans-pro-italic.woff b/lib/font/source-sans-pro/source-sans-pro-italic.woff new file mode 100755 index 00000000..ceecbf17 Binary files /dev/null and b/lib/font/source-sans-pro/source-sans-pro-italic.woff differ diff --git a/lib/font/source-sans-pro/source-sans-pro-regular.eot b/lib/font/source-sans-pro/source-sans-pro-regular.eot new file mode 100755 index 00000000..4d29ddad Binary files /dev/null and b/lib/font/source-sans-pro/source-sans-pro-regular.eot differ diff --git a/lib/font/source-sans-pro/source-sans-pro-regular.ttf b/lib/font/source-sans-pro/source-sans-pro-regular.ttf new file mode 100755 index 00000000..00c833cd Binary files /dev/null and b/lib/font/source-sans-pro/source-sans-pro-regular.ttf differ diff --git a/lib/font/source-sans-pro/source-sans-pro-regular.woff b/lib/font/source-sans-pro/source-sans-pro-regular.woff new file mode 100755 index 00000000..630754ab Binary files /dev/null and b/lib/font/source-sans-pro/source-sans-pro-regular.woff differ diff --git a/lib/font/source-sans-pro/source-sans-pro-semibold.eot b/lib/font/source-sans-pro/source-sans-pro-semibold.eot new file mode 100755 index 00000000..1104e074 Binary files /dev/null and b/lib/font/source-sans-pro/source-sans-pro-semibold.eot differ diff --git a/lib/font/source-sans-pro/source-sans-pro-semibold.ttf b/lib/font/source-sans-pro/source-sans-pro-semibold.ttf new file mode 100755 index 00000000..6d0253da Binary files /dev/null and b/lib/font/source-sans-pro/source-sans-pro-semibold.ttf differ diff --git a/lib/font/source-sans-pro/source-sans-pro-semibold.woff b/lib/font/source-sans-pro/source-sans-pro-semibold.woff new file mode 100755 index 00000000..8888cf8d Binary files /dev/null and b/lib/font/source-sans-pro/source-sans-pro-semibold.woff differ diff --git a/lib/font/source-sans-pro/source-sans-pro-semibolditalic.eot b/lib/font/source-sans-pro/source-sans-pro-semibolditalic.eot new file mode 100755 index 00000000..cdf73343 Binary files /dev/null and b/lib/font/source-sans-pro/source-sans-pro-semibolditalic.eot differ diff --git a/lib/font/source-sans-pro/source-sans-pro-semibolditalic.ttf b/lib/font/source-sans-pro/source-sans-pro-semibolditalic.ttf new file mode 100755 index 00000000..56442992 Binary files /dev/null and b/lib/font/source-sans-pro/source-sans-pro-semibolditalic.ttf differ diff --git a/lib/font/source-sans-pro/source-sans-pro-semibolditalic.woff b/lib/font/source-sans-pro/source-sans-pro-semibolditalic.woff new file mode 100755 index 00000000..7c2d3c74 Binary files /dev/null and b/lib/font/source-sans-pro/source-sans-pro-semibolditalic.woff differ diff --git a/lib/font/source-sans-pro/source-sans-pro.css b/lib/font/source-sans-pro/source-sans-pro.css new file mode 100644 index 00000000..0707a4f8 --- /dev/null +++ b/lib/font/source-sans-pro/source-sans-pro.css @@ -0,0 +1,39 @@ +@font-face { + font-family: 'Source Sans Pro'; + src: url('source-sans-pro-regular.eot'); + src: url('source-sans-pro-regular.eot?#iefix') format('embedded-opentype'), + url('source-sans-pro-regular.woff') format('woff'), + url('source-sans-pro-regular.ttf') format('truetype'); + font-weight: normal; + font-style: normal; +} + +@font-face { + font-family: 'Source Sans Pro'; + src: url('source-sans-pro-italic.eot'); + src: url('source-sans-pro-italic.eot?#iefix') format('embedded-opentype'), + url('source-sans-pro-italic.woff') format('woff'), + url('source-sans-pro-italic.ttf') format('truetype'); + font-weight: normal; + font-style: italic; +} + +@font-face { + font-family: 'Source Sans Pro'; + src: url('source-sans-pro-semibold.eot'); + src: url('source-sans-pro-semibold.eot?#iefix') format('embedded-opentype'), + url('source-sans-pro-semibold.woff') format('woff'), + url('source-sans-pro-semibold.ttf') format('truetype'); + font-weight: 600; + font-style: normal; +} + +@font-face { + font-family: 'Source Sans Pro'; + src: url('source-sans-pro-semibolditalic.eot'); + src: url('source-sans-pro-semibolditalic.eot?#iefix') format('embedded-opentype'), + url('source-sans-pro-semibolditalic.woff') format('woff'), + url('source-sans-pro-semibolditalic.ttf') format('truetype'); + font-weight: 600; + font-style: italic; +} \ No newline at end of file