mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #106462 - notriddle:notriddle/logo-container-sidebar, r=GuillaumeGomez

Browse Source 
rustdoc: remove unnecessary wrapper around sidebar and mobile logos

This commit changes `.sidebar a:hover:not(.logo-container)` to add the `:not()` pseudo-class, retaining the old appearance of the logo when mousing over it.

This didn't used to be necessary because the `a.sidebar-logo` was `display:inline`, and was what got the `background` changed on hover, while the `div.logo-container` inside it was `display:block`. This resulted in the hover rule not having any effect, because the logo-container box was not actually nested inside the sidebar-logo box:

https://www.w3.org/TR/CSS2/visuren.html#anonymous-block-level

> When an inline box contains an in-flow block-level box, the inline box (and its inline ancestors within the same line box) are broken around the block-level box (and any block-level siblings that are consecutive or separated only by collapsible whitespace and/or out-of-flow elements), splitting the inline box into two boxes (even if either side is empty), one on each side of the block-level box(es). The line boxes before the break and after the break are enclosed in anonymous block boxes, and the block-level box becomes a sibling of those anonymous boxes. When such an inline box is affected by relative positioning, any resulting translation also affects the block-level box contained in the inline box.
This commit is contained in:
Michael Goulet 2023-01-04 20:36:28 -08:00 committed by GitHub
commit 6132993144
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/librustdoc/html/static/css/rustdoc.css
View File

@ -352,6 +352,7 @@ img {
.sub-logo-container, .logo-container { .sub-logo-container, .logo-container {
/* zero text boxes so that computed line height = image height exactly */ /* zero text boxes so that computed line height = image height exactly */
line-height: 0; line-height: 0;
display: block;
} }
.sub-logo-container { .sub-logo-container {
@ -495,7 +496,7 @@ ul.block, .block li {
color: var(--sidebar-link-color); color: var(--sidebar-link-color);
} }
.sidebar .current, .sidebar .current,
.sidebar a:hover { .sidebar a:hover:not(.logo-container) {
background-color: var(--sidebar-current-link-background-color); background-color: var(--sidebar-current-link-background-color);
} }
@ -1570,7 +1571,7 @@ in storage.js
/* Hide the logo and item name from the sidebar. Those are displayed /* Hide the logo and item name from the sidebar. Those are displayed
in the mobile-topbar instead. */ in the mobile-topbar instead. */
.sidebar .sidebar-logo, .sidebar .logo-container,
.sidebar .location { .sidebar .location {
display: none; display: none;
} }

28
src/librustdoc/html/templates/page.html
View File

@ -72,28 +72,24 @@
{%- if page.css_class != "source" -%} {%- if page.css_class != "source" -%}
<nav class="mobile-topbar"> {#- -#} <nav class="mobile-topbar"> {#- -#}
<button class="sidebar-menu-toggle">&#9776;</button> {#- -#} <button class="sidebar-menu-toggle">&#9776;</button> {#- -#}
<a class="sidebar-logo" href="{{page.root_path|safe}}{{krate_with_trailing_slash|safe}}index.html"> {#- -#} <a class="logo-container" href="{{page.root_path|safe}}{{krate_with_trailing_slash|safe}}index.html"> {#- -#}
<div class="logo-container"> {#- -#} {%- if !layout.logo.is_empty() -%}
{%- if !layout.logo.is_empty() -%} <img src="{{layout.logo}}" alt="logo"> {#- -#}
<img src="{{layout.logo}}" alt="logo"> {#- -#} {%- else -%}
{%- else -%} <img class="rust-logo" src="{{static_root_path|safe}}{{files.rust_logo_svg}}" alt="logo"> {#- -#}
<img class="rust-logo" src="{{static_root_path|safe}}{{files.rust_logo_svg}}" alt="logo"> {#- -#} {%- endif -%}
{%- endif -%}
</div> {#- -#}
</a> {#- -#} </a> {#- -#}
<h2></h2> {#- -#} <h2></h2> {#- -#}
</nav> {#- -#} </nav> {#- -#}
{%- endif -%} {%- endif -%}
<nav class="sidebar"> {#- -#} <nav class="sidebar"> {#- -#}
{%- if page.css_class != "source" -%} {%- if page.css_class != "source" -%}
<a class="sidebar-logo" href="{{page.root_path|safe}}{{krate_with_trailing_slash|safe}}index.html"> {#- -#} <a class="logo-container" href="{{page.root_path|safe}}{{krate_with_trailing_slash|safe}}index.html"> {#- -#}
<div class="logo-container"> {#- -#} {%- if !layout.logo.is_empty() %}
{%- if !layout.logo.is_empty() %} <img src="{{layout.logo}}" alt="logo"> {#- -#}
<img src="{{layout.logo}}" alt="logo"> {#- -#} {%- else -%}
{%- else -%} <img class="rust-logo" src="{{static_root_path|safe}}{{files.rust_logo_svg}}" alt="logo"> {#- -#}
<img class="rust-logo" src="{{static_root_path|safe}}{{files.rust_logo_svg}}" alt="logo"> {#- -#} {%- endif -%}
{%- endif -%}
</div> {#- -#}
</a> {#- -#} </a> {#- -#}
{%- endif -%} {%- endif -%}
{{- sidebar|safe -}} {{- sidebar|safe -}}