Skip to content

Commit 1970d25

Browse files
notriddlenotriddle
committed
rustdoc: merge theme css into rustdoc.css
Based on #115812 (comment) 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.
1 parent eb2446a commit 1970d25

File tree

19 files changed

+790
-446
lines changed

19 files changed

+790
-446
lines changed

‎src/bootstrap/test.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -846,7 +846,7 @@ impl Step for RustdocTheme {
846846
let rustdoc = builder.bootstrap_out.join("rustdoc");
847847
let mut cmd = builder.tool_cmd(Tool::RustdocTheme);
848848
cmd.arg(rustdoc.to_str().unwrap())
849-
.arg(builder.src.join("src/librustdoc/html/static/css/themes").to_str().unwrap())
849+
.arg(builder.src.join("src/librustdoc/html/static/css/rustdoc.css").to_str().unwrap())
850850
.env("RUSTC_STAGE", self.compiler.stage.to_string())
851851
.env("RUSTC_SYSROOT", builder.sysroot(self.compiler))
852852
.env("RUSTDOC_LIBDIR", builder.sysroot_libdir(self.compiler, self.compiler.host))

‎src/librustdoc/config.rs

+18-6
Original file line numberDiff line numberDiff line change
@@ -410,9 +410,15 @@ impl Options {
410410

411411
let to_check = matches.opt_strs("check-theme");
412412
if !to_check.is_empty() {
413-
let paths = match theme::load_css_paths(
414-
std::str::from_utf8(static_files::STATIC_FILES.theme_light_css.bytes).unwrap(),
415-
) {
413+
let mut content =
414+
std::str::from_utf8(static_files::STATIC_FILES.rustdoc_css.bytes).unwrap();
415+
if let Some((_, inside)) = content.split_once("/* Begin theme: light */") {
416+
content = inside;
417+
}
418+
if let Some((inside, _)) = content.split_once("/* End theme: light */") {
419+
content = inside;
420+
}
421+
let paths = match theme::load_css_paths(content) {
416422
Ok(p) => p,
417423
Err(e) => {
418424
diag.struct_err(e).emit();
@@ -550,9 +556,15 @@ impl Options {
550556

551557
let mut themes = Vec::new();
552558
if matches.opt_present("theme") {
553-
let paths = match theme::load_css_paths(
554-
std::str::from_utf8(static_files::STATIC_FILES.theme_light_css.bytes).unwrap(),
555-
) {
559+
let mut content =
560+
std::str::from_utf8(static_files::STATIC_FILES.rustdoc_css.bytes).unwrap();
561+
if let Some((_, inside)) = content.split_once("/* Begin theme: light */") {
562+
content = inside;
563+
}
564+
if let Some((inside, _)) = content.split_once("/* End theme: light */") {
565+
content = inside;
566+
}
567+
let paths = match theme::load_css_paths(content) {
556568
Ok(p) => p,
557569
Err(e) => {
558570
diag.struct_err(e).emit();

‎src/librustdoc/html/render/context.rs

+3-12
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,8 @@ pub(crate) struct SharedContext<'tcx> {
107107
pub(super) module_sorting: ModuleSorting,
108108
/// Additional CSS files to be added to the generated docs.
109109
pub(crate) style_files: Vec<StylePath>,
110-
/// Suffix to be added on resource files (if suffix is "-v2" then "light.css" becomes
111-
/// "light-v2.css").
110+
/// Suffix to add on resource files (if suffix is "-v2" then "search-index.js" becomes
111+
/// "search-index-v2.js").
112112
pub(crate) resource_suffix: String,
113113
/// Optional path string to be used to load static files on output pages. If not set, uses
114114
/// combinations of `../` to reach the documentation root.
@@ -714,18 +714,9 @@ impl<'tcx> FormatRenderer<'tcx> for Context<'tcx> {
714714
You need to enable JavaScript be able to update your settings.\
715715
</section>\
716716
</noscript>\
717-
<script defer src=\"{static_root_path}{settings_js}\"></script>\
718-
<link rel=\"preload\" href=\"{static_root_path}{theme_light_css}\" \
719-
as=\"style\">\
720-
<link rel=\"preload\" href=\"{static_root_path}{theme_dark_css}\" \
721-
as=\"style\">\
722-
<link rel=\"preload\" href=\"{static_root_path}{theme_ayu_css}\" \
723-
as=\"style\">",
717+
<script defer src=\"{static_root_path}{settings_js}\"></script>",
724718
static_root_path = page.get_static_root_path(),
725719
settings_js = static_files::STATIC_FILES.settings_js,
726-
theme_light_css = static_files::STATIC_FILES.theme_light_css,
727-
theme_dark_css = static_files::STATIC_FILES.theme_dark_css,
728-
theme_ayu_css = static_files::STATIC_FILES.theme_ayu_css,
729720
);
730721
// Pre-load all theme CSS files, so that switching feels seamless.
731722
//

‎src/librustdoc/html/static/css/noscript.css

+213
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,216 @@ nav.sub {
2828
https://github.com/rust-lang/rust/issues/102576 */
2929
display: none;
3030
}
31+
32+
/* Begin: styles for themes
33+
Keep the default light and dark themes synchronized with the ones
34+
in rustdoc.css */
35+
36+
/* Begin theme: light */
37+
:root {
38+
--main-background-color: white;
39+
--main-color: black;
40+
--settings-input-color: #2196f3;
41+
--settings-input-border-color: #717171;
42+
--settings-button-color: #000;
43+
--settings-button-border-focus: #717171;
44+
--sidebar-background-color: #f5f5f5;
45+
--sidebar-background-color-hover: #e0e0e0;
46+
--code-block-background-color: #f5f5f5;
47+
--scrollbar-track-background-color: #dcdcdc;
48+
--scrollbar-thumb-background-color: rgba(36, 37, 39, 0.6);
49+
--scrollbar-color: rgba(36, 37, 39, 0.6) #d9d9d9;
50+
--headings-border-bottom-color: #ddd;
51+
--border-color: #e0e0e0;
52+
--button-background-color: #fff;
53+
--right-side-color: grey;
54+
--code-attribute-color: #999;
55+
--toggles-color: #999;
56+
--toggle-filter: none;
57+
--search-input-focused-border-color: #66afe9;
58+
--copy-path-button-color: #999;
59+
--copy-path-img-filter: invert(50%);
60+
--copy-path-img-hover-filter: invert(35%);
61+
--codeblock-error-hover-color: rgb(255, 0, 0);
62+
--codeblock-error-color: rgba(255, 0, 0, .5);
63+
--codeblock-ignore-hover-color: rgb(255, 142, 0);
64+
--codeblock-ignore-color: rgba(255, 142, 0, .6);
65+
--warning-border-color: #ff8e00;
66+
--type-link-color: #ad378a;
67+
--trait-link-color: #6e4fc9;
68+
--assoc-item-link-color: #3873ad;
69+
--function-link-color: #ad7c37;
70+
--macro-link-color: #068000;
71+
--keyword-link-color: #3873ad;
72+
--mod-link-color: #3873ad;
73+
--link-color: #3873ad;
74+
--sidebar-link-color: #356da4;
75+
--sidebar-current-link-background-color: #fff;
76+
--search-result-link-focus-background-color: #ccc;
77+
--search-result-border-color: #aaa3;
78+
--search-color: #000;
79+
--search-error-code-background-color: #d0cccc;
80+
--search-results-alias-color: #000;
81+
--search-results-grey-color: #999;
82+
--search-tab-title-count-color: #888;
83+
--search-tab-button-not-selected-border-top-color: #e6e6e6;
84+
--search-tab-button-not-selected-background: #e6e6e6;
85+
--search-tab-button-selected-border-top-color: #0089ff;
86+
--search-tab-button-selected-background: #fff;
87+
--stab-background-color: #fff5d6;
88+
--stab-code-color: #000;
89+
--code-highlight-kw-color: #8959a8;
90+
--code-highlight-kw-2-color: #4271ae;
91+
--code-highlight-lifetime-color: #b76514;
92+
--code-highlight-prelude-color: #4271ae;
93+
--code-highlight-prelude-val-color: #c82829;
94+
--code-highlight-number-color: #718c00;
95+
--code-highlight-string-color: #718c00;
96+
--code-highlight-literal-color: #c82829;
97+
--code-highlight-attribute-color: #c82829;
98+
--code-highlight-self-color: #c82829;
99+
--code-highlight-macro-color: #3e999f;
100+
--code-highlight-question-mark-color: #ff9011;
101+
--code-highlight-comment-color: #8e908c;
102+
--code-highlight-doc-comment-color: #4d4d4c;
103+
--src-line-numbers-span-color: #c67e2d;
104+
--src-line-number-highlighted-background-color: #fdffd3;
105+
--test-arrow-color: #f5f5f5;
106+
--test-arrow-background-color: rgba(78, 139, 202, 0.2);
107+
--test-arrow-hover-color: #f5f5f5;
108+
--test-arrow-hover-background-color: rgb(78, 139, 202);
109+
--target-background-color: #fdffd3;
110+
--target-border-color: #ad7c37;
111+
--kbd-color: #000;
112+
--kbd-background: #fafbfc;
113+
--kbd-box-shadow-color: #c6cbd1;
114+
--rust-logo-filter: initial;
115+
/* match border-color; uses https://codepen.io/sosuke/pen/Pjoqqp */
116+
--crate-search-div-filter: invert(100%) sepia(0%) saturate(4223%) hue-rotate(289deg)
117+
brightness(114%) contrast(76%);
118+
--crate-search-div-hover-filter: invert(44%) sepia(18%) saturate(23%) hue-rotate(317deg)
119+
brightness(96%) contrast(93%);
120+
--crate-search-hover-border: #717171;
121+
--src-sidebar-background-selected: #fff;
122+
--src-sidebar-background-hover: #e0e0e0;
123+
--table-alt-row-background-color: #f5f5f5;
124+
--codeblock-link-background: #eee;
125+
--scrape-example-toggle-line-background: #ccc;
126+
--scrape-example-toggle-line-hover-background: #999;
127+
--scrape-example-code-line-highlight: #fcffd6;
128+
--scrape-example-code-line-highlight-focus: #f6fdb0;
129+
--scrape-example-help-border-color: #555;
130+
--scrape-example-help-color: #333;
131+
--scrape-example-help-hover-border-color: #000;
132+
--scrape-example-help-hover-color: #000;
133+
--scrape-example-code-wrapper-background-start: rgba(255, 255, 255, 1);
134+
--scrape-example-code-wrapper-background-end: rgba(255, 255, 255, 0);
135+
}
136+
/* End theme: light */
137+
138+
@media (prefers-color-scheme: dark) {
139+
/* Begin theme: dark */
140+
:root {
141+
--main-background-color: #353535;
142+
--main-color: #ddd;
143+
--settings-input-color: #2196f3;
144+
--settings-input-border-color: #999;
145+
--settings-button-color: #000;
146+
--settings-button-border-focus: #ffb900;
147+
--sidebar-background-color: #505050;
148+
--sidebar-background-color-hover: #676767;
149+
--code-block-background-color: #2A2A2A;
150+
--scrollbar-track-background-color: #717171;
151+
--scrollbar-thumb-background-color: rgba(32, 34, 37, .6);
152+
--scrollbar-color: rgba(32,34,37,.6) #5a5a5a;
153+
--headings-border-bottom-color: #d2d2d2;
154+
--border-color: #e0e0e0;
155+
--button-background-color: #f0f0f0;
156+
--right-side-color: grey;
157+
--code-attribute-color: #999;
158+
--toggles-color: #999;
159+
--toggle-filter: invert(100%);
160+
--search-input-focused-border-color: #008dfd;
161+
--copy-path-button-color: #999;
162+
--copy-path-img-filter: invert(50%);
163+
--copy-path-img-hover-filter: invert(65%);
164+
--codeblock-error-hover-color: rgb(255, 0, 0);
165+
--codeblock-error-color: rgba(255, 0, 0, .5);
166+
--codeblock-ignore-hover-color: rgb(255, 142, 0);
167+
--codeblock-ignore-color: rgba(255, 142, 0, .6);
168+
--warning-border-color: #ff8e00;
169+
--type-link-color: #2dbfb8;
170+
--trait-link-color: #b78cf2;
171+
--assoc-item-link-color: #d2991d;
172+
--function-link-color: #2bab63;
173+
--macro-link-color: #09bd00;
174+
--keyword-link-color: #d2991d;
175+
--mod-link-color: #d2991d;
176+
--link-color: #d2991d;
177+
--sidebar-link-color: #fdbf35;
178+
--sidebar-current-link-background-color: #444;
179+
--search-result-link-focus-background-color: #616161;
180+
--search-result-border-color: #aaa3;
181+
--search-color: #111;
182+
--search-error-code-background-color: #484848;
183+
--search-results-alias-color: #fff;
184+
--search-results-grey-color: #ccc;
185+
--search-tab-title-count-color: #888;
186+
--search-tab-button-not-selected-border-top-color: #252525;
187+
--search-tab-button-not-selected-background: #252525;
188+
--search-tab-button-selected-border-top-color: #0089ff;
189+
--search-tab-button-selected-background: #353535;
190+
--stab-background-color: #314559;
191+
--stab-code-color: #e6e1cf;
192+
--code-highlight-kw-color: #ab8ac1;
193+
--code-highlight-kw-2-color: #769acb;
194+
--code-highlight-lifetime-color: #d97f26;
195+
--code-highlight-prelude-color: #769acb;
196+
--code-highlight-prelude-val-color: #ee6868;
197+
--code-highlight-number-color: #83a300;
198+
--code-highlight-string-color: #83a300;
199+
--code-highlight-literal-color: #ee6868;
200+
--code-highlight-attribute-color: #ee6868;
201+
--code-highlight-self-color: #ee6868;
202+
--code-highlight-macro-color: #3e999f;
203+
--code-highlight-question-mark-color: #ff9011;
204+
--code-highlight-comment-color: #8d8d8b;
205+
--code-highlight-doc-comment-color: #8ca375;
206+
--src-line-numbers-span-color: #3b91e2;
207+
--src-line-number-highlighted-background-color: #0a042f;
208+
--test-arrow-color: #dedede;
209+
--test-arrow-background-color: rgba(78, 139, 202, 0.2);
210+
--test-arrow-hover-color: #dedede;
211+
--test-arrow-hover-background-color: #4e8bca;
212+
--target-background-color: #494a3d;
213+
--target-border-color: #bb7410;
214+
--kbd-color: #000;
215+
--kbd-background: #fafbfc;
216+
--kbd-box-shadow-color: #c6cbd1;
217+
--rust-logo-filter: drop-shadow(1px 0 0px #fff)
218+
drop-shadow(0 1px 0 #fff)
219+
drop-shadow(-1px 0 0 #fff)
220+
drop-shadow(0 -1px 0 #fff);
221+
/* match border-color; uses https://codepen.io/sosuke/pen/Pjoqqp */
222+
--crate-search-div-filter: invert(94%) sepia(0%) saturate(721%) hue-rotate(255deg)
223+
brightness(90%) contrast(90%);
224+
--crate-search-div-hover-filter: invert(69%) sepia(60%) saturate(6613%) hue-rotate(184deg)
225+
brightness(100%) contrast(91%);
226+
--crate-search-hover-border: #2196f3;
227+
--src-sidebar-background-selected: #333;
228+
--src-sidebar-background-hover: #444;
229+
--table-alt-row-background-color: #2a2a2a;
230+
--codeblock-link-background: #333;
231+
--scrape-example-toggle-line-background: #999;
232+
--scrape-example-toggle-line-hover-background: #c5c5c5;
233+
--scrape-example-code-line-highlight: #5b3b01;
234+
--scrape-example-code-line-highlight-focus: #7c4b0f;
235+
--scrape-example-help-border-color: #aaa;
236+
--scrape-example-help-color: #eee;
237+
--scrape-example-help-hover-border-color: #fff;
238+
--scrape-example-help-hover-color: #fff;
239+
--scrape-example-code-wrapper-background-start: rgba(53, 53, 53, 1);
240+
--scrape-example-code-wrapper-background-end: rgba(53, 53, 53, 0);
241+
}
242+
/* End theme: dark */
243+
}

0 commit comments

Comments
 (0)