From: Hakim El Hattab Date: Tue, 7 Aug 2012 05:38:06 +0000 (-0400) Subject: remove duplicate fonts, tidy up font names (#103) X-Git-Tag: 2.0.0~42 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=03371937900da2e5a2f89a0c7b4bd0fbe34062de;p=reveal.js.git remove duplicate fonts, tidy up font names (#103) --- diff --git a/css/main.css b/css/main.css index d0b199c..cae560f 100644 --- a/css/main.css +++ b/css/main.css @@ -1,8 +1,11 @@ @charset "UTF-8"; + /** - * Main styles for reveal.js - * - * @author Hakim El Hattab + * reveal.js + * http://lab.hakim.se/reveal-js + * MIT licensed + * + * Copyright (C) 2011-2012 Hakim El Hattab, http://hakim.se */ @@ -12,11 +15,11 @@ @font-face { font-family: 'League Gothic'; - src: url('../lib/font/league_gothic-webfont-webfont.eot'); - src: url('../lib/font/league_gothic-webfont-webfont.eot?#iefix') format('embedded-opentype'), - url('../lib/font/league_gothic-webfont-webfont.woff') format('woff'), - url('../lib/font/league_gothic-webfont-webfont.ttf') format('truetype'), - url('../lib/font/league_gothic-webfont-webfont.svg#LeagueGothicRegular') format('svg'); + 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; diff --git a/lib/font/league_gothic-webfont-webfont.eot b/lib/font/league_gothic-webfont-webfont.eot deleted file mode 100644 index ff76c71..0000000 Binary files a/lib/font/league_gothic-webfont-webfont.eot and /dev/null differ diff --git a/lib/font/league_gothic-webfont-webfont.ttf b/lib/font/league_gothic-webfont-webfont.ttf deleted file mode 100644 index 80a3799..0000000 Binary files a/lib/font/league_gothic-webfont-webfont.ttf and /dev/null differ diff --git a/lib/font/league_gothic-webfont-webfont.svg b/lib/font/league_gothic-webfont.svg similarity index 100% rename from lib/font/league_gothic-webfont-webfont.svg rename to lib/font/league_gothic-webfont.svg diff --git a/lib/font/league_gothic-webfont-webfont.woff b/lib/font/league_gothic-webfont.woff similarity index 100% rename from lib/font/league_gothic-webfont-webfont.woff rename to lib/font/league_gothic-webfont.woff