Skip to content

Commit 97cdf9c

Browse files
committed
rustdoc: make the toggle buttons look more like the big one
1 parent 4efacce commit 97cdf9c

File tree

3 files changed

+37
-13
lines changed

3 files changed

+37
-13
lines changed

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

+4
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,8 @@ nav.sub {
5454
--code-attribute-color: #999;
5555
--toggles-color: #999;
5656
--toggle-filter: none;
57+
--toggle-border: #ccc;
58+
--toggle-border-hover: #616161;
5759
--search-input-focused-border-color: #66afe9;
5860
--copy-path-button-color: #999;
5961
--copy-path-img-filter: invert(50%);
@@ -157,6 +159,8 @@ nav.sub {
157159
--code-attribute-color: #999;
158160
--toggles-color: #999;
159161
--toggle-filter: invert(100%);
162+
--toggle-border: grey;
163+
--toggle-border-hover: black;
160164
--search-input-focused-border-color: #008dfd;
161165
--copy-path-button-color: #999;
162166
--copy-path-img-filter: invert(50%);

src/librustdoc/html/static/css/rustdoc.css

+12-7
Original file line numberDiff line numberDiff line change
@@ -1601,16 +1601,15 @@ details.toggle > summary.hideme > span {
16011601

16021602
details.toggle > summary::before {
16031603
/* toggle plus */
1604-
background: url('data:image/svg+xml,<svg width="19" height="19" stroke="black" fill="none" \
1605-
xmlns="http://www.w3.org/2000/svg"><path d="M2.5 2.5h14v14h-14v-14.5" \
1606-
shape-rendering="crispEdges" stroke="grey"/><path d="M6 9.5h7M9.5 13.5V5.5"/></svg>') no-repeat top left;
1604+
background: url('data:image/svg+xml,<svg width="15" height="15" stroke="black" fill="none" \
1605+
xmlns="http://www.w3.org/2000/svg"><path d="M3 6.5h7M6.5 10.5V2.5"/></svg>') no-repeat top left;
16071606
content: "";
16081607
cursor: pointer;
1609-
width: 18px;
1610-
height: 18px;
1608+
width: 13px;
1609+
height: 13px;
1610+
border: solid 1px var(--toggle-border);
16111611
display: inline-block;
16121612
vertical-align: middle;
1613-
opacity: .5;
16141613
filter: var(--toggle-filter);
16151614
}
16161615

@@ -1636,7 +1635,7 @@ details.toggle > summary.hideme::after {
16361635

16371636
details.toggle > summary:focus-visible::before,
16381637
details.toggle > summary:hover::before {
1639-
opacity: 1;
1638+
border: solid 1px var(--toggle-border-hover);
16401639
}
16411640

16421641
details.toggle > summary:focus-visible::before {
@@ -2205,6 +2204,8 @@ in src-script.js
22052204
--code-attribute-color: #999;
22062205
--toggles-color: #999;
22072206
--toggle-filter: none;
2207+
--toggle-border: #ccc;
2208+
--toggle-border-hover: #616161;
22082209
--search-input-focused-border-color: #66afe9;
22092210
--copy-path-button-color: #999;
22102211
--copy-path-img-filter: invert(50%);
@@ -2307,6 +2308,8 @@ in src-script.js
23072308
--code-attribute-color: #999;
23082309
--toggles-color: #999;
23092310
--toggle-filter: invert(100%);
2311+
--toggle-border: grey;
2312+
--toggle-border-hover: black;
23102313
--search-input-focused-border-color: #008dfd;
23112314
--copy-path-button-color: #999;
23122315
--copy-path-img-filter: invert(50%);
@@ -2424,6 +2427,8 @@ Original by Dempfi (https://github.com/dempfi/ayu)
24242427
--code-attribute-color: #999;
24252428
--toggles-color: #999;
24262429
--toggle-filter: invert(100%);
2430+
--toggle-border: grey;
2431+
--toggle-border-hover: black;
24272432
--search-input-focused-border-color: #5c6773; /* Same as `--border-color`. */
24282433
--copy-path-button-color: #fff;
24292434
--copy-path-img-filter: invert(70%);

tests/rustdoc-gui/toggle-docs.goml

+21-6
Original file line numberDiff line numberDiff line change
@@ -49,27 +49,42 @@ assert-attribute: ("details.toggle", {"open": ""}, ALL)
4949
show-text: true
5050
define-function: (
5151
"check-color",
52-
(theme, filter),
52+
(theme, filter, border_color, border_color_hover),
5353
block {
5454
// Setting the theme.
5555
set-local-storage: {"rustdoc-theme": |theme|, "rustdoc-use-system-theme": "false"}
5656
// We reload the page so the local storage settings are being used.
5757
reload:
5858

5959
assert-css: ("details.toggle > summary::before", {
60-
"opacity": "0.5",
60+
"border-color": |border_color|,
6161
"filter": |filter|,
6262
}, ALL)
6363
move-cursor-to: "details.toggle summary"
6464
assert-css: ("details.toggle > summary:hover::before", {
65-
"opacity": "1",
65+
"border-color": |border_color_hover|,
6666
"filter": |filter|,
6767
})
6868
// moving the cursor somewhere else to not mess with next function calls.
6969
move-cursor-to: ".search-input"
7070
},
7171
)
7272

73-
call-function: ("check-color", {"theme": "ayu", "filter": "invert(1)"})
74-
call-function: ("check-color", {"theme": "dark", "filter": "invert(1)"})
75-
call-function: ("check-color", {"theme": "light", "filter": "none"})
73+
call-function: ("check-color", {
74+
"theme": "ayu",
75+
"filter": "invert(1)",
76+
"border_color": "#808080",
77+
"border_color_hover": "#000",
78+
})
79+
call-function: ("check-color", {
80+
"theme": "dark",
81+
"filter": "invert(1)",
82+
"border_color": "#808080",
83+
"border_color_hover": "#000",
84+
})
85+
call-function: ("check-color", {
86+
"theme": "light",
87+
"filter": "none",
88+
"border_color": "#ccc",
89+
"border_color_hover": "#616161",
90+
})

0 commit comments

Comments
 (0)