{{- if $toc }}
diff --git a/layouts/partials/shortcodes/image.html b/layouts/partials/shortcodes/image.html
index 6b15a9db43..c4c9466d07 100644
--- a/layouts/partials/shortcodes/image.html
+++ b/layouts/partials/shortcodes/image.html
@@ -35,12 +35,12 @@
{{- end }}
{{- $id := partial "make-random-md5.hugo" }}
{{- if $lightbox }}
-
+
{{- end }}
{{- if $lightbox }}
-
+
{{- end }}
\ No newline at end of file
diff --git a/static/css/theme.css b/static/css/theme.css
index b81d90a2d1..735dc47924 100644
--- a/static/css/theme.css
+++ b/static/css/theme.css
@@ -313,7 +313,7 @@ dd {
z-index: 70;
}
-#body img,
+#body img:not(.lightbox-image),
#body img.center,
#body .video-container {
display: block;
diff --git a/static/js/theme.js b/static/js/theme.js
index 9d8964f4c3..0a3cb7bf70 100644
--- a/static/js/theme.js
+++ b/static/js/theme.js
@@ -382,7 +382,7 @@ function initCodeClipboard(){
var span = document.createElement( 'span' );
span.classList.add( 'copy-to-clipboard' );
span.appendChild( clone );
- code.replaceWith( span );
+ parent.replaceChild( span, code );
code = clone;
}
var button = document.createElement( 'span' );
@@ -394,7 +394,7 @@ function initCodeClipboard(){
this.removeAttribute( 'aria-label' );
this.classList.remove( 'tooltipped', 'tooltipped-w', 'tooltipped-se', 'tooltipped-sw' );
});
- code.after( button );
+ parent.insertBefore( button, code.nextSibling );
}
}
}
@@ -816,12 +816,12 @@ function scrollToFragment() {
function mark() {
// mark some additional stuff as searchable
- var topbarLinks = document.querySelectorAll( '#topbar a:not(:has(img)):not(.btn)' );
+ var topbarLinks = document.querySelectorAll( '#topbar a:not(.topbar-link):not(.btn)' );
for( var i = 0; i < topbarLinks.length; i++ ){
topbarLinks[i].classList.add( 'highlight' );
}
- var bodyInnerLinks = document.querySelectorAll( '#body-inner a:not(:has(img)):not(.btn):not(.lightbox):not(a[rel="footnote"])' );
+ var bodyInnerLinks = document.querySelectorAll( '#body-inner a:not(.lightbox-link):not(.btn):not(.lightbox):not(a[rel="footnote"])' );
for( var i = 0; i < bodyInnerLinks.length; i++ ){
bodyInnerLinks[i].classList.add( 'highlight' );
}
@@ -992,12 +992,17 @@ function initSearch() {
e.addEventListener( 'keydown', function( event ){
if( event.key == 'Escape' ){
var input = event.target;
- input.blur();
+ var search = sessionStorage.getItem( baseUriFull+'search-value' );
+ if( !search || !search.length ){
+ input.blur();
+ }
searchInputHandler( '' );
inputs.forEach( function( e ){
e.value = '';
});
- documentFocus();
+ if( !search || !search.length ){
+ documentFocus();
+ }
}
});
e.addEventListener( 'input', function( event ){
diff --git a/static/js/variant.js b/static/js/variant.js
index d9a08d1db5..c2f2f21263 100644
--- a/static/js/variant.js
+++ b/static/js/variant.js
@@ -19,6 +19,9 @@ if(!Array.prototype.find){Array.prototype.find=function(predicate){if(this===nul
Array.from||(Array.from=function(){var r;try{r=Symbol.iterator?Symbol.iterator:"Symbol(Symbol.iterator)"}catch(t){r="Symbol(Symbol.iterator)"}var t=Object.prototype.toString,n=function(r){return"function"==typeof r||"[object Function]"===t.call(r)},o=Math.pow(2,53)-1,e=function(r){var t=function(r){var t=Number(r);return isNaN(t)?0:0!==t&&isFinite(t)?(t>0?1:-1)*Math.floor(Math.abs(t)):t}(r);return Math.min(Math.max(t,0),o)},a=function(t,n){var o=t&&n[r]();return function(r){return t?o.next():n[r]}},i=function(r,t,n,o,e,a){for(var i=0;i
1?arguments[1]:void 0;if(void 0!==c){if(!n(c))throw new TypeError("Array.from: when provided, the second argument must be a function");arguments.length>2&&(l=arguments[2])}var y=e(u.length),h=n(o)?Object(new o(y)):new Array(y);return i(l,h,y,a(f,u),f,c)}}());
+const ElementPrototype=window.Element.prototype;
+if(typeof ElementPrototype.matches!=='function'){ElementPrototype.matches=ElementPrototype.msMatchesSelector||ElementPrototype.mozMatchesSelector||ElementPrototype.webkitMatchesSelector||function matches(selector){let element=this;const elements=(element.document||element.ownerDocument).querySelectorAll(selector);let index=0;while(elements[index]&&elements[index]!==element){index+=1}return Boolean(elements[index])}}if(typeof ElementPrototype.closest!=='function'){ElementPrototype.closest=function closest(selector){let element=this;while(element&&element.nodeType===1){if(element.matches(selector)){return element}element=element.parentNode}return null}}
+
function _createForOfIteratorHelperLoose(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (it) return (it = it.call(o)).next.bind(it); if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; return function () { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }