IntenseWebs/sphinx_rtd_theme
3
0
Fork 0
mirror of https://github.com/readthedocs/sphinx_rtd_theme.git synced 2025-02-25 18:55:21 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into bottom-margin-in-tables

Browse Source
This commit is contained in:
David Fischer 2018-05-15 13:41:50 -04:00 committed by GitHub
commit 1b43a8ec5c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
docs/changelog.rst
View File

@ -3,6 +3,21 @@
Changelog
*********
master
======
New Features
-------------
Fixes
-----
* Fix small styling issues
Other Changes
--------------
v0.3.1
======

2
js/theme.js
View File

@ -22,7 +22,7 @@ function ThemeNav () {
// out from the RTD assets. This just ensures old projects that are
// calling `enable()` get the sticky menu on by default. All other cals
// to `enable` should include an argument for enabling the sticky menu.
if (typeof(withStickNav) == 'undefined') {
if (typeof(withStickyNav) == 'undefined') {
withStickyNav = true;
}

3
sass/_theme_rst.sass
View File

@ -132,6 +132,7 @@
.line-block
margin-left: 0px
margin-bottom: $base-line-height
line-height: $base-line-height
.line-block .line-block
margin-left: $base-line-height
margin-bottom: 0px
@ -285,12 +286,14 @@
margin-bottom: $base-line-height
dt
font-weight: bold
margin-bottom: $base-line-height / 2
// Most of the content within these dls are one liners, so I halve the normal margins.
p, table, ul, ol
margin-bottom: $base-line-height / 2 !important
// rST seems to want dds to be treated as the browser would, indented.
dd
margin: 0 0 $base-line-height / 2 $base-line-height
line-height: $base-line-height
// This is what Sphinx spits out for it's autodocs. Depending upon what language the person is referencing
// these things usually have a class of "method" or "class" or something similar, but really who knows.
// Sphinx doesn't give me a generic class on these, so unfortunately I have to apply it to the root dl.