Skip to content

Commit

Permalink
Rollup merge of #99237 - GuillaumeGomez:rustdoc-css-cleanup, r=notriddle
Browse files Browse the repository at this point in the history
removed unused CSS and unused HTML IDs

I think that should cover most remaining unused CSS/HTML IDs.

r? `@notriddle`
  • Loading branch information
Dylan-DPC committed Jul 15, 2022
2 parents 7b63058 + 4580668 commit fe6062f
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 48 deletions.
2 changes: 0 additions & 2 deletions src/librustdoc/html/markdown.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1442,7 +1442,6 @@ static DEFAULT_ID_MAP: Lazy<FxHashMap<Cow<'static, str>, usize>> = Lazy::new(||
fn init_id_map() -> FxHashMap<Cow<'static, str>, usize> {
let mut map = FxHashMap::default();
// This is the list of IDs used in Javascript.
map.insert("help".into(), 1);
map.insert("settings".into(), 1);
map.insert("not-displayed".into(), 1);
map.insert("alternative-display".into(), 1);
Expand All @@ -1455,7 +1454,6 @@ fn init_id_map() -> FxHashMap<Cow<'static, str>, usize> {
map.insert("help-button".into(), 1);
map.insert("main-content".into(), 1);
map.insert("crate-search".into(), 1);
map.insert("render-detail".into(), 1);
map.insert("toggle-all-docs".into(), 1);
map.insert("all-types".into(), 1);
map.insert("default-settings".into(), 1);
Expand Down
3 changes: 1 addition & 2 deletions src/librustdoc/html/static/css/rustdoc.css
Original file line number Diff line number Diff line change
Expand Up @@ -1733,13 +1733,12 @@ details.rustdoc-toggle[open] > summary.hideme > span {
display: none;
}

details.undocumented[open] > summary::before,
details.rustdoc-toggle[open] > summary::before,
details.rustdoc-toggle[open] > summary.hideme::before {
background-image: /* AUTOREPLACE: */url("toggle-minus.svg");
}

details.undocumented > summary::before, details.rustdoc-toggle > summary::before {
details.rustdoc-toggle > summary::before {
background-image: /* AUTOREPLACE: */url("toggle-plus.svg");
}

Expand Down
17 changes: 2 additions & 15 deletions src/librustdoc/html/static/css/themes/ayu.css
Original file line number Diff line number Diff line change
Expand Up @@ -174,13 +174,11 @@ body.source .example-wrap pre.rust a {
}

details.rustdoc-toggle > summary.hideme > span,
details.rustdoc-toggle > summary::before,
details.undocumented > summary::before {
details.rustdoc-toggle > summary::before {
color: #999;
}

details.rustdoc-toggle > summary::before,
details.undocumented > summary::before {
details.rustdoc-toggle > summary::before {
filter: invert(100%);
}

Expand Down Expand Up @@ -218,17 +216,6 @@ details.undocumented > summary::before {
background: none;
}

#help > div {
background: #14191f;
box-shadow: 0px 6px 20px 0px black;
border: none;
border-radius: 4px;
}

#help span.bottom, #help span.top {
border-color: #5c6773;
}

.rightside,
.out-of-band {
color: grey;
Expand Down
20 changes: 2 additions & 18 deletions src/librustdoc/html/static/css/themes/dark.css
Original file line number Diff line number Diff line change
Expand Up @@ -148,13 +148,11 @@ body.source .example-wrap pre.rust a {
}

details.rustdoc-toggle > summary.hideme > span,
details.rustdoc-toggle > summary::before,
details.undocumented > summary::before {
details.rustdoc-toggle > summary::before {
color: #999;
}

details.rustdoc-toggle > summary::before,
details.undocumented > summary::before {
details.rustdoc-toggle > summary::before {
filter: invert(100%);
}

Expand All @@ -179,20 +177,6 @@ details.undocumented > summary::before {
.stab.portability { background: #F3DFFF; border-color: #b07bdb; color: #2f2f2f; }
.stab.portability > code { background: none; }

#help > div {
background: #4d4d4d;
border-color: #bfbfbf;
}

#help span.bottom, #help span.top {
border-color: #bfbfbf;
}

#help dt {
border-color: #bfbfbf;
background: rgba(0,0,0,0);
}

.rightside,
.out-of-band {
color: grey;
Expand Down
12 changes: 1 addition & 11 deletions src/librustdoc/html/static/css/themes/light.css
Original file line number Diff line number Diff line change
Expand Up @@ -140,8 +140,7 @@ body.source .example-wrap pre.rust a {
}

details.rustdoc-toggle > summary.hideme > span,
details.rustdoc-toggle > summary::before,
details.undocumented > summary::before {
details.rustdoc-toggle > summary::before {
color: #999;
}

Expand All @@ -161,15 +160,6 @@ details.undocumented > summary::before {
.stab.portability { background: #F3DFFF; border-color: #b07bdb; }
.stab.portability > code { background: none; }

#help > div {
background: #e9e9e9;
border-color: #bfbfbf;
}

#help span.bottom, #help span.top {
border-color: #bfbfbf;
}

.rightside,
.out-of-band {
color: grey;
Expand Down

0 comments on commit fe6062f

Please sign in to comment.