Skip to content

Commit

Permalink
Rollup merge of rust-lang#101063 - GuillaumeGomez:merge-duplicated-cs…
Browse files Browse the repository at this point in the history
…s, 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`
  • Loading branch information
JohnTitor authored Aug 27, 2022
2 parents bdbbbe6 + a74f453 commit bd89372
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 30 deletions.
33 changes: 8 additions & 25 deletions src/librustdoc/html/static/css/rustdoc.css
Original file line number Diff line number Diff line change
Expand Up @@ -364,11 +364,6 @@ li {
margin-left: 0px;
}

nav.sub {
position: relative;
font-size: 1rem;
}

.sub-container {
display: flex;
flex-direction: row;
Expand Down Expand Up @@ -638,9 +633,6 @@ h2.location a {
}
.docblock-short p {
display: inline;
}

.docblock-short p {
overflow: hidden;
text-overflow: ellipsis;
margin: 0;
Expand Down Expand Up @@ -820,6 +812,8 @@ pre, .rustdoc.source .example-wrap {
}

nav.sub {
position: relative;
font-size: 1rem;
flex-grow: 1;
margin-bottom: 25px;
}
Expand Down Expand Up @@ -919,6 +913,7 @@ table,
position: relative;
display: flex;
height: 34px;
margin-top: 4px;
}
.search-container > * {
height: 100%;
Expand Down Expand Up @@ -990,9 +985,6 @@ so that we can apply CSS-filters to change the arrow color in themes */
#crate-search > option {
font-size: 1rem;
}
.search-container {
margin-top: 4px;
}
.search-input {
/* Override Normalize.css: it has a rule that sets
-webkit-appearance: textfield for search inputs. That
Expand Down Expand Up @@ -1188,6 +1180,7 @@ so that we can apply CSS-filters to change the arrow color in themes */
padding-left: 12px;
padding-right: 2px;
position: initial;
float: right;
}

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

.rightside {
float: right;
}

td.summary-column {
width: 100%;
}
Expand All @@ -1226,7 +1215,7 @@ a.test-arrow {
.example-wrap:hover .test-arrow {
visibility: visible;
}
a.test-arrow:hover{
a.test-arrow:hover {
text-decoration: none;
}

Expand Down Expand Up @@ -1494,10 +1483,6 @@ pre.rust {
outline: none;
}

#copy-path {
height: 34px;
background-color: var(--main-background-color);
}
#settings-menu > a, #help-button > button, #copy-path {
padding: 5px;
width: 33px;
Expand Down Expand Up @@ -1555,7 +1540,8 @@ input:checked + .slider {
}

#copy-path {
background: initial;
height: 34px;
background-color: var(--main-background-color);
margin-left: 10px;
padding: 0;
padding-left: 2px;
Expand Down Expand Up @@ -1835,10 +1821,6 @@ in storage.js plus the media query with (min-width: 701px)
display: none;
}

.sidebar-elems {
margin-top: 1em;
}

.sidebar {
position: fixed;
top: 45px;
Expand Down Expand Up @@ -1932,6 +1914,7 @@ in storage.js plus the media query with (min-width: 701px)
}

.sidebar-elems {
margin-top: 1em;
background-color: var(--sidebar-background-color);
}

Expand Down
5 changes: 0 additions & 5 deletions src/librustdoc/html/static/css/themes/ayu.css
Original file line number Diff line number Diff line change
Expand Up @@ -153,9 +153,6 @@ a {
.sidebar h3 a {
color: white;
}
.search-results a {
color: #0096cf;
}
body.source .example-wrap pre.rust a {
background: #333;
}
Expand Down Expand Up @@ -359,15 +356,13 @@ h3:not(.impl):not(.method):not(.type):not(.tymethod), h4:not(.method):not(.type)
.content span.constant,.content a.constant,.block a.current.constant,.content span.static,
.content a.static, .block a.current.static {}
.content span.keyword,.content a.keyword,.block a.current.keyword {}
pre.rust .comment {}
.content span.traitalias,.content a.traitalias,.block a.current.traitalias {}
.content span.fn,.content a.fn,.block a.current.fn,.content span.method,.content a.method,
.block a.current.method,.content span.tymethod,.content a.tymethod,.block a.current.tymethod,
.content .fnname {}
pre.rust .kw {}
pre.rust .self,pre.rust .bool-val,pre.rust .prelude-val,pre.rust .attribute {}
.content span.foreigntype,.content a.foreigntype,.block a.current.foreigntype {}
pre.rust .doccomment {}
.stab.deprecated {}
.content a.attr,.content a.derive,.content a.macro {}
.stab.portability {}
Expand Down

0 comments on commit bd89372

Please sign in to comment.