Skip to content

Commit

Permalink
Rollup merge of rust-lang#98297 - GuillaumeGomez:help-pocket-menu, r=…
Browse files Browse the repository at this point in the history
…notriddle

Transform help popup into a pocket menu

Just like we moved the settings menu into a "pocket menu", it's doing the same to the help popup.

You can test it [here](https://rustdoc.crud.net/imperio/help-pocket-menu/doc/foo/index.html) and here is a screenshot:

![Screenshot from 2022-06-20 20-58-29](https://user-images.githubusercontent.com/3050060/174663718-538e9d11-3bf9-48b2-8909-f9bfe75af135.png)

r? ````````@jsha````````
  • Loading branch information
matthiaskrgr authored Jun 26, 2022
2 parents b843ac5 + e4b2b41 commit 4b59173
Show file tree
Hide file tree
Showing 11 changed files with 248 additions and 184 deletions.
74 changes: 41 additions & 33 deletions src/librustdoc/html/static/css/rustdoc.css
Original file line number Diff line number Diff line change
Expand Up @@ -983,60 +983,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 @@ -1391,7 +1400,7 @@ pre.rust {
#copy-path {
height: 34px;
}
#settings-menu > a, #help-button, #copy-path {
#settings-menu > a, #help-button > button, #copy-path {
padding: 5px;
width: 33px;
border: 1px solid;
Expand All @@ -1401,9 +1410,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 @@ -1420,7 +1428,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
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
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
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
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

0 comments on commit 4b59173

Please sign in to comment.