diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index ac3d15f7377..f3ae5d3fc48 100644 --- 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 index a1af7bdff2f..66c21501283 100644 --- 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 %} \ No newline at end of file diff --git a/api/sixtyfps-rs/Cargo.toml b/api/sixtyfps-rs/Cargo.toml index 8081f3bd383..127860e5c87 100644 --- 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 index 7eb947a3153..dae8bff499e 100644 --- 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 b/docs/resources/sixtyfps-docs-highlight.html similarity index 100% rename from docs/html/sixtyfps-docs-highlight.html rename to docs/resources/sixtyfps-docs-highlight.html diff --git a/docs/html/sixtyfps-docs-preview.html b/docs/resources/sixtyfps-docs-preview.html similarity index 100% rename from docs/html/sixtyfps-docs-preview.html rename to docs/resources/sixtyfps-docs-preview.html diff --git a/docs/tutorial/theme/head.hbs b/docs/tutorial/theme/head.hbs index c45c2bc9bfc..dddd620741e 120000 --- a/docs/tutorial/theme/head.hbs +++ b/docs/tutorial/theme/head.hbs @@ -1 +1 @@ -../../html/sixtyfps-docs-highlight.html \ No newline at end of file +../../resources/sixtyfps-docs-highlight.html \ No newline at end of file