Merge pull request #496 from rtfd/fix-external-display

Fix theme logic and rebuild prod assets
This commit is contained in:
Eric Holscher 2017-12-12 12:02:24 -08:00 committed by GitHub
commit d756528ba1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 43 additions and 8 deletions

View File

@ -159,7 +159,7 @@
{# PAGE CONTENT #}
<div class="wy-nav-content">
{% if (theme_style_external_links == 'True') %}
{% if theme_style_external_links|tobool %}
<div class="rst-content style-external-links">
{% else %}
<div class="rst-content">
@ -207,7 +207,7 @@
{% endif %}
{# STICKY NAVIGATION #}
{% if theme_sticky_navigation %}
{% if theme_sticky_navigation|tobool %}
<script type="text/javascript">
jQuery(function () {
SphinxRtdTheme.StickyNav.enable();

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -30,16 +30,21 @@ function ThemeNav () {
// Set scroll monitor
self.win.on('scroll', function () {
if (!self.linkScroll) {
if (!self.winScroll) {
self.winScroll = true;
requestAnimationFrame(function() { self.onScroll(); });
}
}
});
setInterval(function () { if (self.winScroll) self.onScroll(); }, 25);
// Set resize monitor
self.win.on('resize', function () {
if (!self.winResize) {
self.winResize = true;
requestAnimationFrame(function() { self.onResize(); });
}
});
setInterval(function () { if (self.winResize) self.onResize(); }, 25);
self.onResize();
});
};
@ -168,4 +173,34 @@ if (typeof(window) != 'undefined') {
window.SphinxRtdTheme = { StickyNav: module.exports.ThemeNav };
}
// requestAnimationFrame polyfill by Erik Möller. fixes from Paul Irish and Tino Zijdel
// https://gist.github.com/paulirish/1579671
// MIT license
(function() {
var lastTime = 0;
var vendors = ['ms', 'moz', 'webkit', 'o'];
for(var x = 0; x < vendors.length && !window.requestAnimationFrame; ++x) {
window.requestAnimationFrame = window[vendors[x]+'RequestAnimationFrame'];
window.cancelAnimationFrame = window[vendors[x]+'CancelAnimationFrame']
|| window[vendors[x]+'CancelRequestAnimationFrame'];
}
if (!window.requestAnimationFrame)
window.requestAnimationFrame = function(callback, element) {
var currTime = new Date().getTime();
var timeToCall = Math.max(0, 16 - (currTime - lastTime));
var id = window.setTimeout(function() { callback(currTime + timeToCall); },
timeToCall);
lastTime = currTime + timeToCall;
return id;
};
if (!window.cancelAnimationFrame)
window.cancelAnimationFrame = function(id) {
clearTimeout(id);
};
}());
},{"jquery":"jquery"}]},{},["sphinx-rtd-theme"]);