Skip to content

Commit c9feda6

Browse files
authored
Unrolled build for rust-lang#123734
Rollup merge of rust-lang#123734 - GuillaumeGomez:inline-svg-into-css, r=notriddle Inline more svg images into CSS Follow-up of rust-lang#123706. r? `@notriddle`
2 parents ce609db + 5a3509c commit c9feda6

File tree

4 files changed

+29
-6
lines changed

4 files changed

+29
-6
lines changed

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

+29-2
Original file line numberDiff line numberDiff line change
@@ -1133,6 +1133,7 @@ so that we can apply CSS-filters to change the arrow color in themes */
11331133
.setting-check input:checked {
11341134
background-color: var(--settings-input-color);
11351135
border-width: 1px;
1136+
/* cross-mark image in the settings checkboxes */
11361137
content: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 40 40">\
11371138
<path d="M7,25L17,32L33,12" fill="none" stroke="black" stroke-width="5"/>\
11381139
<path d="M7,23L17,30L33,10" fill="none" stroke="white" stroke-width="5"/></svg>');
@@ -1608,12 +1609,26 @@ a.tooltip:hover::after {
16081609
font-size: 0;
16091610
}
16101611
#settings-menu > a:before {
1611-
content: url('wheel-63255fc4502dca9a.svg');
1612+
/* Wheel <https://www.svgrepo.com/svg/384069/settings-cog-gear> */
1613+
content: url('data:image/svg+xml,<svg width="22" height="22" viewBox="0 0 12 12" \
1614+
enable-background="new 0 0 12 12" xmlns="http://www.w3.org/2000/svg">\
1615+
<path d="M10.25,6c0-0.1243286-0.0261841-0.241333-0.0366211-0.362915l1.6077881-1.5545654l\
1616+
-1.25-2.1650391 c0,0-1.2674561,0.3625488-2.1323853,0.6099854c-0.2034912-0.1431885-0.421875\
1617+
-0.2639771-0.6494751-0.3701782L7.25,0h-2.5 c0,0-0.3214111,1.2857666-0.5393066,2.1572876\
1618+
C3.9830933,2.2634888,3.7647095,2.3842773,3.5612183,2.5274658L1.428833,1.9174805 \
1619+
l-1.25,2.1650391c0,0,0.9641113,0.9321899,1.6077881,1.5545654C1.7761841,5.758667,\
1620+
1.75,5.8756714,1.75,6 s0.0261841,0.241333,0.0366211,0.362915L0.178833,7.9174805l1.25,\
1621+
2.1650391l2.1323853-0.6099854 c0.2034912,0.1432495,0.421875,0.2639771,0.6494751,0.3701782\
1622+
L4.75,12h2.5l0.5393066-2.1572876 c0.2276001-0.1062012,0.4459839-0.2269287,0.6494751\
1623+
-0.3701782l2.1323853,0.6099854l1.25-2.1650391L10.2133789,6.362915 C10.2238159,6.241333,\
1624+
10.25,6.1243286,10.25,6z M6,7.5C5.1715698,7.5,4.5,6.8284302,4.5,6S5.1715698,4.5,6,4.5S7.5\
1625+
,5.1715698,7.5,6 S6.8284302,7.5,6,7.5z" fill="black"/></svg>');
16121626
width: 22px;
16131627
height: 22px;
16141628
}
16151629

16161630
#sidebar-button > a:before {
1631+
/* sidebar resizer image */
16171632
content: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 22" \
16181633
fill="none" stroke="black">\
16191634
<rect x="1" y="1" width="20" height="20" ry="1.5" stroke-width="1.5"/>\
@@ -1636,7 +1651,17 @@ a.tooltip:hover::after {
16361651
}
16371652
#copy-path::before {
16381653
filter: var(--copy-path-img-filter);
1639-
content: url('clipboard-24048e6d87f63d07.svg');
1654+
/* clipboard <https://github.com/rust-lang/crates.io/commits/main/public/assets/copy.svg> */
1655+
content: url('data:image/svg+xml,<svg width="19" height="18" viewBox="0 0 24 25" \
1656+
xmlns="http://www.w3.org/2000/svg" aria-label="Copy to clipboard">\
1657+
<path d="M18 20h2v3c0 1-1 2-2 2H2c-.998 0-2-1-2-2V5c0-.911.755-1.667 1.667-1.667h5A3.323 3.323 0 \
1658+
0110 0a3.323 3.323 0 013.333 3.333h5C19.245 3.333 20 4.09 20 5v8.333h-2V9H2v14h16v-3zM3 \
1659+
7h14c0-.911-.793-1.667-1.75-1.667H13.5c-.957 0-1.75-.755-1.75-1.666C11.75 2.755 10.957 2 10 \
1660+
2s-1.75.755-1.75 1.667c0 .911-.793 1.666-1.75 1.666H4.75C3.793 5.333 3 6.09 3 7z"/>\
1661+
<path d="M4 19h6v2H4zM12 11H4v2h8zM4 17h4v-2H4zM15 15v-3l-4.5 4.5L15 21v-3l8.027-.032L23 15z"/>\
1662+
</svg>');
1663+
width: 19px;
1664+
height: 18px;
16401665
}
16411666
#copy-path:hover::before {
16421667
filter: var(--copy-path-img-hover-filter);
@@ -1837,6 +1862,7 @@ However, it's not needed with smaller screen width because the doc/code block is
18371862
/* sidebar button opens modal
18381863
use hamburger button */
18391864
.src #sidebar-button > a:before, .sidebar-menu-toggle:before {
1865+
/* hamburger button image */
18401866
content: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" \
18411867
viewBox="0 0 22 22" fill="none" stroke="black">\
18421868
<path d="M3,5h16M3,11h16M3,17h16" stroke-width="2.75"/></svg>');
@@ -1850,6 +1876,7 @@ However, it's not needed with smaller screen width because the doc/code block is
18501876

18511877
/* src sidebar button opens a folder view */
18521878
.src #sidebar-button > a:before {
1879+
/* folder image */
18531880
content: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" \
18541881
viewBox="0 0 22 22" fill="none" stroke="black">\
18551882
<path d="M16,9v-4h-6v-1l-2,-2h-4l-2,2v16h13L21,9h-15L2,19" stroke-width="1.25"/>\

src/librustdoc/html/static/images/clipboard.svg

-1
This file was deleted.

src/librustdoc/html/static/images/wheel.svg

-1
This file was deleted.

src/librustdoc/html/static_files.rs

-2
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,6 @@ static_files! {
9999
src_script_js => "static/js/src-script.js",
100100
storage_js => "static/js/storage.js",
101101
scrape_examples_js => "static/js/scrape-examples.js",
102-
wheel_svg => "static/images/wheel.svg",
103-
clipboard_svg => "static/images/clipboard.svg",
104102
copyright => "static/COPYRIGHT.txt",
105103
license_apache => "static/LICENSE-APACHE.txt",
106104
license_mit => "static/LICENSE-MIT.txt",

0 commit comments

Comments
 (0)