Skip to content

Commit bd89372

Browse files
authored
Rollup merge of #101063 - GuillaumeGomez:merge-duplicated-css, r=notriddle
Merge duplicated CSS rules I used the [stylelint](https://stylelint.io/user-guide/configure) tool to check for duplicated CSS rules in order to merge them. r? `@notriddle`
2 parents bdbbbe6 + a74f453 commit bd89372

File tree

2 files changed

+8
-30
lines changed

2 files changed

+8
-30
lines changed

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

+8-25
Original file line numberDiff line numberDiff line change
@@ -364,11 +364,6 @@ li {
364364
margin-left: 0px;
365365
}
366366

367-
nav.sub {
368-
position: relative;
369-
font-size: 1rem;
370-
}
371-
372367
.sub-container {
373368
display: flex;
374369
flex-direction: row;
@@ -638,9 +633,6 @@ h2.location a {
638633
}
639634
.docblock-short p {
640635
display: inline;
641-
}
642-
643-
.docblock-short p {
644636
overflow: hidden;
645637
text-overflow: ellipsis;
646638
margin: 0;
@@ -820,6 +812,8 @@ pre, .rustdoc.source .example-wrap {
820812
}
821813

822814
nav.sub {
815+
position: relative;
816+
font-size: 1rem;
823817
flex-grow: 1;
824818
margin-bottom: 25px;
825819
}
@@ -919,6 +913,7 @@ table,
919913
position: relative;
920914
display: flex;
921915
height: 34px;
916+
margin-top: 4px;
922917
}
923918
.search-container > * {
924919
height: 100%;
@@ -990,9 +985,6 @@ so that we can apply CSS-filters to change the arrow color in themes */
990985
#crate-search > option {
991986
font-size: 1rem;
992987
}
993-
.search-container {
994-
margin-top: 4px;
995-
}
996988
.search-input {
997989
/* Override Normalize.css: it has a rule that sets
998990
-webkit-appearance: textfield for search inputs. That
@@ -1188,6 +1180,7 @@ so that we can apply CSS-filters to change the arrow color in themes */
11881180
padding-left: 12px;
11891181
padding-right: 2px;
11901182
position: initial;
1183+
float: right;
11911184
}
11921185

11931186
.impl-items .srclink, .impl .srclink, .methods .srclink {
@@ -1196,10 +1189,6 @@ so that we can apply CSS-filters to change the arrow color in themes */
11961189
font-size: 1rem;
11971190
}
11981191

1199-
.rightside {
1200-
float: right;
1201-
}
1202-
12031192
td.summary-column {
12041193
width: 100%;
12051194
}
@@ -1226,7 +1215,7 @@ a.test-arrow {
12261215
.example-wrap:hover .test-arrow {
12271216
visibility: visible;
12281217
}
1229-
a.test-arrow:hover{
1218+
a.test-arrow:hover {
12301219
text-decoration: none;
12311220
}
12321221

@@ -1494,10 +1483,6 @@ pre.rust {
14941483
outline: none;
14951484
}
14961485

1497-
#copy-path {
1498-
height: 34px;
1499-
background-color: var(--main-background-color);
1500-
}
15011486
#settings-menu > a, #help-button > button, #copy-path {
15021487
padding: 5px;
15031488
width: 33px;
@@ -1555,7 +1540,8 @@ input:checked + .slider {
15551540
}
15561541

15571542
#copy-path {
1558-
background: initial;
1543+
height: 34px;
1544+
background-color: var(--main-background-color);
15591545
margin-left: 10px;
15601546
padding: 0;
15611547
padding-left: 2px;
@@ -1835,10 +1821,6 @@ in storage.js plus the media query with (min-width: 701px)
18351821
display: none;
18361822
}
18371823

1838-
.sidebar-elems {
1839-
margin-top: 1em;
1840-
}
1841-
18421824
.sidebar {
18431825
position: fixed;
18441826
top: 45px;
@@ -1932,6 +1914,7 @@ in storage.js plus the media query with (min-width: 701px)
19321914
}
19331915

19341916
.sidebar-elems {
1917+
margin-top: 1em;
19351918
background-color: var(--sidebar-background-color);
19361919
}
19371920

src/librustdoc/html/static/css/themes/ayu.css

-5
Original file line numberDiff line numberDiff line change
@@ -153,9 +153,6 @@ a {
153153
.sidebar h3 a {
154154
color: white;
155155
}
156-
.search-results a {
157-
color: #0096cf;
158-
}
159156
body.source .example-wrap pre.rust a {
160157
background: #333;
161158
}
@@ -359,15 +356,13 @@ h3:not(.impl):not(.method):not(.type):not(.tymethod), h4:not(.method):not(.type)
359356
.content span.constant,.content a.constant,.block a.current.constant,.content span.static,
360357
.content a.static, .block a.current.static {}
361358
.content span.keyword,.content a.keyword,.block a.current.keyword {}
362-
pre.rust .comment {}
363359
.content span.traitalias,.content a.traitalias,.block a.current.traitalias {}
364360
.content span.fn,.content a.fn,.block a.current.fn,.content span.method,.content a.method,
365361
.block a.current.method,.content span.tymethod,.content a.tymethod,.block a.current.tymethod,
366362
.content .fnname {}
367363
pre.rust .kw {}
368364
pre.rust .self,pre.rust .bool-val,pre.rust .prelude-val,pre.rust .attribute {}
369365
.content span.foreigntype,.content a.foreigntype,.block a.current.foreigntype {}
370-
pre.rust .doccomment {}
371366
.stab.deprecated {}
372367
.content a.attr,.content a.derive,.content a.macro {}
373368
.stab.portability {}

0 commit comments

Comments
 (0)