Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

rustdoc: clean up source sidebar hide button #119066

Merged
merged 6 commits into from
Dec 31, 2023
Merged

rustdoc: clean up source sidebar hide button #119066

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift click to select a range
859bbc5
rustdoc: clean up source sidebar hide button
notriddle Dec 18, 2023
bd14fb6
Add back the column
notriddle Dec 18, 2023
c3e29ea
Stop using the trigram of heaven as a hamburger button
notriddle Dec 18, 2023
66779ff
Add border bottom for source sidebar title area
notriddle Dec 18, 2023
34984a6
Use folder icon instead of hamburger and sidebar
notriddle Dec 19, 2023
9566db1
Fix corner cases when dealing with mobile mode
notriddle Dec 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Use folder icon instead of hamburger and sidebar
  • Loading branch information
@notriddle
notriddle committed Dec 19, 2023
commit 34984a68300ac3e68f2d5ebc1f15b7bf46faf9b0
43 changes: 26 additions & 17 deletions src/librustdoc/html/static/css/rustdoc.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1531,9 1531,8 @@ a.tooltip:hover::after {
position: sticky;
top: 0;
display: flex;
padding: 8px;
padding-left: 48px;
padding-bottom: 7px;
padding: 8px 8px 0 48px;
margin-bottom: 7px;
background: var(--sidebar-background-color);
border-bottom: 1px solid var(--border-color);
}
Expand Down Expand Up @@ -1793,6 1792,30 @@ However, it's not needed with smaller screen width because the doc/code block is
margin-top: 16px;
}

/* sidebar button opens modal
use hamburger button */
.src #sidebar-button > a:before, .sidebar-menu-toggle:before {
content: url('data:image/svg xml,<svg xmlns="http://www.w3.org/2000/svg" \
viewBox="0 0 22 22" fill="none" stroke="black">\
<path d="M3,5h16M3,11h16M3,17h16" stroke-width="2.75"/></svg>');
opacity: 0.75;
}
.sidebar-menu-toggle:hover:before,
.sidebar-menu-toggle:active:before,
.sidebar-menu-toggle:focus:before {
opacity: 1;
}

/* src sidebar button opens a folder view */
.src #sidebar-button > a:before {
content: url('data:image/svg xml,<svg xmlns="http://www.w3.org/2000/svg" \
viewBox="0 0 22 22" fill="none" stroke="black">\
<path d="M16,9v-4h-6v-1l-2,-2h-4l-2,2v16h13L21,9h-15L2,19" stroke-width="1.25"/>\
<path d="M15,7h-11v3" stroke-width="0.75"/>\
<path d="M3.75,10v1.25" stroke-width="0.375"/></svg>');
opacity: 0.75;
}

/* Media Queries */

/* Make sure all the buttons line wrap at the same time */
Expand Down Expand Up @@ -1965,20 1988,6 @@ in src-script.js and main.js
background: var(--main-background-color);
}

/* sidebar button opens modal
use hamburger button */
.src #sidebar-button > a:before, .sidebar-menu-toggle:before {
content: url('data:image/svg xml,<svg xmlns="http://www.w3.org/2000/svg" \
viewBox="0 0 22 22" fill="none" stroke="black">\
<path d="M3,5h16M3,11h16M3,17h16" stroke-width="2.75"/></svg>');
opacity: 0.75;
}
.src #sidebar-button > a:hover:before, .sidebar-menu-toggle:hover:before,
.src #sidebar-button > a:active:before, .sidebar-menu-toggle:active:before,
.src #sidebar-button > a:focus:before, .sidebar-menu-toggle:focus:before {
opacity: 1;
}

/* Display an alternating layout on tablets and phones */
.item-table, .item-row, .item-table > li, .item-table > li > div,
.search-results > a, .search-results > a > div {
Expand Down
9 changes: 6 additions & 3 deletions tests/rustdoc-gui/source-code-page.goml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 152,8 @@ store-property: (".src-sidebar-title", {
})
call-function: ("check-sidebar-dir-entry", {
"x": 0,
"y": |source_sidebar_title_y| |source_sidebar_title_height|,
// margin = 7px
"y": |source_sidebar_title_y| |source_sidebar_title_height| 7,
})

// Check the search form
Expand Down Expand Up @@ -180,7 181,8 @@ store-property: (".src-sidebar-title", {
})
call-function: ("check-sidebar-dir-entry", {
"x": 0,
"y": |source_sidebar_title_y| |source_sidebar_title_height|,
// margin = 7px
"y": |source_sidebar_title_y| |source_sidebar_title_height| 7,
})

// Tiny, phone mobile gets a different display where the logo is stacked on top.
Expand All @@ -194,5 196,6 @@ store-property: (".src-sidebar-title", {
})
call-function: ("check-sidebar-dir-entry", {
"x": 0,
"y": |source_sidebar_title_y| |source_sidebar_title_height|,
// margin = 7px
"y": |source_sidebar_title_y| |source_sidebar_title_height| 7,
})
Loading