Merge pull request #2752 from michaelmior/css-paths
Start relative paths in CSS with ./
This commit is contained in:
commit
5f7c945dee
@ -13,7 +13,7 @@
|
||||
|
||||
|
||||
// Include theme-specific fonts
|
||||
@import url(fonts/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);
|
||||
|
||||
|
||||
@ -36,4 +36,4 @@ $heading1TextShadow: 0 1px 0 #ccc, 0 2px 0 #c9c9c9, 0 3px 0 #bbb, 0 4px 0 #b9b9b
|
||||
|
||||
// Theme template ------------------------------
|
||||
@import "../template/theme";
|
||||
// ---------------------------------------------
|
||||
// ---------------------------------------------
|
||||
|
@ -12,7 +12,7 @@
|
||||
|
||||
|
||||
// Include theme-specific fonts
|
||||
@import url(fonts/source-sans-pro/source-sans-pro.css);
|
||||
@import url(./fonts/source-sans-pro/source-sans-pro.css);
|
||||
|
||||
|
||||
// Override theme settings (see ../template/settings.scss)
|
||||
@ -46,4 +46,4 @@ section.has-light-background {
|
||||
|
||||
// Theme template ------------------------------
|
||||
@import "../template/theme";
|
||||
// ---------------------------------------------
|
||||
// ---------------------------------------------
|
||||
|
@ -15,7 +15,7 @@
|
||||
|
||||
|
||||
// Include theme-specific fonts
|
||||
@import url(fonts/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)
|
||||
@ -31,4 +31,4 @@ $heading1TextShadow: 0 1px 0 #ccc, 0 2px 0 #c9c9c9, 0 3px 0 #bbb, 0 4px 0 #b9b9b
|
||||
|
||||
// Theme template ------------------------------
|
||||
@import "../template/theme";
|
||||
// ---------------------------------------------
|
||||
// ---------------------------------------------
|
||||
|
@ -12,7 +12,7 @@
|
||||
|
||||
|
||||
// Include theme-specific fonts
|
||||
@import url(fonts/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);
|
||||
|
||||
/**
|
||||
|
@ -12,7 +12,7 @@
|
||||
|
||||
|
||||
// Include theme-specific fonts
|
||||
@import url(fonts/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);
|
||||
|
||||
|
||||
|
@ -12,7 +12,7 @@
|
||||
|
||||
|
||||
// Include theme-specific fonts
|
||||
@import url(fonts/source-sans-pro/source-sans-pro.css);
|
||||
@import url(./fonts/source-sans-pro/source-sans-pro.css);
|
||||
|
||||
|
||||
// Override theme settings (see ../template/settings.scss)
|
||||
@ -46,4 +46,4 @@ section.has-dark-background {
|
||||
|
||||
// Theme template ------------------------------
|
||||
@import "../template/theme";
|
||||
// ---------------------------------------------
|
||||
// ---------------------------------------------
|
||||
|
2
dist/theme/beige.css
vendored
2
dist/theme/beige.css
vendored
@ -3,7 +3,7 @@
|
||||
*
|
||||
* Copyright (C) 2011-2012 Hakim El Hattab, http://hakim.se
|
||||
*/
|
||||
@import url(fonts/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
|
||||
|
2
dist/theme/black.css
vendored
2
dist/theme/black.css
vendored
@ -3,7 +3,7 @@
|
||||
*
|
||||
* By Hakim El Hattab, http://hakim.se
|
||||
*/
|
||||
@import url(fonts/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; }
|
||||
|
||||
|
10
dist/theme/fonts/league-gothic/league-gothic.css
vendored
10
dist/theme/fonts/league-gothic/league-gothic.css
vendored
@ -1,10 +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');
|
||||
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;
|
||||
}
|
||||
}
|
||||
|
@ -1,39 +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');
|
||||
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');
|
||||
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');
|
||||
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');
|
||||
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;
|
||||
}
|
||||
}
|
||||
|
2
dist/theme/league.css
vendored
2
dist/theme/league.css
vendored
@ -5,7 +5,7 @@
|
||||
*
|
||||
* Copyright (C) 2011-2012 Hakim El Hattab, http://hakim.se
|
||||
*/
|
||||
@import url(fonts/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
|
||||
|
2
dist/theme/moon.css
vendored
2
dist/theme/moon.css
vendored
@ -2,7 +2,7 @@
|
||||
* Solarized Dark theme for reveal.js.
|
||||
* Author: Achim Staebler
|
||||
*/
|
||||
@import url(fonts/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
|
||||
|
2
dist/theme/solarized.css
vendored
2
dist/theme/solarized.css
vendored
@ -2,7 +2,7 @@
|
||||
* Solarized Light theme for reveal.js.
|
||||
* Author: Achim Staebler
|
||||
*/
|
||||
@import url(fonts/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
|
||||
|
2
dist/theme/white.css
vendored
2
dist/theme/white.css
vendored
@ -3,7 +3,7 @@
|
||||
*
|
||||
* By Hakim El Hattab, http://hakim.se
|
||||
*/
|
||||
@import url(fonts/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; }
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user