Merge pull request #13 from pandas-dev/inherit-sphinx-layout

Inherit from sphinx's basic layout
pydata · Sep 9, 2019 · a40d8e0 · a40d8e0
2 parents 057a0c3 + 0910c3e
commit a40d8e0
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 26 deletions.
diff --git a/pandas-docs/source/_themes/bootstrap_docs_theme/header.html b/pandas-docs/source/_themes/bootstrap_docs_theme/header.html
diff --git a/pandas-docs/source/_themes/bootstrap_docs_theme/layout.html b/pandas-docs/source/_themes/bootstrap_docs_theme/layout.html
@@ -1,10 +1,31 @@
 
-<!doctype html>
-<html lang="en">
-  <head>
-    {%- include "header.html" %}
-  </head> 
-  <body data-spy="scroll" data-target="#bd-toc-nav" data-offset="60"> 
+{% extends "basic/layout.html" %}
+
+{%- block css %}
+    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
+{{- css() }}
+    <link href="{{ pathto('_static/css/custom.css', 1) }}" rel="stylesheet">
+{%- endblock %}
+
+{%- block extrahead %}
+
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <meta name="docsearch:language" content="en">
+
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js" integrity="sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1" crossorigin="anonymous"></script>
+    <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous"></script>
+{%- endblock %}
+
+{# Silence the sidebar's, relbar's #}
+{% block header %}{% endblock %}
+{% block relbar1 %}{% endblock %}
+{% block relbar2 %}{% endblock %}
+{% block sidebarsourcelink %}{% endblock %}
+
+{% block body_tag %}
+  <body data-spy="scroll" data-target="#bd-toc-nav" data-offset="60">
+{%- endblock %}
+{%- block content %}
     <nav class="navbar navbar-light navbar-expand-lg bg-light fixed-top bd-navbar" id="navbar-main">
         <div class="container">
             {%- include "docs-navbar.html" %}
@@ -36,4 +57,4 @@
 
     {# %- include "scripts.html" % #}
   </body>
-</html>
+{%- endblock %}
diff --git a/.../bootstrap_docs_theme/static/nature.css_t → ..._docs_theme/static/sphinx-bootstrap.css_t b/.../bootstrap_docs_theme/static/nature.css_t → ..._docs_theme/static/sphinx-bootstrap.css_t
@@ -16,7 +16,6 @@
 body {
     font-family: Arial, sans-serif;
     font-size: 100%;
-    background-color: #111;
     color: #555;
     margin: 0;
     padding: 0;

diff --git a/pandas-docs/source/_themes/bootstrap_docs_theme/theme.conf b/pandas-docs/source/_themes/bootstrap_docs_theme/theme.conf
@@ -1,6 +1,6 @@
 [theme]
 inherit = basic
-stylesheet = nature.css
+stylesheet = sphinx-bootstrap.css
 pygments_style = tango
 
 [options]