diff options
| author | Michael Howell <michael@notriddle.com> | 2023-09-13 15:08:45 -0700 |
|---|---|---|
| committer | Michael Howell <michael@notriddle.com> | 2023-09-15 07:40:17 -0700 |
| commit | 7e86fd61e83717fc23b6141d2ba728aefbe5e168 (patch) | |
| tree | f7000c35bcea979c3ad564f488dbdb6c97842486 /src/librustdoc/html/render | |
| parent | cbccf800b85541187b3a8a17359c94c802e99748 (diff) | |
| download | rust-7e86fd61e83717fc23b6141d2ba728aefbe5e168.tar.gz rust-7e86fd61e83717fc23b6141d2ba728aefbe5e168.zip | |
rustdoc: merge theme css into rustdoc.css
Based on https://github.com/rust-lang/rust/pull/115812#issuecomment-1717960119 Having them in separate files used to make more sense, before the migration to CSS variables made the theme files as small as they are nowadays. This is already how docs.rs and mdBook do it.
Diffstat (limited to 'src/librustdoc/html/render')
| -rw-r--r-- | src/librustdoc/html/render/context.rs | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/src/librustdoc/html/render/context.rs b/src/librustdoc/html/render/context.rs index 736b6d7ebfa..97714afaa45 100644 --- a/src/librustdoc/html/render/context.rs +++ b/src/librustdoc/html/render/context.rs @@ -107,8 +107,8 @@ pub(crate) struct SharedContext<'tcx> { pub(super) module_sorting: ModuleSorting, /// Additional CSS files to be added to the generated docs. pub(crate) style_files: Vec<StylePath>, - /// Suffix to be added on resource files (if suffix is "-v2" then "light.css" becomes - /// "light-v2.css"). + /// Suffix to add on resource files (if suffix is "-v2" then "search-index.js" becomes + /// "search-index-v2.js"). pub(crate) resource_suffix: String, /// Optional path string to be used to load static files on output pages. If not set, uses /// combinations of `../` to reach the documentation root. @@ -714,18 +714,9 @@ impl<'tcx> FormatRenderer<'tcx> for Context<'tcx> { You need to enable JavaScript be able to update your settings.\ </section>\ </noscript>\ - <script defer src=\"{static_root_path}{settings_js}\"></script>\ - <link rel=\"preload\" href=\"{static_root_path}{theme_light_css}\" \ - as=\"style\">\ - <link rel=\"preload\" href=\"{static_root_path}{theme_dark_css}\" \ - as=\"style\">\ - <link rel=\"preload\" href=\"{static_root_path}{theme_ayu_css}\" \ - as=\"style\">", + <script defer src=\"{static_root_path}{settings_js}\"></script>", static_root_path = page.get_static_root_path(), settings_js = static_files::STATIC_FILES.settings_js, - theme_light_css = static_files::STATIC_FILES.theme_light_css, - theme_dark_css = static_files::STATIC_FILES.theme_dark_css, - theme_ayu_css = static_files::STATIC_FILES.theme_ayu_css, ); // Pre-load all theme CSS files, so that switching feels seamless. // |