Skip to content

Commit

Permalink
Merge pull request #2752 from michaelmior/css-paths
Browse files Browse the repository at this point in the history
Start relative paths in CSS with ./
  • Loading branch information
hakimel authored Sep 9, 2020
2 parents b13c7b4 + a150d0c commit 5f7c945
Show file tree
Hide file tree
Showing 14 changed files with 38 additions and 38 deletions.
4 changes: 2 additions & 2 deletions css/theme/source/beige.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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);


Expand All @@ -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";
// ---------------------------------------------
// ---------------------------------------------
4 changes: 2 additions & 2 deletions css/theme/source/black.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -46,4 +46,4 @@ section.has-light-background {

// Theme template ------------------------------
@import "../template/theme";
// ---------------------------------------------
// ---------------------------------------------
4 changes: 2 additions & 2 deletions css/theme/source/league.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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";
// ---------------------------------------------
// ---------------------------------------------
2 changes: 1 addition & 1 deletion css/theme/source/moon.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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);

/**
Expand Down
2 changes: 1 addition & 1 deletion css/theme/source/solarized.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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);


Expand Down
4 changes: 2 additions & 2 deletions css/theme/source/white.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -46,4 +46,4 @@ section.has-dark-background {

// Theme template ------------------------------
@import "../template/theme";
// ---------------------------------------------
// ---------------------------------------------
2 changes: 1 addition & 1 deletion dist/theme/beige.css
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion dist/theme/black.css
Original file line number Diff line number Diff line change
Expand Up @@ -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; }

Expand Down
10 changes: 5 additions & 5 deletions dist/theme/fonts/league-gothic/league-gothic.css
Original file line number Diff line number Diff line change
@@ -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;
}
}
34 changes: 17 additions & 17 deletions dist/theme/fonts/source-sans-pro/source-sans-pro.css
Original file line number Diff line number Diff line change
@@ -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 changes: 1 addition & 1 deletion dist/theme/league.css
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion dist/theme/moon.css
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion dist/theme/solarized.css
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion dist/theme/white.css
Original file line number Diff line number Diff line change
Expand Up @@ -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; }

Expand Down

0 comments on commit 5f7c945

Please sign in to comment.