Cleanup: Move docs/html to docs/resources

task-jp · Jul 8, 2021 · be47f70 · be47f70
1 parent 6d964b9
commit be47f70
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -305,7 +305,7 @@ jobs:
       # allow deprecated warning because we are using nightly and some things might be deprecated in nightly
       # for which the stable alternative is not yet available
       RUSTFLAGS: -D warnings -W deprecated
-      RUSTDOCFLAGS: --html-in-header=/home/runner/work/sixtyfps/sixtyfps/docs/html/sixtyfps-docs-preview.html --html-in-header=/home/runner/work/sixtyfps/sixtyfps/docs/html/sixtyfps-docs-highlight.html -D warnings -W deprecated
+      RUSTDOCFLAGS: --html-in-header=/home/runner/work/sixtyfps/sixtyfps/docs/resources/sixtyfps-docs-preview.html --html-in-header=/home/runner/work/sixtyfps/sixtyfps/docs/resources/sixtyfps-docs-highlight.html -D warnings -W deprecated
       SIXTYFPS_NO_QT: 1
       CARGO_INCREMENTAL: false
       MDBOOK_VERSION: 0.4.10

diff --git a/api/sixtyfps-cpp/docs/_templates/layout.html b/api/sixtyfps-cpp/docs/_templates/layout.html
@@ -1,6 +1,6 @@
 {% extends "!layout.html" %}
 {% block scripts %}
 {{ super() }}
-{% include "../../../../docs/html/sixtyfps-docs-preview.html" %}
-{% include "../../../../docs/html/sixtyfps-docs-highlight.html" %}
+{% include "../../../../docs/resources/sixtyfps-docs-preview.html" %}
+{% include "../../../../docs/resources/sixtyfps-docs-highlight.html" %}
 {% endblock %}
diff --git a/api/sixtyfps-rs/Cargo.toml b/api/sixtyfps-rs/Cargo.toml
@@ -31,4 +31,4 @@ pin-weak = "1"
 rustc_version = "0.4"
 
 [package.metadata.docs.rs]
-rustdoc-args = [ "--html-in-header", "docs/html/sixtyfps-docs-preview.html", "--html-in-header", "docs/html/sixtyfps-docs-highlight.html" ]
+rustdoc-args = [ "--html-in-header", "docs/resources/sixtyfps-docs-preview.html", "--html-in-header", "docs/resources/sixtyfps-docs-highlight.html" ]
diff --git a/docs/building.md b/docs/building.md
@@ -125,7 +125,7 @@ html to the documentation with the `--html-in-header` rustdoc flag.
 Here is how to build the documentation to include preview of the .60 files.
 
 ```sh
-RUSTDOCFLAGS="--html-in-header=$PWD/docs/html/sixtyfps-docs-preview.html --html-in-header=$PWD/docs/html/sixtyfps-docs-highlight.html" cargo +nightly doc --no-deps
+RUSTDOCFLAGS="--html-in-header=$PWD/docs/resources/sixtyfps-docs-preview.html --html-in-header=$PWD/docs/resources/sixtyfps-docs-highlight.html" cargo +nightly doc --no-deps
 ```
 
 ### C++ doc

diff --git a/docs/html/sixtyfps-docs-highlight.html → docs/resources/sixtyfps-docs-highlight.html b/docs/html/sixtyfps-docs-highlight.html → docs/resources/sixtyfps-docs-highlight.html
diff --git a/docs/html/sixtyfps-docs-preview.html → docs/resources/sixtyfps-docs-preview.html b/docs/html/sixtyfps-docs-preview.html → docs/resources/sixtyfps-docs-preview.html
diff --git a/docs/tutorial/theme/head.hbs b/docs/tutorial/theme/head.hbs
@@ -1 +1 @@
-../../html/sixtyfps-docs-highlight.html
+../../resources/sixtyfps-docs-highlight.html
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		../../html/sixtyfps-docs-highlight.html
		../../resources/sixtyfps-docs-highlight.html