Skip to content

Copy CDN css and js to local resources #2469

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
May 19, 2017
Merged

Copy CDN css and js to local resources #2469

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e90ed4e
Add local copy of CDNs to map
Varunram May 19, 2017
37b6926
Move css and js CDN file to resources
Varunram May 19, 2017
3b96d4e
Add missing resources and tests
Varunram May 19, 2017
60d302c
Fix Missing js include
Varunram May 19, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 7 additions & 21 deletions doc-tool/resources/_layouts/main.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,18 @@

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

<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">

<link
rel="stylesheet"
href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.5/css/bootstrap.min.css"
integrity="sha384-AysaV+vQoT3kOAXZkl02PThvDr8HYKPZhNT5h/CXfBThSRXQ6jW5DO2ekP5ViFdi"
crossorigin="anonymous"
href="{{ site.baseurl }}/css/bootstrap.min.css"
>

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

<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">

<link
rel="stylesheet"
href="{{ site.baseurl }}/css/dottydoc.css"
Expand All @@ -42,22 +40,10 @@

{{ content }}

<script
src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"
integrity="sha384-3ceskX3iaEnIogmQchP8opvBy3Mi7Ce34nWjpBIwVTHfGYWQS9jwHDVRnpKKHJg7"
crossorigin="anonymous"
></script>
<script
src="https://cdnjs.cloudflare.com/ajax/libs/tether/1.3.7/js/tether.min.js"
integrity="sha384-XTs3FgkjiBgo8qjEjBk0tGmf3wPrWtA6coPfQDfFEY8AnYJwjalXCiosYRBIBZX8"
crossorigin="anonymous"
></script>
<script
src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.5/js/bootstrap.min.js"
integrity="sha384-BLiI7JTZm+JWlgKa0M0kGRpJbF2J8q+qreVrKBC47e3K6BW78kGLrCkeRX6I9RoK"
crossorigin="anonymous"
></script>
<script src="{{ site.baseurl }}/js/jquery.min.js"></script>
<script src="{{ site.baseurl }}/js/tether.min.js"></script>
<script src="{{ site.baseurl }}/js/highlight.pack.js"></script>
<script src="{{ site.baseurl }}/js/bootstrap.min.js"></script>
{% for js in page.extraJS %}
<script src="{{ site.baseurl }}/{{ js }}"></script>
{% endfor %}
Expand Down
7 changes: 7 additions & 0 deletions doc-tool/resources/css/bootstrap.min.css
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions doc-tool/resources/css/font-awesome.min.css
View file
Open in desktop

Large diffs are not rendered by default.

7 changes: 7 additions & 0 deletions doc-tool/resources/js/bootstrap.min.js
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions doc-tool/resources/js/jquery.min.js
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions doc-tool/resources/js/tether.min.js
View file
Open in desktop

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions doc-tool/src/dotty/tools/dottydoc/staticsite/Site.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,11 @@ case class Site(val root: JFile, val projectTitle: String, val documentation: Ma
"css/api-page.css" -> "/css/api-page.css",
"css/dottydoc.css" -> "/css/dottydoc.css",
"css/color-brewer.css" -> "/css/color-brewer.css",
"css/font-awesome.min.css" -> "/css/font-awesome.min.css",
"css/bootstrap.min.css" -> "/css/bootstrap.min.css",
"js/bootstrap.min.js" -> "/js/bootstrap.min.js",
"js/jquery.min.js" -> "/js/jquery.min.js",
"js/tether.min.js" -> "/js/tether.min.js",
"js/highlight.pack.js" -> "/js/highlight.pack.js"
)
.mapValues(getResource)
Expand Down
7 changes: 6 additions & 1 deletion doc-tool/test/dotty/tools/dottydoc/staticsite/SiteTests.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,12 @@ class SiteTests extends DottyDocTest with SourceFileOps {
"css/api-page.css",
"css/dottydoc.css",
"css/color-brewer.css",
"js/highlight.pack.js"
"css/bootstrap.min.css",
"css/font-awesome.min.css",
"js/highlight.pack.js",
"js/bootstrap.min.js",
"js/tether.min.js",
"js/jquery.min.js"
)
val expectedCompd = Set(
// Directories starting in `_` are not included in compilable files
Expand Down