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

Transform help popup into a pocket menu #98297

Merged
merged 3 commits into from
Jun 26, 2022
Merged

Transform help popup into a pocket menu #98297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cc4f804
Move help popup into a pocket menu as well
GuillaumeGomez Jun 20, 2022
3eb9e1a
Add/update GUI tests for help pocket menu
GuillaumeGomez Jun 20, 2022
e4b2b41
Merge all popover hide functions into one
GuillaumeGomez Jun 22, 2022
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
74 changes: 41 additions & 33 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 @@ -979,60 +979,69 @@ table,
font-weight: normal;
}

body.blur > :not(#help) {
filter: blur(8px);
-webkit-filter: blur(8px);
opacity: .7;
.popover {
font-size: 1rem;
position: absolute;
right: 0;
z-index: 2;
display: block;
margin-top: 7px;
border-radius: 3px;
border: 1px solid;
font-size: 1rem;
}

#help {
width: 100%;
height: 100vh;
position: fixed;
top: 0;
left: 0;
display: flex;
justify-content: center;
align-items: center;
/* This rule is to draw the little arrow connecting the settings menu to the gear icon. */
.popover::before {
content: '';
position: absolute;
right: 11px;
border: solid;
border-width: 1px 1px 0 0;
display: inline-block;
padding: 4px;
transform: rotate(-45deg);
top: -5px;
}
#help > div {
flex: 0 0 auto;
box-shadow: 0 0 6px rgba(0,0,0,.2);
width: 550px;
height: auto;
border: 1px solid;

#help-button .popover {
max-width: 600px;
}
#help dt {

#help-button .popover::before {
right: 48px;
}

#help-button dt {
float: left;
clear: left;
display: block;
margin-right: 0.5rem;
}
#help span.top, #help span.bottom {
#help-button span.top, #help-button span.bottom {
text-align: center;
display: block;
font-size: 1.125rem;

}
#help span.top {
#help-button span.top {
text-align: center;
display: block;
margin: 10px 0;
border-bottom: 1px solid;
padding-bottom: 4px;
margin-bottom: 6px;
}
#help span.bottom {
#help-button span.bottom {
clear: both;
border-top: 1px solid;
}
#help dd { margin: 5px 35px; }
#help .infos { padding-left: 0; }
#help h1, #help h2 { margin-top: 0; }
#help > div div {
.side-by-side {
text-align: initial;
}
.side-by-side > div {
width: 50%;
float: left;
padding: 0 20px 20px 17px;;
padding: 0 20px 20px 17px;
}

.item-info .stab {
Expand Down Expand Up @@ -1387,7 +1396,7 @@ pre.rust {
#copy-path {
height: 34px;
}
#settings-menu > a, #help-button, #copy-path {
#settings-menu > a, #help-button > button, #copy-path {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This selector is pretty complicated. Could it be a utility class instead?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just in case: it's not one selector but three different selectors on which we apply the same rules. If it was what you understood, I'm not sure to understand how simpler it could be though...

padding: 5px;
width: 33px;
border: 1px solid;
Expand All @@ -1397,9 +1406,8 @@ pre.rust {
#settings-menu {
padding: 0;
}
#settings-menu > a {
#settings-menu > a, #help-button > button {
padding: 5px;
width: 100%;
height: 100%;
display: block;
}
Expand All @@ -1416,7 +1424,7 @@ pre.rust {
animation: rotating 2s linear infinite;
}

#help-button {
#help-button > button {
font-family: "Fira Sans", Arial, sans-serif;
text-align: center;
/* Rare exception to specifying font sizes in rem. Since this is acting
Expand Down
21 changes: 0 additions & 21 deletions src/librustdoc/html/static/css/settings.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,27 +86,6 @@ input:checked + .slider:before {
display: block;
}

div#settings {
position: absolute;
right: 0;
z-index: 1;
display: block;
margin-top: 7px;
border-radius: 3px;
border: 1px solid;
}
#settings .setting-line {
margin: 1.2em 0.6em;
}
/* This rule is to draw the little arrow connecting the settings menu to the gear icon. */
div#settings::before {
content: '';
position: absolute;
right: 11px;
border: solid;
border-width: 1px 1px 0 0;
display: inline-block;
padding: 4px;
transform: rotate(-45deg);
top: -5px;
}
9 changes: 5 additions & 4 deletions src/librustdoc/html/static/css/themes/ayu.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Original by Dempfi (https://github.com/dempfi/ayu)

/* General structure and fonts */

body, #settings-menu #settings, #settings-menu #settings::before {
body, .popover, .popover::before {
background-color: #0f1419;
color: #c5c5c5;
}
Expand Down Expand Up @@ -567,7 +567,7 @@ kbd {
box-shadow: inset 0 -1px 0 #5c6773;
}

#settings-menu > a, #help-button {
#settings-menu > a, #help-button > button {
border-color: #5c6773;
background-color: #0f1419;
color: #fff;
Expand All @@ -577,7 +577,8 @@ kbd {
filter: invert(100);
}

#settings-menu #settings, #settings-menu #settings::before {
.popover, .popover::before,
#help-button span.top, #help-button span.bottom {
border-color: #5c6773;
}

Expand All @@ -592,7 +593,7 @@ kbd {
}

#settings-menu > a:hover, #settings-menu > a:focus,
#help-button:hover, #help-button:focus {
#help-button > button:hover, #help-button > button:focus {
border-color: #e0e0e0;
}

Expand Down
9 changes: 5 additions & 4 deletions src/librustdoc/html/static/css/themes/dark.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
body, #settings-menu #settings, #settings-menu #settings::before {
body, .popover, .popover::before {
background-color: #353535;
color: #ddd;
}
Expand Down Expand Up @@ -442,18 +442,19 @@ kbd {
box-shadow: inset 0 -1px 0 #c6cbd1;
}

#settings-menu > a, #help-button {
#settings-menu > a, #help-button > button {
border-color: #e0e0e0;
background: #f0f0f0;
color: #000;
}

#settings-menu > a:hover, #settings-menu > a:focus,
#help-button:hover, #help-button:focus {
#help-button > button:hover, #help-button > button:focus {
border-color: #ffb900;
}

#settings-menu #settings, #settings-menu #settings::before {
.popover, .popover::before,
#help-button span.top, #help-button span.bottom {
border-color: #d2d2d2;
}

Expand Down
9 changes: 5 additions & 4 deletions src/librustdoc/html/static/css/themes/light.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* General structure and fonts */

body, #settings-menu #settings, #settings-menu #settings::before {
body, .popover, .popover::before {
background-color: white;
color: black;
}
Expand Down Expand Up @@ -427,17 +427,18 @@ kbd {
box-shadow: inset 0 -1px 0 #c6cbd1;
}

#settings-menu > a, #help-button {
#settings-menu > a, #help-button > button {
border-color: #e0e0e0;
background-color: #fff;
}

#settings-menu > a:hover, #settings-menu > a:focus,
#help-button:hover, #help-button:focus {
#help-button > button:hover, #help-button > button:focus {
border-color: #717171;
}

#settings-menu #settings, #settings-menu #settings::before {
.popover, .popover::before,
#help-button span.top, #help-button span.bottom {
border-color: #DDDDDD;
}

Expand Down
Loading