fix merge conflicts

Author: drammock

pydata_sphinx_theme/static/css/index.5b35eb4443eed178844bc949edcf9870.css renamed to pydata_sphinx_theme/static/css/index.0e366ba14472447708f75ccb7d8f24a3.css

@@ -17,13 +17,13 @@
 
 {% macro head_pre_bootstrap() %}
   <link href="{{ pathto('_static/css/theme.css', 1) }}" rel="stylesheet" />
-  <link href="{{ pathto('_static/css/index.5b35eb4443eed178844bc949edcf9870.css', 1) }}" rel="stylesheet" />
+  <link href="{{ pathto('_static/css/index.0e366ba14472447708f75ccb7d8f24a3.css', 1) }}" rel="stylesheet" />
 {% endmacro %}
 
 {% macro head_js_preload() %}
-  <link rel="preload" as="script" href="{{ pathto('_static/js/index.d224e2d0db453c36b0d3.js', 1) }}">
+  <link rel="preload" as="script" href="{{ pathto('_static/js/index.9ab83e9ee01d4093105a.js', 1) }}">
 {% endmacro %}
 
 {% macro body_post() %}
-  <script src="{{ pathto('_static/js/index.d224e2d0db453c36b0d3.js', 1) }}"></script>
+  <script src="{{ pathto('_static/js/index.9ab83e9ee01d4093105a.js', 1) }}"></script>
 {% endmacro %}

pydata_sphinx_theme/static/js/index.d224e2d0db453c36b0d3.js renamed to pydata_sphinx_theme/static/js/index.9ab83e9ee01d4093105a.js

@@ -32,7 +32,6 @@ function addTOCInteractivity() {
     const activeNavLinks = document.querySelectorAll('#bd-toc-nav a.active');
     activeNavLinks.forEach((navLink) => {
       navLink.parentElement.classList.add('active');
-      console.log('foo');
     });
   });
 }

pydata_sphinx_theme/static/webpack-macros.html

@@ -1,6 +1,6 @@
 html {
   font-size: var(--font-size-base);
-  scroll-padding-top: calc(var(--header-height) + 11px);
+  scroll-padding-top: calc(var(--header-height) + 12px);
 }
 
 body {