diff options
| author | bors <bors@rust-lang.org> | 2022-02-08 06:34:18 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-02-08 06:34:18 +0000 |
| commit | 03b17b181af4945fa24e0df79676e89454546440 (patch) | |
| tree | 1bbcda7840eb78db9ff11ab6efcb3e05844e242f /src/librustdoc/html/static/css | |
| parent | 2a8dbdb1e2d9f44e7971d9a70b41d4d86db0112f (diff) | |
| parent | 25ce315c7604e6617bd8b5868b45c9a3bd4867af (diff) | |
Auto merge of #93762 - matthiaskrgr:rollup-vdjpfmz, r=matthiaskrgr
Rollup of 9 pull requests
Successful merges:
- #86497 (Add {floor,ceil}_char_boundary methods to str)
- #92695 (Add `#[no_coverage]` tests for nested functions)
- #93521 (Fix hover effects in sidebar)
- #93568 (Include all contents of first line of scraped item in Rustdoc)
- #93569 (rustdoc: correct unclosed HTML tags as generics)
- #93672 (update comment wrt const param defaults)
- #93715 (Fix horizontal trim for block doc comments)
- #93721 (rustdoc: Special-case macro lookups less)
- #93728 (Add in ValuePair::Term)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'src/librustdoc/html/static/css')
| -rw-r--r-- | src/librustdoc/html/static/css/rustdoc.css | 19 | ||||
| -rw-r--r-- | src/librustdoc/html/static/css/themes/ayu.css | 16 | ||||
| -rw-r--r-- | src/librustdoc/html/static/css/themes/dark.css | 9 | ||||
| -rw-r--r-- | src/librustdoc/html/static/css/themes/light.css | 7 |
4 files changed, 18 insertions, 33 deletions
diff --git a/src/librustdoc/html/static/css/rustdoc.css b/src/librustdoc/html/static/css/rustdoc.css index cf3c63d6a8f..6d94c70eade 100644 --- a/src/librustdoc/html/static/css/rustdoc.css +++ b/src/librustdoc/html/static/css/rustdoc.css @@ -463,9 +463,6 @@ nav.sub { .location a:first-of-type { font-weight: 500; } -.location a:hover { - text-decoration: underline; -} .block { padding: 0; @@ -476,10 +473,11 @@ nav.sub { list-style: none; } -.block a { +.block a, +h2.location a { display: block; - padding: 0.3em; - margin-left: -0.3em; + padding: 0.3rem; + margin-left: -0.3rem; text-overflow: ellipsis; overflow: hidden; @@ -494,8 +492,8 @@ nav.sub { font-weight: 500; padding: 0; margin: 0; - margin-top: 1rem; - margin-bottom: 1rem; + margin-top: 0.7rem; + margin-bottom: 0.7rem; } .sidebar h3 { @@ -1812,10 +1810,7 @@ details.rustdoc-toggle[open] > summary.hideme::after { .mobile-topbar .location { border: none; - margin: 0; - margin-left: auto; - padding: 0.3em; - padding-right: 0.6em; + margin: auto 0.5em auto auto; text-overflow: ellipsis; overflow: hidden; white-space: nowrap; diff --git a/src/librustdoc/html/static/css/themes/ayu.css b/src/librustdoc/html/static/css/themes/ayu.css index 0aaf4f78c34..e402b3583f3 100644 --- a/src/librustdoc/html/static/css/themes/ayu.css +++ b/src/librustdoc/html/static/css/themes/ayu.css @@ -91,7 +91,8 @@ pre, .rustdoc.source .example-wrap { background-color: #5c6773; } -.sidebar .current { +.sidebar .current, +.sidebar a:hover { background-color: transparent; color: #ffb44c; } @@ -104,15 +105,6 @@ pre, .rustdoc.source .example-wrap { color: #ff7733; } -.sidebar-elems .location a { - color: #fff; -} - -.block a:hover { - background: transparent; - color: #ffb44c; -} - .line-numbers span { color: #5c6773; } .line-numbers .line-highlighted { color: #708090; @@ -220,6 +212,10 @@ pre.rust a, .in-band a { color: #c5c5c5; } +.sidebar h2 a, +.sidebar h3 a { + color: white; +} .search-results a { color: #0096cf; } diff --git a/src/librustdoc/html/static/css/themes/dark.css b/src/librustdoc/html/static/css/themes/dark.css index 4fad2359ff0..0a56055b8cb 100644 --- a/src/librustdoc/html/static/css/themes/dark.css +++ b/src/librustdoc/html/static/css/themes/dark.css @@ -61,18 +61,15 @@ pre, .rustdoc.source .example-wrap { background-color: rgba(32, 34, 37, .6); } -.sidebar .current { - background-color: #333; +.sidebar .current, +.sidebar a:hover { + background: #444; } .source .sidebar { background-color: #565656; } -.block a:hover { - background: #444; -} - .line-numbers span { color: #3B91E2; } .line-numbers .line-highlighted { background-color: #0a042f !important; diff --git a/src/librustdoc/html/static/css/themes/light.css b/src/librustdoc/html/static/css/themes/light.css index 16a777b7e67..dc1715b2a78 100644 --- a/src/librustdoc/html/static/css/themes/light.css +++ b/src/librustdoc/html/static/css/themes/light.css @@ -63,7 +63,8 @@ pre, .rustdoc.source .example-wrap { background-color: rgba(36, 37, 39, 0.6); } -.sidebar .current { +.sidebar .current, +.sidebar a:hover { background-color: #fff; } @@ -71,10 +72,6 @@ pre, .rustdoc.source .example-wrap { background-color: #f1f1f1; } -.block a:hover { - background: #F5F5F5; -} - .line-numbers span { color: #c67e2d; } .line-numbers .line-highlighted { background-color: #FDFFD3 !important; |
