Merge branch 'bugfix/page-scrolling' into improvement/navigation-new

# Conflicts:
#	_layouts/default.html
#	assets/js/just-the-docs.js
This commit is contained in:
Silvio Giebl 2020-06-15 21:44:30 +02:00
commit 18f3a41600
4 changed files with 122 additions and 165 deletions

View File

@ -26,7 +26,6 @@ layout: table_wrappers
</symbol> </symbol>
</svg> </svg>
<div class="page-wrap">
<div class="side-bar"> <div class="side-bar">
<div class="site-header"> <div class="site-header">
<a href="{{ '/' | absolute_url }}" class="site-title lh-tight">{% include title.html %}</a> <a href="{{ '/' | absolute_url }}" class="site-title lh-tight">{% include title.html %}</a>
@ -41,7 +40,6 @@ layout: table_wrappers
This site uses <a href="https://github.com/pmarsceill/just-the-docs">Just the Docs</a>, a documentation theme for Jekyll. This site uses <a href="https://github.com/pmarsceill/just-the-docs">Just the Docs</a>, a documentation theme for Jekyll.
</footer> </footer>
</div> </div>
<div id="main-wrap" class="main-wrap" tabindex="0">
<div class="main" id="top"> <div class="main" id="top">
<div id="main-header" class="main-header"> <div id="main-header" class="main-header">
{% if site.search_enabled != false %} {% if site.search_enabled != false %}
@ -145,14 +143,12 @@ layout: table_wrappers
</div> </div>
</div> </div>
</div> </div>
</div>
{% if site.search_enabled != false %} {% if site.search_enabled != false %}
<a href="#" id="search-button" class="search-button"> <a href="#" id="search-button" class="search-button">
<svg viewBox="0 0 24 24" class="icon"><use xlink:href="#search"></use></svg> <svg viewBox="0 0 24 24" class="icon"><use xlink:href="#search"></use></svg>
</a> </a>
{% endif %} {% endif %}
</div>
</body> </body>
</html> </html>

View File

@ -27,7 +27,6 @@ figure.highlight {
.highlighter-rouge { .highlighter-rouge {
margin-bottom: $sp-3; margin-bottom: $sp-3;
overflow: hidden;
border-radius: $border-radius; border-radius: $border-radius;
} }

View File

@ -2,19 +2,6 @@
// The basic two column layout // The basic two column layout
// //
.page-wrap {
@include mq(md) {
position: absolute;
top: 0;
left: 0;
display: flex;
width: 100%;
height: 100%;
overflow-x: hidden;
overflow-y: hidden;
}
}
.side-bar { .side-bar {
z-index: 100; z-index: 100;
display: flex; display: flex;
@ -23,7 +10,7 @@
@include mq(md) { @include mq(md) {
flex-wrap: nowrap; flex-wrap: nowrap;
position: absolute; position: fixed;
width: $nav-width-md; width: $nav-width-md;
height: 100%; height: 100%;
flex-direction: column; flex-direction: column;
@ -37,23 +24,6 @@
} }
} }
.main-wrap {
@include mq(md) {
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
-webkit-overflow-scrolling: touch;
overflow-x: hidden;
overflow-y: scroll;
}
&:focus {
outline: none;
}
}
.main { .main {
@include mq(md) { @include mq(md) {
position: relative; position: relative;

View File

@ -306,13 +306,6 @@ function initSearch() {
} }
{%- endif %} {%- endif %}
// Focus
function pageFocus() {
var mainWrap = document.getElementById('main-wrap');
mainWrap.focus();
}
// Switch theme // Switch theme
jtd.getTheme = function() { jtd.getTheme = function() {
@ -329,7 +322,6 @@ jtd.setTheme = function(theme) {
jtd.onReady(function(){ jtd.onReady(function(){
initNav(); initNav();
pageFocus();
{% if site.search_enabled != false -%} {% if site.search_enabled != false -%}
initSearch(); initSearch();
{%- endif %} {%- endif %}