Merge branch 'master' into version-in-js

This commit is contained in:
Aaron Carlisle 2018-04-13 12:12:52 -04:00 committed by GitHub
commit 049a1a01da
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 31 additions and 4 deletions

View File

@ -6,6 +6,17 @@ Changelog
master
======
New Features
-------------
Fixes
-----
* Fix table centering (#599)
Other Changes
--------------
v0.3.0
======

View File

@ -26,7 +26,7 @@ file of this repository, and can be defined in your project's ``conf.py`` via
'style_external_links': False,
'vcs_pageview_mode': '',
# Toc options
'collapse_navigation': False,
'collapse_navigation': True,
'sticky_navigation': True,
'navigation_depth': 4,
'includehidden': True,
@ -56,12 +56,19 @@ TOC Options
These effect how we display the Table of Contents in the side bar. You can read more about them here: http://www.sphinx-doc.org/en/stable/templating.html#toctree
* ``collapse_navigation`` Bool. With this enabled, you will lose the ``[+]`` drop downs next to each section in the sidebar.
This is useful for *very large* documents.
* ``sticky_navigation`` Bool. This causes the sidebar to scroll with the main page content as you scroll the page.
* ``navigation_depth`` Int. Indicate the max depth of the tree; by default, all levels are included.
* ``navigation_depth`` Int. Indicate the max depth of the tree; by default, 4 levels are included;
set it to -1 to allow unlimited depth.
* ``includehidden`` Bool. Specifies if the sidebar includes toctrees marked with the ``:hidden:`` option
* ``titles_only`` Bool. If True, removes headers within a page from the sidebar.
.. note::
Setting ``collapse_navigation`` to False and using a high ``navigation_depth``
can cause projects with many files and a deep file structure to generate HTML files
that are significantly larger in file size and much longer compilation times.
HTML Context Options
--------------------

View File

@ -79,6 +79,11 @@
font-family: $code-font-family
display: block
overflow: auto
& .hll
// Line emphasis spans full width
display: block
margin: 0 -1 * $base-line-height / 2
padding: 0 $base-line-height / 2
pre.literal-block, div[class^='highlight'] pre, .linenodiv pre
font-size: 12px
line-height: normal
@ -122,6 +127,8 @@
@extend .wy-plain-list-decimal
.section ol p, .section ul p
margin-bottom: $base-line-height / 2
&:last-child
margin-bottom: $base-line-height
.line-block
margin-left: 0px
margin-bottom: $base-line-height
@ -143,7 +150,9 @@
margin: 0px $base-line-height $base-line-height 0px
.align-center
margin: auto
display: block
// Do not override display:table for tables
&:not(table)
display: block
.toctree-wrapper p.caption
@extend h2