Skip to content

Commit

Permalink
rustdoc: clean up "normalize.css 8" input override CSS
Browse files Browse the repository at this point in the history
These rules were copied from normalize.css 3, and are mostly redundant.

* `optgroup` isn't used in rustdoc at all
* `textarea` is only used for the "copy" button, so it's not visible
* The remaining buttons and inputs mostly have styles set anyway.
* We should never be setting `color` without also setting the
  background to something. Otherwise, you get white-on-gray
  text. That seems to be [the reason] why `normalize.css` changed this.

[the reason]: necolas/normalize.css#502
  • Loading branch information
notriddle committed Sep 28, 2022
1 parent 307dd93 commit f55ea41
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 13 deletions.
21 changes: 9 additions & 12 deletions src/librustdoc/html/static/css/rustdoc.css
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,7 @@ h4.code-header {
position: relative;
}

#crate-search,
h1, h2, h3, h4, h5, h6,
.sidebar,
.mobile-topbar,
Expand Down Expand Up @@ -304,16 +305,6 @@ summary {

/* Fix some style changes due to normalize.css 8 */

button,
input,
optgroup,
select,
textarea {
color: inherit;
font: inherit;
margin: 0;
}

button {
/* Buttons on Safari have different default padding than other platforms. Make them the same. */
padding: 1px 6px;
Expand Down Expand Up @@ -887,6 +878,9 @@ table,
/* Removes default arrow from firefox */
text-indent: 0.01px;
background-color: var(--main-background-color);
color: inherit;
line-height: 1.5;
font-weight: 500;
}
/* cancel stylistic differences in padding in firefox
for "appearance: none"-style (or equivalent) <select>s */
Expand Down Expand Up @@ -1363,6 +1357,8 @@ pre.rust {
border: 0;
border-top: 2px solid;
flex: 1;
line-height: 1.5;
color: inherit;
}

#titles > button > div.count {
Expand All @@ -1380,7 +1376,6 @@ pre.rust {
position: sticky;
top: 0;
left: 0;
font-weight: bold;
font-size: 1.25rem;
border-bottom: 1px solid;
display: flex;
Expand All @@ -1400,6 +1395,8 @@ pre.rust {
margin-bottom: 6px;
}
#sidebar-toggle > button {
font-size: inherit;
font-weight: bold;
background: none;
color: inherit;
cursor: pointer;
Expand Down Expand Up @@ -1428,6 +1425,7 @@ pre.rust {
border: 1px solid var(--border-color);
border-radius: 2px;
cursor: pointer;
line-height: 1.5;
}

#settings-menu > a, #help-button > button {
Expand Down Expand Up @@ -1887,7 +1885,6 @@ in storage.js plus the media query with (min-width: 701px)
border-top-right-radius: 3px;
border-bottom-right-radius: 3px;
cursor: pointer;
font-weight: bold;
border: 1px solid;
border-left: 0;
}
Expand Down
3 changes: 2 additions & 1 deletion src/librustdoc/html/static/css/settings.css
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
margin-right: 0.3em;
height: 1.2rem;
width: 1.2rem;
border: 1px solid;
color: inherit;
border: 1px solid currentColor;
outline: none;
-webkit-appearance: none;
cursor: pointer;
Expand Down

0 comments on commit f55ea41

Please sign in to comment.