Visitar URL original
Merge pull request #2752 from michaelmior/css-paths · hakimel/reveal.js@5f7c945 · GitHub
Skip to content

Commit 5f7c945

Browse files
authored
Merge pull request #2752 from michaelmior/css-paths
Start relative paths in CSS with ./
2 parents b13c7b4 + a150d0c commit 5f7c945

14 files changed

Lines changed: 38 additions & 38 deletions

File tree

‎css/theme/source/beige.scss‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414

1515
// Include theme-specific fonts
16-
@import url(fonts/league-gothic/league-gothic.css);
16+
@import url(./fonts/league-gothic/league-gothic.css);
1717
@import url(https://fonts.googleapis.com/css?family=Lato:400,700,400italic,700italic);
1818

1919

@@ -36,4 +36,4 @@ $heading1TextShadow: 0 1px 0 #ccc, 0 2px 0 #c9c9c9, 0 3px 0 #bbb, 0 4px 0 #b9b9b
3636

3737
// Theme template ------------------------------
3838
@import "../template/theme";
39-
// ---------------------------------------------
39+
// ---------------------------------------------

‎css/theme/source/black.scss‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313

1414
// Include theme-specific fonts
15-
@import url(fonts/source-sans-pro/source-sans-pro.css);
15+
@import url(./fonts/source-sans-pro/source-sans-pro.css);
1616

1717

1818
// Override theme settings (see ../template/settings.scss)
@@ -46,4 +46,4 @@ section.has-light-background {
4646

4747
// Theme template ------------------------------
4848
@import "../template/theme";
49-
// ---------------------------------------------
49+
// ---------------------------------------------

‎css/theme/source/league.scss‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616

1717
// Include theme-specific fonts
18-
@import url(fonts/league-gothic/league-gothic.css);
18+
@import url(./fonts/league-gothic/league-gothic.css);
1919
@import url(https://fonts.googleapis.com/css?family=Lato:400,700,400italic,700italic);
2020

2121
// 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
3131

3232
// Theme template ------------------------------
3333
@import "../template/theme";
34-
// ---------------------------------------------
34+
// ---------------------------------------------

‎css/theme/source/moon.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313

1414
// Include theme-specific fonts
15-
@import url(fonts/league-gothic/league-gothic.css);
15+
@import url(./fonts/league-gothic/league-gothic.css);
1616
@import url(https://fonts.googleapis.com/css?family=Lato:400,700,400italic,700italic);
1717

1818
/**

‎css/theme/source/solarized.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313

1414
// Include theme-specific fonts
15-
@import url(fonts/league-gothic/league-gothic.css);
15+
@import url(./fonts/league-gothic/league-gothic.css);
1616
@import url(https://fonts.googleapis.com/css?family=Lato:400,700,400italic,700italic);
1717

1818

‎css/theme/source/white.scss‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313

1414
// Include theme-specific fonts
15-
@import url(fonts/source-sans-pro/source-sans-pro.css);
15+
@import url(./fonts/source-sans-pro/source-sans-pro.css);
1616

1717

1818
// Override theme settings (see ../template/settings.scss)
@@ -46,4 +46,4 @@ section.has-dark-background {
4646

4747
// Theme template ------------------------------
4848
@import "../template/theme";
49-
// ---------------------------------------------
49+
// ---------------------------------------------

‎dist/theme/beige.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*
44
* Copyright (C) 2011-2012 Hakim El Hattab, http://hakim.se
55
*/
6-
@import url(fonts/league-gothic/league-gothic.css);
6+
@import url(./fonts/league-gothic/league-gothic.css);
77
@import url(https://fonts.googleapis.com/css?family=Lato:400,700,400italic,700italic);
88
/*********************************************
99
* GLOBAL STYLES

‎dist/theme/black.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*
44
* By Hakim El Hattab, http://hakim.se
55
*/
6-
@import url(fonts/source-sans-pro/source-sans-pro.css);
6+
@import url(./fonts/source-sans-pro/source-sans-pro.css);
77
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 {
88
color: #222; }
99

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
@font-face {
22
font-family: 'League Gothic';
3-
src: url('league-gothic.eot');
4-
src: url('league-gothic.eot?#iefix') format('embedded-opentype'),
5-
url('league-gothic.woff') format('woff'),
6-
url('league-gothic.ttf') format('truetype');
3+
src: url('./league-gothic.eot');
4+
src: url('./league-gothic.eot?#iefix') format('embedded-opentype'),
5+
url('./league-gothic.woff') format('woff'),
6+
url('./league-gothic.ttf') format('truetype');
77

88
font-weight: normal;
99
font-style: normal;
10-
}
10+
}
Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,39 @@
11
@font-face {
22
font-family: 'Source Sans Pro';
3-
src: url('source-sans-pro-regular.eot');
4-
src: url('source-sans-pro-regular.eot?#iefix') format('embedded-opentype'),
5-
url('source-sans-pro-regular.woff') format('woff'),
6-
url('source-sans-pro-regular.ttf') format('truetype');
3+
src: url('./source-sans-pro-regular.eot');
4+
src: url('./source-sans-pro-regular.eot?#iefix') format('embedded-opentype'),
5+
url('./source-sans-pro-regular.woff') format('woff'),
6+
url('./source-sans-pro-regular.ttf') format('truetype');
77
font-weight: normal;
88
font-style: normal;
99
}
1010

1111
@font-face {
1212
font-family: 'Source Sans Pro';
13-
src: url('source-sans-pro-italic.eot');
14-
src: url('source-sans-pro-italic.eot?#iefix') format('embedded-opentype'),
15-
url('source-sans-pro-italic.woff') format('woff'),
16-
url('source-sans-pro-italic.ttf') format('truetype');
13+
src: url('./source-sans-pro-italic.eot');
14+
src: url('./source-sans-pro-italic.eot?#iefix') format('embedded-opentype'),
15+
url('./source-sans-pro-italic.woff') format('woff'),
16+
url('./source-sans-pro-italic.ttf') format('truetype');
1717
font-weight: normal;
1818
font-style: italic;
1919
}
2020

2121
@font-face {
2222
font-family: 'Source Sans Pro';
23-
src: url('source-sans-pro-semibold.eot');
24-
src: url('source-sans-pro-semibold.eot?#iefix') format('embedded-opentype'),
25-
url('source-sans-pro-semibold.woff') format('woff'),
26-
url('source-sans-pro-semibold.ttf') format('truetype');
23+
src: url('./source-sans-pro-semibold.eot');
24+
src: url('./source-sans-pro-semibold.eot?#iefix') format('embedded-opentype'),
25+
url('./source-sans-pro-semibold.woff') format('woff'),
26+
url('./source-sans-pro-semibold.ttf') format('truetype');
2727
font-weight: 600;
2828
font-style: normal;
2929
}
3030

3131
@font-face {
3232
font-family: 'Source Sans Pro';
33-
src: url('source-sans-pro-semibolditalic.eot');
34-
src: url('source-sans-pro-semibolditalic.eot?#iefix') format('embedded-opentype'),
35-
url('source-sans-pro-semibolditalic.woff') format('woff'),
36-
url('source-sans-pro-semibolditalic.ttf') format('truetype');
33+
src: url('./source-sans-pro-semibolditalic.eot');
34+
src: url('./source-sans-pro-semibolditalic.eot?#iefix') format('embedded-opentype'),
35+
url('./source-sans-pro-semibolditalic.woff') format('woff'),
36+
url('./source-sans-pro-semibolditalic.ttf') format('truetype');
3737
font-weight: 600;
3838
font-style: italic;
39-
}
39+
}

0 commit comments

Comments
 (0)