From 5e5013645d1f77eef9fbc9fe67246c6d99d20caa Mon Sep 17 00:00:00 2001 From: Hakim El Hattab Date: Tue, 19 May 2020 11:03:16 +0200 Subject: [PATCH] move fonts from lib/fonts to dist/theme/fonts --- css/theme/source/beige.scss | 2 +- css/theme/source/black.scss | 2 +- css/theme/source/league.scss | 2 +- css/theme/source/moon.scss | 2 +- css/theme/source/solarized.scss | 2 +- css/theme/source/white.scss | 2 +- dist/theme/beige.css | 2 +- dist/theme/black.css | 2 +- .../font => dist/theme/fonts}/league-gothic/LICENSE | 0 .../theme/fonts}/league-gothic/league-gothic.css | 0 .../theme/fonts}/league-gothic/league-gothic.eot | Bin .../theme/fonts}/league-gothic/league-gothic.ttf | Bin .../theme/fonts}/league-gothic/league-gothic.woff | Bin .../theme/fonts}/source-sans-pro/LICENSE | 0 .../source-sans-pro/source-sans-pro-italic.eot | Bin .../source-sans-pro/source-sans-pro-italic.ttf | Bin .../source-sans-pro/source-sans-pro-italic.woff | Bin .../source-sans-pro/source-sans-pro-regular.eot | Bin .../source-sans-pro/source-sans-pro-regular.ttf | Bin .../source-sans-pro/source-sans-pro-regular.woff | Bin .../source-sans-pro/source-sans-pro-semibold.eot | Bin .../source-sans-pro/source-sans-pro-semibold.ttf | Bin .../source-sans-pro/source-sans-pro-semibold.woff | Bin .../source-sans-pro-semibolditalic.eot | Bin .../source-sans-pro-semibolditalic.ttf | Bin .../source-sans-pro-semibolditalic.woff | Bin .../fonts}/source-sans-pro/source-sans-pro.css | 0 dist/theme/league.css | 2 +- dist/theme/moon.css | 2 +- dist/theme/solarized.css | 2 +- dist/theme/white.css | 2 +- 31 files changed, 12 insertions(+), 12 deletions(-) rename {lib/font => dist/theme/fonts}/league-gothic/LICENSE (100%) rename {lib/font => dist/theme/fonts}/league-gothic/league-gothic.css (100%) rename {lib/font => dist/theme/fonts}/league-gothic/league-gothic.eot (100%) rename {lib/font => dist/theme/fonts}/league-gothic/league-gothic.ttf (100%) rename {lib/font => dist/theme/fonts}/league-gothic/league-gothic.woff (100%) rename {lib/font => dist/theme/fonts}/source-sans-pro/LICENSE (100%) rename {lib/font => dist/theme/fonts}/source-sans-pro/source-sans-pro-italic.eot (100%) rename {lib/font => dist/theme/fonts}/source-sans-pro/source-sans-pro-italic.ttf (100%) rename {lib/font => dist/theme/fonts}/source-sans-pro/source-sans-pro-italic.woff (100%) rename {lib/font => dist/theme/fonts}/source-sans-pro/source-sans-pro-regular.eot (100%) rename {lib/font => dist/theme/fonts}/source-sans-pro/source-sans-pro-regular.ttf (100%) rename {lib/font => dist/theme/fonts}/source-sans-pro/source-sans-pro-regular.woff (100%) rename {lib/font => dist/theme/fonts}/source-sans-pro/source-sans-pro-semibold.eot (100%) rename {lib/font => dist/theme/fonts}/source-sans-pro/source-sans-pro-semibold.ttf (100%) rename {lib/font => dist/theme/fonts}/source-sans-pro/source-sans-pro-semibold.woff (100%) rename {lib/font => dist/theme/fonts}/source-sans-pro/source-sans-pro-semibolditalic.eot (100%) rename {lib/font => dist/theme/fonts}/source-sans-pro/source-sans-pro-semibolditalic.ttf (100%) rename {lib/font => dist/theme/fonts}/source-sans-pro/source-sans-pro-semibolditalic.woff (100%) rename {lib/font => dist/theme/fonts}/source-sans-pro/source-sans-pro.css (100%) diff --git a/css/theme/source/beige.scss b/css/theme/source/beige.scss index 5564f538..acdd37de 100644 --- a/css/theme/source/beige.scss +++ b/css/theme/source/beige.scss @@ -13,7 +13,7 @@ // Include theme-specific fonts -@import url(../../lib/font/league-gothic/league-gothic.css); +@import url(fonts/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 4720c8ab..45d26780 100644 --- a/css/theme/source/black.scss +++ b/css/theme/source/black.scss @@ -12,7 +12,7 @@ // Include theme-specific fonts -@import url(../../lib/font/source-sans-pro/source-sans-pro.css); +@import url(fonts/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 46ea04a0..95bacd42 100644 --- a/css/theme/source/league.scss +++ b/css/theme/source/league.scss @@ -15,7 +15,7 @@ // Include theme-specific fonts -@import url(../../lib/font/league-gothic/league-gothic.css); +@import url(fonts/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 e47e5b56..db1897c4 100644 --- a/css/theme/source/moon.scss +++ b/css/theme/source/moon.scss @@ -12,7 +12,7 @@ // Include theme-specific fonts -@import url(../../lib/font/league-gothic/league-gothic.css); +@import url(fonts/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 912be56f..df3a08fc 100644 --- a/css/theme/source/solarized.scss +++ b/css/theme/source/solarized.scss @@ -12,7 +12,7 @@ // Include theme-specific fonts -@import url(../../lib/font/league-gothic/league-gothic.css); +@import url(fonts/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 7f06ffd2..7b817fee 100644 --- a/css/theme/source/white.scss +++ b/css/theme/source/white.scss @@ -12,7 +12,7 @@ // Include theme-specific fonts -@import url(../../lib/font/source-sans-pro/source-sans-pro.css); +@import url(fonts/source-sans-pro/source-sans-pro.css); // Override theme settings (see ../template/settings.scss) diff --git a/dist/theme/beige.css b/dist/theme/beige.css index af10d176..e9511026 100644 --- a/dist/theme/beige.css +++ b/dist/theme/beige.css @@ -3,7 +3,7 @@ * * Copyright (C) 2011-2012 Hakim El Hattab, http://hakim.se */ -@import url(../../lib/font/league-gothic/league-gothic.css); +@import url(fonts/league-gothic/league-gothic.css); @import url(https://fonts.googleapis.com/css?family=Lato:400,700,400italic,700italic); /********************************************* * GLOBAL STYLES diff --git a/dist/theme/black.css b/dist/theme/black.css index 2dcbfb54..5946ff09 100644 --- a/dist/theme/black.css +++ b/dist/theme/black.css @@ -3,7 +3,7 @@ * * By Hakim El Hattab, http://hakim.se */ -@import url(../../lib/font/source-sans-pro/source-sans-pro.css); +@import url(fonts/source-sans-pro/source-sans-pro.css); section.has-light-background, section.has-light-background h1, section.has-light-background h2, section.has-light-background h3, section.has-light-background h4, section.has-light-background h5, section.has-light-background h6 { color: #222; } diff --git a/lib/font/league-gothic/LICENSE b/dist/theme/fonts/league-gothic/LICENSE similarity index 100% rename from lib/font/league-gothic/LICENSE rename to dist/theme/fonts/league-gothic/LICENSE diff --git a/lib/font/league-gothic/league-gothic.css b/dist/theme/fonts/league-gothic/league-gothic.css similarity index 100% rename from lib/font/league-gothic/league-gothic.css rename to dist/theme/fonts/league-gothic/league-gothic.css diff --git a/lib/font/league-gothic/league-gothic.eot b/dist/theme/fonts/league-gothic/league-gothic.eot similarity index 100% rename from lib/font/league-gothic/league-gothic.eot rename to dist/theme/fonts/league-gothic/league-gothic.eot diff --git a/lib/font/league-gothic/league-gothic.ttf b/dist/theme/fonts/league-gothic/league-gothic.ttf similarity index 100% rename from lib/font/league-gothic/league-gothic.ttf rename to dist/theme/fonts/league-gothic/league-gothic.ttf diff --git a/lib/font/league-gothic/league-gothic.woff b/dist/theme/fonts/league-gothic/league-gothic.woff similarity index 100% rename from lib/font/league-gothic/league-gothic.woff rename to dist/theme/fonts/league-gothic/league-gothic.woff diff --git a/lib/font/source-sans-pro/LICENSE b/dist/theme/fonts/source-sans-pro/LICENSE similarity index 100% rename from lib/font/source-sans-pro/LICENSE rename to dist/theme/fonts/source-sans-pro/LICENSE diff --git a/lib/font/source-sans-pro/source-sans-pro-italic.eot b/dist/theme/fonts/source-sans-pro/source-sans-pro-italic.eot similarity index 100% rename from lib/font/source-sans-pro/source-sans-pro-italic.eot rename to dist/theme/fonts/source-sans-pro/source-sans-pro-italic.eot diff --git a/lib/font/source-sans-pro/source-sans-pro-italic.ttf b/dist/theme/fonts/source-sans-pro/source-sans-pro-italic.ttf similarity index 100% rename from lib/font/source-sans-pro/source-sans-pro-italic.ttf rename to dist/theme/fonts/source-sans-pro/source-sans-pro-italic.ttf diff --git a/lib/font/source-sans-pro/source-sans-pro-italic.woff b/dist/theme/fonts/source-sans-pro/source-sans-pro-italic.woff similarity index 100% rename from lib/font/source-sans-pro/source-sans-pro-italic.woff rename to dist/theme/fonts/source-sans-pro/source-sans-pro-italic.woff diff --git a/lib/font/source-sans-pro/source-sans-pro-regular.eot b/dist/theme/fonts/source-sans-pro/source-sans-pro-regular.eot similarity index 100% rename from lib/font/source-sans-pro/source-sans-pro-regular.eot rename to dist/theme/fonts/source-sans-pro/source-sans-pro-regular.eot diff --git a/lib/font/source-sans-pro/source-sans-pro-regular.ttf b/dist/theme/fonts/source-sans-pro/source-sans-pro-regular.ttf similarity index 100% rename from lib/font/source-sans-pro/source-sans-pro-regular.ttf rename to dist/theme/fonts/source-sans-pro/source-sans-pro-regular.ttf diff --git a/lib/font/source-sans-pro/source-sans-pro-regular.woff b/dist/theme/fonts/source-sans-pro/source-sans-pro-regular.woff similarity index 100% rename from lib/font/source-sans-pro/source-sans-pro-regular.woff rename to dist/theme/fonts/source-sans-pro/source-sans-pro-regular.woff diff --git a/lib/font/source-sans-pro/source-sans-pro-semibold.eot b/dist/theme/fonts/source-sans-pro/source-sans-pro-semibold.eot similarity index 100% rename from lib/font/source-sans-pro/source-sans-pro-semibold.eot rename to dist/theme/fonts/source-sans-pro/source-sans-pro-semibold.eot diff --git a/lib/font/source-sans-pro/source-sans-pro-semibold.ttf b/dist/theme/fonts/source-sans-pro/source-sans-pro-semibold.ttf similarity index 100% rename from lib/font/source-sans-pro/source-sans-pro-semibold.ttf rename to dist/theme/fonts/source-sans-pro/source-sans-pro-semibold.ttf diff --git a/lib/font/source-sans-pro/source-sans-pro-semibold.woff b/dist/theme/fonts/source-sans-pro/source-sans-pro-semibold.woff similarity index 100% rename from lib/font/source-sans-pro/source-sans-pro-semibold.woff rename to dist/theme/fonts/source-sans-pro/source-sans-pro-semibold.woff diff --git a/lib/font/source-sans-pro/source-sans-pro-semibolditalic.eot b/dist/theme/fonts/source-sans-pro/source-sans-pro-semibolditalic.eot similarity index 100% rename from lib/font/source-sans-pro/source-sans-pro-semibolditalic.eot rename to dist/theme/fonts/source-sans-pro/source-sans-pro-semibolditalic.eot diff --git a/lib/font/source-sans-pro/source-sans-pro-semibolditalic.ttf b/dist/theme/fonts/source-sans-pro/source-sans-pro-semibolditalic.ttf similarity index 100% rename from lib/font/source-sans-pro/source-sans-pro-semibolditalic.ttf rename to dist/theme/fonts/source-sans-pro/source-sans-pro-semibolditalic.ttf diff --git a/lib/font/source-sans-pro/source-sans-pro-semibolditalic.woff b/dist/theme/fonts/source-sans-pro/source-sans-pro-semibolditalic.woff similarity index 100% rename from lib/font/source-sans-pro/source-sans-pro-semibolditalic.woff rename to dist/theme/fonts/source-sans-pro/source-sans-pro-semibolditalic.woff diff --git a/lib/font/source-sans-pro/source-sans-pro.css b/dist/theme/fonts/source-sans-pro/source-sans-pro.css similarity index 100% rename from lib/font/source-sans-pro/source-sans-pro.css rename to dist/theme/fonts/source-sans-pro/source-sans-pro.css diff --git a/dist/theme/league.css b/dist/theme/league.css index abf28466..4645edef 100644 --- a/dist/theme/league.css +++ b/dist/theme/league.css @@ -5,7 +5,7 @@ * * Copyright (C) 2011-2012 Hakim El Hattab, http://hakim.se */ -@import url(../../lib/font/league-gothic/league-gothic.css); +@import url(fonts/league-gothic/league-gothic.css); @import url(https://fonts.googleapis.com/css?family=Lato:400,700,400italic,700italic); /********************************************* * GLOBAL STYLES diff --git a/dist/theme/moon.css b/dist/theme/moon.css index cc005e35..760a800f 100644 --- a/dist/theme/moon.css +++ b/dist/theme/moon.css @@ -2,7 +2,7 @@ * Solarized Dark theme for reveal.js. * Author: Achim Staebler */ -@import url(../../lib/font/league-gothic/league-gothic.css); +@import url(fonts/league-gothic/league-gothic.css); @import url(https://fonts.googleapis.com/css?family=Lato:400,700,400italic,700italic); /** * Solarized colors by Ethan Schoonover diff --git a/dist/theme/solarized.css b/dist/theme/solarized.css index 5b6f0859..95af672e 100644 --- a/dist/theme/solarized.css +++ b/dist/theme/solarized.css @@ -2,7 +2,7 @@ * Solarized Light theme for reveal.js. * Author: Achim Staebler */ -@import url(../../lib/font/league-gothic/league-gothic.css); +@import url(fonts/league-gothic/league-gothic.css); @import url(https://fonts.googleapis.com/css?family=Lato:400,700,400italic,700italic); /** * Solarized colors by Ethan Schoonover diff --git a/dist/theme/white.css b/dist/theme/white.css index 03348e8b..12134a31 100644 --- a/dist/theme/white.css +++ b/dist/theme/white.css @@ -3,7 +3,7 @@ * * By Hakim El Hattab, http://hakim.se */ -@import url(../../lib/font/source-sans-pro/source-sans-pro.css); +@import url(fonts/source-sans-pro/source-sans-pro.css); 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; }