From eb3e354f2f9f7f4b5b1b93337c55c28a786f6492 Mon Sep 17 00:00:00 2001 From: Manuel Cillero Date: Sun, 24 Jul 2022 19:36:09 +0200 Subject: [PATCH] Actualiza los estilos para encajarlos en los temas --- website/doc/book.toml | 2 +- website/doc/theme/css/chrome.css | 712 ++++++++++++++-------------- website/doc/theme/css/general.css | 252 +++++----- website/doc/theme/css/print.css | 73 +-- website/doc/theme/css/variables.css | 348 +++++++------- website/src/mdbook.rs | 12 +- 6 files changed, 705 insertions(+), 694 deletions(-) diff --git a/website/doc/book.toml b/website/doc/book.toml index 31213b48..2facf58a 100644 --- a/website/doc/book.toml +++ b/website/doc/book.toml @@ -3,7 +3,7 @@ authors = ["Manuel Cillero"] language = "en" multilingual = false src = "src" -title = "PageTop Guide" +title = "PageTop Guides" [build] build-dir = "../static/doc" diff --git a/website/doc/theme/css/chrome.css b/website/doc/theme/css/chrome.css index 10fa4b36..f33ab4e3 100644 --- a/website/doc/theme/css/chrome.css +++ b/website/doc/theme/css/chrome.css @@ -3,257 +3,263 @@ @import 'variables.css'; ::-webkit-scrollbar { - background: var(--bg); + background: var(--bg); } ::-webkit-scrollbar-thumb { - background: var(--scrollbar); + background: var(--scrollbar); } -html { - scrollbar-color: var(--scrollbar) var(--bg); + +#mdbook { + position: relative; + scrollbar-color: var(--scrollbar) var(--bg); } -#searchresults a, -.content a:link, -a:visited, -a > .hljs { - color: var(--links); +#mdbook .content { + position: relative; +} + +#mdbook #searchresults a, +#mdbook .content a:link, +#mdbook a:visited, +#mdbook a > .hljs { + color: var(--links); } /* Menu Bar */ #menu-bar, #menu-bar-hover-placeholder { - z-index: 101; - margin: auto calc(0px - var(--page-padding)); + z-index: 101; + margin: auto calc(0px - var(--page-padding)); } #menu-bar { - position: relative; - display: flex; - flex-wrap: wrap; - background-color: var(--bg); - border-bottom-color: var(--bg); - border-bottom-width: 1px; - border-bottom-style: solid; + position: relative; + display: flex; + flex-wrap: wrap; + background-color: var(--bg); + border-bottom-color: var(--bg); + border-bottom-width: 1px; + border-bottom-style: solid; } #menu-bar.sticky, .js #menu-bar-hover-placeholder:hover + #menu-bar, .js #menu-bar:hover, .js.sidebar-visible #menu-bar { - position: -webkit-sticky; - position: sticky; - top: 0 !important; + position: -webkit-sticky; + position: sticky; + top: 0 !important; } #menu-bar-hover-placeholder { - position: sticky; - position: -webkit-sticky; - top: 0; - height: var(--menu-bar-height); + position: sticky; + position: -webkit-sticky; + top: 0; + height: var(--menu-bar-height); } #menu-bar.bordered { - border-bottom-color: var(--table-border-color); + border-bottom-color: var(--table-border-color); } #menu-bar i, #menu-bar .icon-button { - position: relative; - padding: 0 8px; - z-index: 10; - line-height: var(--menu-bar-height); - cursor: pointer; - transition: color 0.5s; + position: relative; + padding: 0 8px; + z-index: 10; + line-height: var(--menu-bar-height); + cursor: pointer; + transition: color 0.5s; } @media only screen and (max-width: 420px) { - #menu-bar i, #menu-bar .icon-button { - padding: 0 5px; - } + #menu-bar i, #menu-bar .icon-button { + padding: 0 5px; + } } -.icon-button { - border: none; - background: none; - padding: 0; - color: inherit; +#mdbook .icon-button { + border: none; + background: none; + padding: 0; + color: inherit; } -.icon-button i { - margin: 0; +#mdbook .icon-button i { + margin: 0; } -.right-buttons { - margin: 0 15px; +#mdbook .right-buttons { + margin: 0 15px; } -.right-buttons a { - text-decoration: none; +#mdbook .right-buttons a { + text-decoration: none; } -.left-buttons { - display: flex; - margin: 0 5px; +#mdbook .left-buttons { + display: flex; + margin: 0 5px; } -.no-js .left-buttons { - display: none; +.no-js #mdbook .left-buttons { + display: none; } -.menu-title { - display: inline-block; - font-weight: 200; - font-size: 2.4rem; - line-height: var(--menu-bar-height); - text-align: center; - margin: 0; - flex: 1; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; +#mdbook .menu-title { + display: inline-block; + font-weight: 200; + font-size: 1.8rem; + line-height: var(--menu-bar-height); + text-align: center; + margin: 0; + flex: 1; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; } -.js .menu-title { - cursor: pointer; +.js #mdbook .menu-title { + cursor: pointer; } -.menu-bar, -.menu-bar:visited, -.nav-chapters, -.nav-chapters:visited, -.mobile-nav-chapters, -.mobile-nav-chapters:visited, -.menu-bar .icon-button, -.menu-bar a i { - color: var(--icons); +#mdbook .menu-bar, +#mdbook .menu-bar:visited, +#mdbook .nav-chapters, +#mdbook .nav-chapters:visited, +#mdbook .mobile-nav-chapters, +#mdbook .mobile-nav-chapters:visited, +#mdbook .menu-bar .icon-button, +#mdbook .menu-bar a i { + color: var(--icons); } -.menu-bar i:hover, -.menu-bar .icon-button:hover, -.nav-chapters:hover, -.mobile-nav-chapters i:hover { - color: var(--icons-hover); +#mdbook .menu-bar i:hover, +#mdbook .menu-bar .icon-button:hover, +#mdbook .nav-chapters:hover, +#mdbook .mobile-nav-chapters i:hover { + color: var(--icons-hover); } /* Nav Icons */ -.nav-chapters { - font-size: 2.5em; - text-align: center; - text-decoration: none; +#mdbook .nav-chapters { + font-size: 2.5em; + text-align: center; + text-decoration: none; - position: fixed; - top: 0; - bottom: 0; - margin: 0; - max-width: 150px; - min-width: 90px; + position: absolute; + top: 0; + bottom: 0; + margin: 0; + max-width: 150px; + min-width: 90px; - display: flex; - justify-content: center; - align-content: center; - flex-direction: column; + display: flex; + justify-content: center; + align-content: center; + flex-direction: column; - transition: color 0.5s, background-color 0.5s; + transition: color 0.5s, background-color 0.5s; } -.nav-chapters:hover { - text-decoration: none; - background-color: var(--theme-hover); - transition: background-color 0.15s, color 0.15s; +#mdbook .nav-chapters:hover { + text-decoration: none; + background-color: var(--theme-hover); + transition: background-color 0.15s, color 0.15s; } -.nav-wrapper { - margin-top: 50px; - display: none; +#mdbook .nav-wrapper { + margin-top: 50px; + display: none; } -.mobile-nav-chapters { - font-size: 2.5em; - text-align: center; - text-decoration: none; - width: 90px; - border-radius: 5px; - background-color: var(--sidebar-bg); +#mdbook .mobile-nav-chapters { + font-size: 2.5em; + text-align: center; + text-decoration: none; + width: 90px; + border-radius: 5px; + background-color: var(--sidebar-bg); } -.previous { - float: left; +#mdbook .previous { + float: left; } -.next { - float: right; - right: var(--page-padding); +#mdbook .next { + float: right; + right: var(--page-padding); } @media only screen and (max-width: 1080px) { - .nav-wide-wrapper { display: none; } - .nav-wrapper { display: block; } + #mdbook .nav-wide-wrapper { display: none; } + #mdbook .nav-wrapper { display: block; } } @media only screen and (max-width: 1380px) { - .sidebar-visible .nav-wide-wrapper { display: none; } - .sidebar-visible .nav-wrapper { display: block; } + .sidebar-visible #mdbook .nav-wide-wrapper { display: none; } + .sidebar-visible #mdbook .nav-wrapper { display: block; } } /* Inline code */ -:not(pre) > .hljs { - display: inline; - padding: 0.1em 0.3em; - border-radius: 3px; +#mdbook :not(pre) > .hljs { + display: inline; + padding: 0.1em 0.3em; + border-radius: 3px; } -:not(pre):not(a) > .hljs { - color: var(--inline-code-color); - overflow-x: initial; +#mdbook :not(pre):not(a) > .hljs { + color: var(--inline-code-color); + overflow-x: initial; } -a:hover > .hljs { - text-decoration: underline; +#mdbook a:hover > .hljs { + text-decoration: underline; } -pre { - position: relative; +#mdbook pre { + position: relative; } -pre > .buttons { - position: absolute; - z-index: 100; - right: 0px; - top: 2px; - margin: 0px; - padding: 2px 0px; +#mdbook pre > .buttons { + position: absolute; + z-index: 100; + right: 0px; + top: 2px; + margin: 0px; + padding: 2px 0px; - color: var(--sidebar-fg); - cursor: pointer; - visibility: hidden; - opacity: 0; - transition: visibility 0.1s linear, opacity 0.1s linear; + color: var(--sidebar-fg); + cursor: pointer; + visibility: hidden; + opacity: 0; + transition: visibility 0.1s linear, opacity 0.1s linear; } -pre:hover > .buttons { - visibility: visible; - opacity: 1 +#mdbook pre:hover > .buttons { + visibility: visible; + opacity: 1 } -pre > .buttons :hover { - color: var(--sidebar-active); - border-color: var(--icons-hover); - background-color: var(--theme-hover); +#mdbook pre > .buttons :hover { + color: var(--sidebar-active); + border-color: var(--icons-hover); + background-color: var(--theme-hover); } -pre > .buttons i { - margin-left: 8px; +#mdbook pre > .buttons i { + margin-left: 8px; } -pre > .buttons button { - cursor: inherit; - margin: 0px 5px; - padding: 3px 5px; - font-size: 14px; +#mdbook pre > .buttons button { + cursor: inherit; + margin: 0px 5px; + padding: 3px 5px; + font-size: 14px; - border-style: solid; - border-width: 1px; - border-radius: 4px; - border-color: var(--icons); - background-color: var(--theme-popup-bg); - transition: 100ms; - transition-property: color,border-color,background-color; - color: var(--icons); + border-style: solid; + border-width: 1px; + border-radius: 4px; + border-color: var(--icons); + background-color: var(--theme-popup-bg); + transition: 100ms; + transition-property: color,border-color,background-color; + color: var(--icons); } @media (pointer: coarse) { - pre > .buttons button { - /* On mobile, make it easier to tap buttons. */ - padding: 0.3rem 1rem; - } + #mdbook pre > .buttons button { + /* On mobile, make it easier to tap buttons. */ + padding: 0.3rem 1rem; + } } -pre > code { - padding: 1rem; +#mdbook pre > code { + padding: 1rem; } /* FIXME: ACE editors overlap their buttons because ACE does absolute @@ -261,274 +267,274 @@ pre > code { can think of is to move the padding to the outer pre tag (or insert a div wrapper), but that would require fixing a whole bunch of CSS rules. */ -.hljs.ace_editor { - padding: 0rem 0rem; +#mdbook .hljs.ace_editor { + padding: 0rem 0rem; } -pre > .result { - margin-top: 10px; +#mdbook pre > .result { + margin-top: 10px; } /* Search */ #searchresults a { - text-decoration: none; + text-decoration: none; } -mark { - border-radius: 2px; - padding: 0 3px 1px 3px; - margin: 0 -3px -1px -3px; - background-color: var(--search-mark-bg); - transition: background-color 300ms linear; - cursor: pointer; +#mdbook mark { + border-radius: 2px; + padding: 0 3px 1px 3px; + margin: 0 -3px -1px -3px; + background-color: var(--search-mark-bg); + transition: background-color 300ms linear; + cursor: pointer; } -mark.fade-out { - background-color: rgba(0,0,0,0) !important; - cursor: auto; +#mdbook mark.fade-out { + background-color: rgba(0,0,0,0) !important; + cursor: auto; } -.searchbar-outer { - margin-left: auto; - margin-right: auto; - max-width: var(--content-max-width); +#mdbook .searchbar-outer { + margin-left: auto; + margin-right: auto; + max-width: var(--content-max-width); } #searchbar { - width: 100%; - margin: 5px auto 0px auto; - padding: 10px 16px; - transition: box-shadow 300ms ease-in-out; - border: 1px solid var(--searchbar-border-color); - border-radius: 3px; - background-color: var(--searchbar-bg); - color: var(--searchbar-fg); + width: 100%; + margin: 5px auto 0px auto; + padding: 10px 16px; + transition: box-shadow 300ms ease-in-out; + border: 1px solid var(--searchbar-border-color); + border-radius: 3px; + background-color: var(--searchbar-bg); + color: var(--searchbar-fg); } #searchbar:focus, #searchbar.active { - box-shadow: 0 0 3px var(--searchbar-shadow-color); + box-shadow: 0 0 3px var(--searchbar-shadow-color); } -.searchresults-header { - font-weight: bold; - font-size: 1em; - padding: 18px 0 0 5px; - color: var(--searchresults-header-fg); +#mdbook .searchresults-header { + font-weight: bold; + font-size: 1em; + padding: 18px 0 0 5px; + color: var(--searchresults-header-fg); } -.searchresults-outer { - margin-left: auto; - margin-right: auto; - max-width: var(--content-max-width); - border-bottom: 1px dashed var(--searchresults-border-color); +#mdbook .searchresults-outer { + margin-left: auto; + margin-right: auto; + max-width: var(--content-max-width); + border-bottom: 1px dashed var(--searchresults-border-color); } -ul#searchresults { - list-style: none; - padding-left: 20px; +#mdbook ul#searchresults { + list-style: none; + padding-left: 20px; } -ul#searchresults li { - margin: 10px 0px; - padding: 2px; - border-radius: 2px; +#mdbook ul#searchresults li { + margin: 10px 0px; + padding: 2px; + border-radius: 2px; } -ul#searchresults li.focus { - background-color: var(--searchresults-li-bg); +#mdbook ul#searchresults li.focus { + background-color: var(--searchresults-li-bg); } -ul#searchresults span.teaser { - display: block; - clear: both; - margin: 5px 0 0 20px; - font-size: 0.8em; +#mdbook ul#searchresults span.teaser { + display: block; + clear: both; + margin: 5px 0 0 20px; + font-size: 0.8em; } -ul#searchresults span.teaser em { - font-weight: bold; - font-style: normal; +#mdbook ul#searchresults span.teaser em { + font-weight: bold; + font-style: normal; } /* Sidebar */ - -.sidebar { - position: fixed; - left: 0; - top: 0; - bottom: 0; - width: var(--sidebar-width); - font-size: 0.875em; - box-sizing: border-box; - -webkit-overflow-scrolling: touch; - overscroll-behavior-y: contain; - background-color: var(--sidebar-bg); - color: var(--sidebar-fg); +#mdbook .sidebar { + position: absolute; + left: 0; + top: 0; + bottom: 0; + width: var(--sidebar-width); + font-size: 0.875em; + box-sizing: border-box; + -webkit-overflow-scrolling: touch; + overscroll-behavior-y: contain; + background-color: var(--sidebar-bg); + color: var(--sidebar-fg); } .sidebar-resizing { - -moz-user-select: none; - -webkit-user-select: none; - -ms-user-select: none; - user-select: none; + -moz-user-select: none; + -webkit-user-select: none; + -ms-user-select: none; + user-select: none; } -.js:not(.sidebar-resizing) .sidebar { - transition: transform 0.3s; /* Animation: slide away */ +.js:not(.sidebar-resizing) #mdbook .sidebar { + transition: transform 0.3s; /* Animation: slide away */ } -.sidebar code { - line-height: 2em; +#mdbook .sidebar code { + line-height: 2em; } -.sidebar .sidebar-scrollbox { - overflow-y: auto; - position: absolute; - top: 0; - bottom: 0; - left: 0; - right: 0; - padding: 10px 10px; +#mdbook .sidebar .sidebar-scrollbox { + overflow-y: auto; + position: absolute; + top: 0; + bottom: 0; + left: 0; + right: 0; + padding: 10px 10px; } -.sidebar .sidebar-resize-handle { - position: absolute; - cursor: col-resize; - width: 0; - right: 0; - top: 0; - bottom: 0; +#mdbook .sidebar .sidebar-resize-handle { + position: absolute; + cursor: col-resize; + width: 0; + right: 0; + top: 0; + bottom: 0; } -.js .sidebar .sidebar-resize-handle { - cursor: col-resize; - width: 5px; +.js #mdbook .sidebar .sidebar-resize-handle { + cursor: col-resize; + width: 5px; } -.sidebar-hidden .sidebar { - transform: translateX(calc(0px - var(--sidebar-width))); +.sidebar-hidden #mdbook .sidebar { + transform: translateX(calc(0px - var(--sidebar-width))); } -.sidebar::-webkit-scrollbar { - background: var(--sidebar-bg); +#mdbook .sidebar::-webkit-scrollbar { + background: var(--sidebar-bg); } -.sidebar::-webkit-scrollbar-thumb { - background: var(--scrollbar); +#mdbook .sidebar::-webkit-scrollbar-thumb { + background: var(--scrollbar); } -.sidebar-visible .page-wrapper { - transform: translateX(var(--sidebar-width)); +.sidebar-visible #mdbook .page-wrapper { + transform: translateX(var(--sidebar-width)); } @media only screen and (min-width: 620px) { - .sidebar-visible .page-wrapper { - transform: none; - margin-left: var(--sidebar-width); - } + .sidebar-visible #mdbook .page-wrapper { + transform: none; + margin-left: var(--sidebar-width); + } } -.chapter { - list-style: none outside none; - padding-left: 0; - line-height: 2.2em; +#mdbook .chapter { + list-style: none outside none; + padding-left: 0; + line-height: 2.2em; } -.chapter ol { - width: 100%; +#mdbook .chapter ol { + width: 100%; } -.chapter li { - display: flex; - color: var(--sidebar-non-existant); +#mdbook .chapter li { + display: flex; + color: var(--sidebar-non-existant); } -.chapter li a { - display: block; - padding: 0; - text-decoration: none; - color: var(--sidebar-fg); +#mdbook .chapter li a { + display: block; + padding: 0; + text-decoration: none; + color: var(--sidebar-fg); } -.chapter li a:hover { - color: var(--sidebar-active); +#mdbook .chapter li a:hover { + color: var(--sidebar-active); } -.chapter li a.active { - color: var(--sidebar-active); +#mdbook .chapter li a.active { + color: var(--sidebar-active); } -.chapter li > a.toggle { - cursor: pointer; - display: block; - margin-left: auto; - padding: 0 10px; - user-select: none; - opacity: 0.68; +#mdbook .chapter li > a.toggle { + cursor: pointer; + display: block; + margin-left: auto; + padding: 0 10px; + user-select: none; + opacity: 0.68; } -.chapter li > a.toggle div { - transition: transform 0.5s; +#mdbook .chapter li > a.toggle div { + transition: transform 0.5s; } /* collapse the section */ -.chapter li:not(.expanded) + li > ol { - display: none; +#mdbook .chapter li:not(.expanded) + li > ol { + display: none; } -.chapter li.chapter-item { - line-height: 1.5em; - margin-top: 0.6em; +#mdbook .chapter li.chapter-item { + line-height: 1.5em; + margin-top: 0.6em; } -.chapter li.expanded > a.toggle div { - transform: rotate(90deg); +#mdbook .chapter li.expanded > a.toggle div { + transform: rotate(90deg); } -.spacer { - width: 100%; - height: 3px; - margin: 5px 0px; +#mdbook .spacer { + width: 100%; + height: 3px; + margin: 5px 0px; } -.chapter .spacer { - background-color: var(--sidebar-spacer); +#mdbook .chapter .spacer { + background-color: var(--sidebar-spacer); } @media (-moz-touch-enabled: 1), (pointer: coarse) { - .chapter li a { padding: 5px 0; } - .spacer { margin: 10px 0; } + #mdbook .chapter li a { padding: 5px 0; } + #mdbook .spacer { margin: 10px 0; } } -.section { - list-style: none outside none; - padding-left: 20px; - line-height: 1.9em; +#mdbook .section { + list-style: none outside none; + margin: 0; + padding: 0 0 0 20px; + line-height: 1.9em; } /* Theme Menu Popup */ -.theme-popup { - position: absolute; - left: 10px; - top: var(--menu-bar-height); - z-index: 1000; - border-radius: 4px; - font-size: 0.7em; - color: var(--fg); - background: var(--theme-popup-bg); - border: 1px solid var(--theme-popup-border); - margin: 0; - padding: 0; - list-style: none; - display: none; +#mdbook .theme-popup { + position: absolute; + left: 10px; + top: var(--menu-bar-height); + z-index: 1000; + border-radius: 4px; + font-size: 0.7em; + color: var(--fg); + background: var(--theme-popup-bg); + border: 1px solid var(--theme-popup-border); + margin: 0; + padding: 0; + list-style: none; + display: none; } -.theme-popup .default { - color: var(--icons); +#mdbook .theme-popup .default { + color: var(--icons); } -.theme-popup .theme { - width: 100%; - border: 0; - margin: 0; - padding: 2px 10px; - line-height: 25px; - white-space: nowrap; - text-align: left; - cursor: pointer; - color: inherit; - background: inherit; - font-size: inherit; +#mdbook .theme-popup .theme { + width: 100%; + border: 0; + margin: 0; + padding: 2px 10px; + line-height: 25px; + white-space: nowrap; + text-align: left; + cursor: pointer; + color: inherit; + background: inherit; + font-size: inherit; } -.theme-popup .theme:hover { - background-color: var(--theme-hover); +#mdbook .theme-popup .theme:hover { + background-color: var(--theme-hover); } -.theme-popup .theme:hover:first-child, -.theme-popup .theme:hover:last-child { - border-top-left-radius: inherit; - border-top-right-radius: inherit; +#mdbook .theme-popup .theme:hover:first-child, +#mdbook .theme-popup .theme:hover:last-child { + border-top-left-radius: inherit; + border-top-right-radius: inherit; } diff --git a/website/doc/theme/css/general.css b/website/doc/theme/css/general.css index 0e4f07a5..000100bb 100644 --- a/website/doc/theme/css/general.css +++ b/website/doc/theme/css/general.css @@ -2,70 +2,64 @@ @import 'variables.css'; -:root { - /* Browser default font-size is 16px, this way 1 rem = 10px */ - font-size: 62.5%; +#mdbook { + font-family: "Open Sans", sans-serif; + color: var(--fg); + background-color: var(--bg); + text-size-adjust: none; + -webkit-text-size-adjust: none; + overflow-x: hidden; } -html { - font-family: "Open Sans", sans-serif; - color: var(--fg); - background-color: var(--bg); - text-size-adjust: none; - -webkit-text-size-adjust: none; -} - -body { - margin: 0; - font-size: 1.6rem; - overflow-x: hidden; -} - -code { - font-family: "Source Code Pro", Consolas, "Ubuntu Mono", Menlo, "DejaVu Sans Mono", monospace, monospace !important; - font-size: 0.875em; /* please adjust the ace font size accordingly in editor.js */ +#mdbook code { + font-family: "Source Code Pro", Consolas, "Ubuntu Mono", Menlo, "DejaVu Sans Mono", monospace, monospace !important; } /* make long words/inline code not x overflow */ -main { - overflow-wrap: break-word; +#mdbook main { + overflow-wrap: break-word; } /* make wide tables scroll if they overflow */ -.table-wrapper { - overflow-x: auto; +#mdbook .table-wrapper { + overflow-x: auto; } /* Don't change font size in headers. */ -h1 code, h2 code, h3 code, h4 code, h5 code, h6 code { - font-size: unset; +#mdbook h1 code, +#mdbook h2 code, +#mdbook h3 code, +#mdbook h4 code, +#mdbook h5 code, +#mdbook h6 code { + font-size: unset; } -.left { float: left; } -.right { float: right; } -.boring { opacity: 0.6; } -.hide-boring .boring { display: none; } -.hidden { display: none !important; } +#mdbook .left { float: left; } +#mdbook .right { float: right; } +#mdbook .boring { opacity: 0.6; } +#mdbook .hide-boring .boring { display: none; } +#mdbook .hidden { display: none !important; } -h2, h3 { margin-top: 2.5em; } -h4, h5 { margin-top: 2em; } +#mdbook h2, #mdbook h3 { margin-top: 2.5em; } +#mdbook h4, #mdbook h5 { margin-top: 2em; } -.header + .header h3, -.header + .header h4, -.header + .header h5 { - margin-top: 1em; +#mdbook .header + .header h3, +#mdbook .header + .header h4, +#mdbook .header + .header h5 { + margin-top: 1em; } -h1:target::before, -h2:target::before, -h3:target::before, -h4:target::before, -h5:target::before, -h6:target::before { - display: inline-block; - content: "»"; - margin-left: -30px; - width: 30px; +#mdbook h1:target::before, +#mdbook h2:target::before, +#mdbook h3:target::before, +#mdbook h4:target::before, +#mdbook h5:target::before, +#mdbook h6:target::before { + display: inline-block; + content: "»"; + margin-left: -30px; + width: 30px; } /* This is broken on Safari as of version 14, but is fixed @@ -73,119 +67,119 @@ h6:target::before { https://bugs.webkit.org/show_bug.cgi?id=218076 */ :target { - scroll-margin-top: calc(var(--menu-bar-height) + 0.5em); + scroll-margin-top: calc(var(--menu-bar-height) + 0.5em); } -.page { - outline: 0; - padding: 0 var(--page-padding); - margin-top: calc(0px - var(--menu-bar-height)); /* Compensate for the #menu-bar-hover-placeholder */ +#mdbook .page { + outline: 0; + padding: 0 var(--page-padding); + margin-top: calc(0px - var(--menu-bar-height)); /* Compensate for the #menu-bar-hover-placeholder */ } -.page-wrapper { - box-sizing: border-box; +#mdbook .page-wrapper { + box-sizing: border-box; } -.js:not(.sidebar-resizing) .page-wrapper { - transition: margin-left 0.3s ease, transform 0.3s ease; /* Animation: slide away */ +.js:not(.sidebar-resizing) #mdbook .page-wrapper { + transition: margin-left 0.3s ease, transform 0.3s ease; /* Animation: slide away */ } -.content { - overflow-y: auto; - padding: 0 5px 50px 5px; +#mdbook .content { + overflow-y: auto; + padding: 20px 5px 50px 5px; } -.content main { - margin-left: auto; - margin-right: auto; - max-width: var(--content-max-width); +#mdbook .content main { + margin-left: auto; + margin-right: auto; + max-width: var(--content-max-width); } -.content p { line-height: 1.45em; } -.content ol { line-height: 1.45em; } -.content ul { line-height: 1.45em; } -.content a { text-decoration: none; } -.content a:hover { text-decoration: underline; } -.content img, .content video { max-width: 100%; } -.content .header:link, -.content .header:visited { - color: var(--fg); +#mdbook .content p { line-height: 1.45em; } +#mdbook .content ol { line-height: 1.45em; } +#mdbook .content ul { line-height: 1.45em; } +#mdbook .content a { text-decoration: none; } +#mdbook .content a:hover { text-decoration: underline; } +#mdbook .content img, .content video { max-width: 100%; } +#mdbook .content .header:link, +#mdbook .content .header:visited { + color: var(--fg); } -.content .header:link, -.content .header:visited:hover { - text-decoration: none; +#mdbook .content .header:link, +#mdbook .content .header:visited:hover { + text-decoration: none; } -table { - margin: 0 auto; - border-collapse: collapse; +#mdbook table { + margin: 0 auto; + border-collapse: collapse; } -table td { - padding: 3px 20px; - border: 1px var(--table-border-color) solid; +#mdbook table td { + padding: 3px 20px; + border: 1px var(--table-border-color) solid; } -table thead { - background: var(--table-header-bg); +#mdbook table thead { + background: var(--table-header-bg); } -table thead td { - font-weight: 700; - border: none; +#mdbook table thead td { + font-weight: 700; + border: none; } -table thead th { - padding: 3px 20px; +#mdbook table thead th { + padding: 3px 20px; } -table thead tr { - border: 1px var(--table-header-bg) solid; +#mdbook table thead tr { + border: 1px var(--table-header-bg) solid; } /* Alternate background colors for rows */ -table tbody tr:nth-child(2n) { - background: var(--table-alternate-bg); +#mdbook table tbody tr:nth-child(2n) { + background: var(--table-alternate-bg); } -blockquote { - margin: 20px 0; - padding: 0 20px; - color: var(--fg); - background-color: var(--quote-bg); - border-top: .1em solid var(--quote-border); - border-bottom: .1em solid var(--quote-border); +#mdbook blockquote { + margin: 20px 0; + padding: 0 20px; + color: var(--fg); + background-color: var(--quote-bg); + border-top: .1em solid var(--quote-border); + border-bottom: .1em solid var(--quote-border); } -:not(.footnote-definition) + .footnote-definition, -.footnote-definition + :not(.footnote-definition) { - margin-top: 2em; +#mdbook :not(.footnote-definition) + .footnote-definition, +#mdbook .footnote-definition + :not(.footnote-definition) { + margin-top: 2em; } -.footnote-definition { - font-size: 0.9em; - margin: 0.5em 0; +#mdbook .footnote-definition { + font-size: 0.9em; + margin: 0.5em 0; } -.footnote-definition p { - display: inline; +#mdbook .footnote-definition p { + display: inline; } -.tooltiptext { - position: absolute; - visibility: hidden; - color: #fff; - background-color: #333; - transform: translateX(-50%); /* Center by moving tooltip 50% of its width left */ - left: -8px; /* Half of the width of the icon */ - top: -35px; - font-size: 0.8em; - text-align: center; - border-radius: 6px; - padding: 5px 8px; - margin: 5px; - z-index: 1000; +#mdbook .tooltiptext { + position: absolute; + visibility: hidden; + color: #fff; + background-color: #333; + transform: translateX(-50%); /* Center by moving tooltip 50% of its width left */ + left: -8px; /* Half of the width of the icon */ + top: -35px; + font-size: 0.8em; + text-align: center; + border-radius: 6px; + padding: 5px 8px; + margin: 5px; + z-index: 1000; } -.tooltipped .tooltiptext { - visibility: visible; +#mdbook .tooltipped .tooltiptext { + visibility: visible; } -.chapter li.part-title { - color: var(--sidebar-fg); - margin: 5px 0px; - font-weight: bold; +#mdbook .chapter li.part-title { + color: var(--sidebar-fg); + margin: 5px 0px; + font-weight: bold; } -.result-no-output { - font-style: italic; +#mdbook .result-no-output { + font-style: italic; } diff --git a/website/doc/theme/css/print.css b/website/doc/theme/css/print.css index 5e690f75..bd7c8da7 100644 --- a/website/doc/theme/css/print.css +++ b/website/doc/theme/css/print.css @@ -1,54 +1,65 @@ - #sidebar, #menu-bar, -.nav-chapters, -.mobile-nav-chapters { - display: none; +#mdbook .nav-chapters, +#mdbook .mobile-nav-chapters { + display: none; } -#page-wrapper.page-wrapper { - transform: none; - margin-left: 0px; - overflow-y: initial; +#mdbook, +#page-wrapper { + margin: 0; + padding: 0; + max-width: none; + transform: none !important; + overflow-y: initial; } #content { - max-width: none; - margin: 0; - padding: 0; + max-width: none; + margin: 0; + padding: 0; } -.page { - overflow-y: initial; +#mdbook .page { + overflow-y: initial; } -code { - background-color: #666666; - border-radius: 5px; +#mdbook code { + background-color: #eeeeee; + border-radius: 5px; - /* Force background to be printed in Chrome */ - -webkit-print-color-adjust: exact; + /* Force background to be printed in Chrome */ + -webkit-print-color-adjust: exact; } -pre > .buttons { - z-index: 2; +#mdbook pre > .buttons { + z-index: 2; } -a, a:visited, a:active, a:hover { - color: #4183c4; - text-decoration: none; +#mdbook a, +#mdbook a:visited, +#mdbook a:active, +#mdbook a:hover { + color: #4183c4; + text-decoration: none; } -h1, h2, h3, h4, h5, h6 { - page-break-inside: avoid; - page-break-after: avoid; +#mdbook h1, +#mdbook h2, +#mdbook h3, +#mdbook h4, +#mdbook h5, +#mdbook h6 { + page-break-inside: avoid; + page-break-after: avoid; } -pre, code { - page-break-inside: avoid; - white-space: pre-wrap; +#mdbook pre, +#mdbook code { + page-break-inside: avoid; + white-space: pre-wrap; } -.fa { - display: none !important; +#mdbook .fa { + display: none !important; } diff --git a/website/doc/theme/css/variables.css b/website/doc/theme/css/variables.css index 56b634bc..7a68155a 100644 --- a/website/doc/theme/css/variables.css +++ b/website/doc/theme/css/variables.css @@ -2,252 +2,252 @@ /* Globals */ :root { - --sidebar-width: 300px; - --page-padding: 15px; - --content-max-width: 750px; - --menu-bar-height: 50px; + --sidebar-width: 300px; + --page-padding: 15px; + --content-max-width: 750px; + --menu-bar-height: 50px; } /* Themes */ .ayu { - --bg: hsl(210, 25%, 8%); - --fg: #c5c5c5; + --bg: hsl(210, 25%, 8%); + --fg: #c5c5c5; - --sidebar-bg: #14191f; - --sidebar-fg: #c8c9db; - --sidebar-non-existant: #5c6773; - --sidebar-active: #ffb454; - --sidebar-spacer: #2d334f; + --sidebar-bg: #14191f; + --sidebar-fg: #c8c9db; + --sidebar-non-existant: #5c6773; + --sidebar-active: #ffb454; + --sidebar-spacer: #2d334f; - --scrollbar: var(--sidebar-fg); + --scrollbar: var(--sidebar-fg); - --icons: #737480; - --icons-hover: #b7b9cc; + --icons: #737480; + --icons-hover: #b7b9cc; - --links: #0096cf; + --links: #0096cf; - --inline-code-color: #ffb454; + --inline-code-color: #ffb454; - --theme-popup-bg: #14191f; - --theme-popup-border: #5c6773; - --theme-hover: #191f26; + --theme-popup-bg: #14191f; + --theme-popup-border: #5c6773; + --theme-hover: #191f26; - --quote-bg: hsl(226, 15%, 17%); - --quote-border: hsl(226, 15%, 22%); + --quote-bg: hsl(226, 15%, 17%); + --quote-border: hsl(226, 15%, 22%); - --table-border-color: hsl(210, 25%, 13%); - --table-header-bg: hsl(210, 25%, 28%); - --table-alternate-bg: hsl(210, 25%, 11%); + --table-border-color: hsl(210, 25%, 13%); + --table-header-bg: hsl(210, 25%, 28%); + --table-alternate-bg: hsl(210, 25%, 11%); - --searchbar-border-color: #848484; - --searchbar-bg: #424242; - --searchbar-fg: #fff; - --searchbar-shadow-color: #d4c89f; - --searchresults-header-fg: #666; - --searchresults-border-color: #888; - --searchresults-li-bg: #252932; - --search-mark-bg: #e3b171; + --searchbar-border-color: #848484; + --searchbar-bg: #424242; + --searchbar-fg: #fff; + --searchbar-shadow-color: #d4c89f; + --searchresults-header-fg: #666; + --searchresults-border-color: #888; + --searchresults-li-bg: #252932; + --search-mark-bg: #e3b171; } .coal { - --bg: hsl(200, 7%, 8%); - --fg: #98a3ad; + --bg: hsl(200, 7%, 8%); + --fg: #98a3ad; - --sidebar-bg: #292c2f; - --sidebar-fg: #a1adb8; - --sidebar-non-existant: #505254; - --sidebar-active: #3473ad; - --sidebar-spacer: #393939; + --sidebar-bg: #292c2f; + --sidebar-fg: #a1adb8; + --sidebar-non-existant: #505254; + --sidebar-active: #3473ad; + --sidebar-spacer: #393939; - --scrollbar: var(--sidebar-fg); + --scrollbar: var(--sidebar-fg); - --icons: #43484d; - --icons-hover: #b3c0cc; + --icons: #43484d; + --icons-hover: #b3c0cc; - --links: #2b79a2; + --links: #2b79a2; - --inline-code-color: #c5c8c6; + --inline-code-color: #c5c8c6; - --theme-popup-bg: #141617; - --theme-popup-border: #43484d; - --theme-hover: #1f2124; + --theme-popup-bg: #141617; + --theme-popup-border: #43484d; + --theme-hover: #1f2124; - --quote-bg: hsl(234, 21%, 18%); - --quote-border: hsl(234, 21%, 23%); + --quote-bg: hsl(234, 21%, 18%); + --quote-border: hsl(234, 21%, 23%); - --table-border-color: hsl(200, 7%, 13%); - --table-header-bg: hsl(200, 7%, 28%); - --table-alternate-bg: hsl(200, 7%, 11%); + --table-border-color: hsl(200, 7%, 13%); + --table-header-bg: hsl(200, 7%, 28%); + --table-alternate-bg: hsl(200, 7%, 11%); - --searchbar-border-color: #aaa; - --searchbar-bg: #b7b7b7; - --searchbar-fg: #000; - --searchbar-shadow-color: #aaa; - --searchresults-header-fg: #666; - --searchresults-border-color: #98a3ad; - --searchresults-li-bg: #2b2b2f; - --search-mark-bg: #355c7d; + --searchbar-border-color: #aaa; + --searchbar-bg: #b7b7b7; + --searchbar-fg: #000; + --searchbar-shadow-color: #aaa; + --searchresults-header-fg: #666; + --searchresults-border-color: #98a3ad; + --searchresults-li-bg: #2b2b2f; + --search-mark-bg: #355c7d; } .light { - --bg: hsl(0, 0%, 100%); - --fg: hsl(0, 0%, 0%); + --bg: hsl(0, 0%, 100%); + --fg: hsl(0, 0%, 0%); - --sidebar-bg: #fafafa; - --sidebar-fg: hsl(0, 0%, 0%); - --sidebar-non-existant: #aaaaaa; - --sidebar-active: #1f1fff; - --sidebar-spacer: #f4f4f4; + --sidebar-bg: #fafafa; + --sidebar-fg: hsl(0, 0%, 0%); + --sidebar-non-existant: #aaaaaa; + --sidebar-active: #1f1fff; + --sidebar-spacer: #f4f4f4; - --scrollbar: #8F8F8F; + --scrollbar: #8F8F8F; - --icons: #747474; - --icons-hover: #000000; + --icons: #747474; + --icons-hover: #000000; - --links: #20609f; + --links: #20609f; - --inline-code-color: #301900; + --inline-code-color: #301900; - --theme-popup-bg: #fafafa; - --theme-popup-border: #cccccc; - --theme-hover: #e6e6e6; + --theme-popup-bg: #fafafa; + --theme-popup-border: #cccccc; + --theme-hover: #e6e6e6; - --quote-bg: hsl(197, 37%, 96%); - --quote-border: hsl(197, 37%, 91%); + --quote-bg: hsl(197, 37%, 96%); + --quote-border: hsl(197, 37%, 91%); - --table-border-color: hsl(0, 0%, 95%); - --table-header-bg: hsl(0, 0%, 80%); - --table-alternate-bg: hsl(0, 0%, 97%); + --table-border-color: hsl(0, 0%, 95%); + --table-header-bg: hsl(0, 0%, 80%); + --table-alternate-bg: hsl(0, 0%, 97%); - --searchbar-border-color: #aaa; - --searchbar-bg: #fafafa; - --searchbar-fg: #000; - --searchbar-shadow-color: #aaa; - --searchresults-header-fg: #666; - --searchresults-border-color: #888; - --searchresults-li-bg: #e4f2fe; - --search-mark-bg: #a2cff5; + --searchbar-border-color: #aaa; + --searchbar-bg: #fafafa; + --searchbar-fg: #000; + --searchbar-shadow-color: #aaa; + --searchresults-header-fg: #666; + --searchresults-border-color: #888; + --searchresults-li-bg: #e4f2fe; + --search-mark-bg: #a2cff5; } .navy { - --bg: hsl(226, 23%, 11%); - --fg: #bcbdd0; + --bg: hsl(226, 23%, 11%); + --fg: #bcbdd0; - --sidebar-bg: #282d3f; - --sidebar-fg: #c8c9db; - --sidebar-non-existant: #505274; - --sidebar-active: #2b79a2; - --sidebar-spacer: #2d334f; + --sidebar-bg: #282d3f; + --sidebar-fg: #c8c9db; + --sidebar-non-existant: #505274; + --sidebar-active: #2b79a2; + --sidebar-spacer: #2d334f; - --scrollbar: var(--sidebar-fg); + --scrollbar: var(--sidebar-fg); - --icons: #737480; - --icons-hover: #b7b9cc; + --icons: #737480; + --icons-hover: #b7b9cc; - --links: #2b79a2; + --links: #2b79a2; - --inline-code-color: #c5c8c6; + --inline-code-color: #c5c8c6; - --theme-popup-bg: #161923; - --theme-popup-border: #737480; - --theme-hover: #282e40; + --theme-popup-bg: #161923; + --theme-popup-border: #737480; + --theme-hover: #282e40; - --quote-bg: hsl(226, 15%, 17%); - --quote-border: hsl(226, 15%, 22%); + --quote-bg: hsl(226, 15%, 17%); + --quote-border: hsl(226, 15%, 22%); - --table-border-color: hsl(226, 23%, 16%); - --table-header-bg: hsl(226, 23%, 31%); - --table-alternate-bg: hsl(226, 23%, 14%); + --table-border-color: hsl(226, 23%, 16%); + --table-header-bg: hsl(226, 23%, 31%); + --table-alternate-bg: hsl(226, 23%, 14%); - --searchbar-border-color: #aaa; - --searchbar-bg: #aeaec6; - --searchbar-fg: #000; - --searchbar-shadow-color: #aaa; - --searchresults-header-fg: #5f5f71; - --searchresults-border-color: #5c5c68; - --searchresults-li-bg: #242430; - --search-mark-bg: #a2cff5; + --searchbar-border-color: #aaa; + --searchbar-bg: #aeaec6; + --searchbar-fg: #000; + --searchbar-shadow-color: #aaa; + --searchresults-header-fg: #5f5f71; + --searchresults-border-color: #5c5c68; + --searchresults-li-bg: #242430; + --search-mark-bg: #a2cff5; } .rust { - --bg: hsl(60, 9%, 87%); - --fg: #262625; + --bg: hsl(60, 9%, 87%); + --fg: #262625; - --sidebar-bg: #3b2e2a; - --sidebar-fg: #c8c9db; - --sidebar-non-existant: #505254; - --sidebar-active: #e69f67; - --sidebar-spacer: #45373a; + --sidebar-bg: #3b2e2a; + --sidebar-fg: #c8c9db; + --sidebar-non-existant: #505254; + --sidebar-active: #e69f67; + --sidebar-spacer: #45373a; - --scrollbar: var(--sidebar-fg); + --scrollbar: var(--sidebar-fg); - --icons: #737480; - --icons-hover: #262625; + --icons: #737480; + --icons-hover: #262625; - --links: #2b79a2; + --links: #2b79a2; - --inline-code-color: #6e6b5e; + --inline-code-color: #6e6b5e; - --theme-popup-bg: #e1e1db; - --theme-popup-border: #b38f6b; - --theme-hover: #99908a; + --theme-popup-bg: #e1e1db; + --theme-popup-border: #b38f6b; + --theme-hover: #99908a; - --quote-bg: hsl(60, 5%, 75%); - --quote-border: hsl(60, 5%, 70%); + --quote-bg: hsl(60, 5%, 75%); + --quote-border: hsl(60, 5%, 70%); - --table-border-color: hsl(60, 9%, 82%); - --table-header-bg: #b3a497; - --table-alternate-bg: hsl(60, 9%, 84%); + --table-border-color: hsl(60, 9%, 82%); + --table-header-bg: #b3a497; + --table-alternate-bg: hsl(60, 9%, 84%); - --searchbar-border-color: #aaa; - --searchbar-bg: #fafafa; - --searchbar-fg: #000; - --searchbar-shadow-color: #aaa; - --searchresults-header-fg: #666; - --searchresults-border-color: #888; - --searchresults-li-bg: #dec2a2; - --search-mark-bg: #e69f67; + --searchbar-border-color: #aaa; + --searchbar-bg: #fafafa; + --searchbar-fg: #000; + --searchbar-shadow-color: #aaa; + --searchresults-header-fg: #666; + --searchresults-border-color: #888; + --searchresults-li-bg: #dec2a2; + --search-mark-bg: #e69f67; } @media (prefers-color-scheme: dark) { - .light.no-js { - --bg: hsl(200, 7%, 8%); - --fg: #98a3ad; + .light.no-js { + --bg: hsl(200, 7%, 8%); + --fg: #98a3ad; - --sidebar-bg: #292c2f; - --sidebar-fg: #a1adb8; - --sidebar-non-existant: #505254; - --sidebar-active: #3473ad; - --sidebar-spacer: #393939; + --sidebar-bg: #292c2f; + --sidebar-fg: #a1adb8; + --sidebar-non-existant: #505254; + --sidebar-active: #3473ad; + --sidebar-spacer: #393939; - --scrollbar: var(--sidebar-fg); + --scrollbar: var(--sidebar-fg); - --icons: #43484d; - --icons-hover: #b3c0cc; + --icons: #43484d; + --icons-hover: #b3c0cc; - --links: #2b79a2; + --links: #2b79a2; - --inline-code-color: #c5c8c6; + --inline-code-color: #c5c8c6; - --theme-popup-bg: #141617; - --theme-popup-border: #43484d; - --theme-hover: #1f2124; + --theme-popup-bg: #141617; + --theme-popup-border: #43484d; + --theme-hover: #1f2124; - --quote-bg: hsl(234, 21%, 18%); - --quote-border: hsl(234, 21%, 23%); + --quote-bg: hsl(234, 21%, 18%); + --quote-border: hsl(234, 21%, 23%); - --table-border-color: hsl(200, 7%, 13%); - --table-header-bg: hsl(200, 7%, 28%); - --table-alternate-bg: hsl(200, 7%, 11%); + --table-border-color: hsl(200, 7%, 13%); + --table-header-bg: hsl(200, 7%, 28%); + --table-alternate-bg: hsl(200, 7%, 11%); - --searchbar-border-color: #aaa; - --searchbar-bg: #b7b7b7; - --searchbar-fg: #000; - --searchbar-shadow-color: #aaa; - --searchresults-header-fg: #666; - --searchresults-border-color: #98a3ad; - --searchresults-li-bg: #2b2b2f; - --search-mark-bg: #355c7d; - } + --searchbar-border-color: #aaa; + --searchbar-bg: #b7b7b7; + --searchbar-fg: #000; + --searchbar-shadow-color: #aaa; + --searchresults-header-fg: #666; + --searchresults-border-color: #98a3ad; + --searchresults-li-bg: #2b2b2f; + --search-mark-bg: #355c7d; + } } diff --git a/website/src/mdbook.rs b/website/src/mdbook.rs index 48eb6eb0..3efe8e22 100644 --- a/website/src/mdbook.rs +++ b/website/src/mdbook.rs @@ -67,12 +67,12 @@ async fn mdbook_page(request: app::HttpRequest) -> ResultPage::Add(StyleSheet::located("/doc/ayu-highlight.css")) )); page.add_to( - "region-content", - Container::new() - .with_id("mdbook") - .with_component(Html::with(html! { (PreEscaped(html)) })) - ) - .render() + "region-content", + Container::new() + .with_id("mdbook") + .with_component(Html::with(html! { (PreEscaped(html)) })) + ) + .render() } else { Err(FatalError::NotFound) }