Skip to content

Commit 3e414ed

Browse files
Varunramfelixmulder
authored andcommitted
Copy CDN css and js to local resources (#2469)
* Add local copy of CDNs to map * Move css and js CDN file to resources * Add missing resources and tests * Fix Missing js include
1 parent 8a9aedc commit 3e414ed

File tree

8 files changed

+41
-22
lines changed

8 files changed

+41
-22
lines changed

doc-tool/resources/_layouts/main.html

Lines changed: 7 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,18 @@
77

88
<title>{{ page.title }}</title>
99

10+
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
11+
1012
<link
1113
rel="stylesheet"
12-
href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.5/css/bootstrap.min.css"
13-
integrity="sha384-AysaV+vQoT3kOAXZkl02PThvDr8HYKPZhNT5h/CXfBThSRXQ6jW5DO2ekP5ViFdi"
14-
crossorigin="anonymous"
14+
href="{{ site.baseurl }}/css/bootstrap.min.css"
1515
>
1616

1717
<link
1818
rel="stylesheet"
19-
href="https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css"
19+
href="{{ site.baseurl }}/css/font-awesome.min.css"
2020
>
2121

22-
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
23-
2422
<link
2523
rel="stylesheet"
2624
href="{{ site.baseurl }}/css/dottydoc.css"
@@ -42,22 +40,10 @@
4240

4341
{{ content }}
4442

45-
<script
46-
src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"
47-
integrity="sha384-3ceskX3iaEnIogmQchP8opvBy3Mi7Ce34nWjpBIwVTHfGYWQS9jwHDVRnpKKHJg7"
48-
crossorigin="anonymous"
49-
></script>
50-
<script
51-
src="https://cdnjs.cloudflare.com/ajax/libs/tether/1.3.7/js/tether.min.js"
52-
integrity="sha384-XTs3FgkjiBgo8qjEjBk0tGmf3wPrWtA6coPfQDfFEY8AnYJwjalXCiosYRBIBZX8"
53-
crossorigin="anonymous"
54-
></script>
55-
<script
56-
src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.5/js/bootstrap.min.js"
57-
integrity="sha384-BLiI7JTZm+JWlgKa0M0kGRpJbF2J8q+qreVrKBC47e3K6BW78kGLrCkeRX6I9RoK"
58-
crossorigin="anonymous"
59-
></script>
43+
<script src="{{ site.baseurl }}/js/jquery.min.js"></script>
44+
<script src="{{ site.baseurl }}/js/tether.min.js"></script>
6045
<script src="{{ site.baseurl }}/js/highlight.pack.js"></script>
46+
<script src="{{ site.baseurl }}/js/bootstrap.min.js"></script>
6147
{% for js in page.extraJS %}
6248
<script src="{{ site.baseurl }}/{{ js }}"></script>
6349
{% endfor %}

doc-tool/resources/css/bootstrap.min.css

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

doc-tool/resources/css/font-awesome.min.css

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

doc-tool/resources/js/bootstrap.min.js

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

doc-tool/resources/js/jquery.min.js

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

doc-tool/resources/js/tether.min.js

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

doc-tool/src/dotty/tools/dottydoc/staticsite/Site.scala

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,11 @@ case class Site(val root: JFile, val projectTitle: String, val documentation: Ma
130130
"css/api-page.css" -> "/css/api-page.css",
131131
"css/dottydoc.css" -> "/css/dottydoc.css",
132132
"css/color-brewer.css" -> "/css/color-brewer.css",
133+
"css/font-awesome.min.css" -> "/css/font-awesome.min.css",
134+
"css/bootstrap.min.css" -> "/css/bootstrap.min.css",
135+
"js/bootstrap.min.js" -> "/js/bootstrap.min.js",
136+
"js/jquery.min.js" -> "/js/jquery.min.js",
137+
"js/tether.min.js" -> "/js/tether.min.js",
133138
"js/highlight.pack.js" -> "/js/highlight.pack.js"
134139
)
135140
.mapValues(getResource)

doc-tool/test/dotty/tools/dottydoc/staticsite/SiteTests.scala

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,12 @@ class SiteTests extends DottyDocTest with SourceFileOps {
8585
"css/api-page.css",
8686
"css/dottydoc.css",
8787
"css/color-brewer.css",
88-
"js/highlight.pack.js"
88+
"css/bootstrap.min.css",
89+
"css/font-awesome.min.css",
90+
"js/highlight.pack.js",
91+
"js/bootstrap.min.js",
92+
"js/tether.min.js",
93+
"js/jquery.min.js"
8994
)
9095
val expectedCompd = Set(
9196
// Directories starting in `_` are not included in compilable files

0 commit comments

Comments
 (0)