Merge branch 'master' into davidfischer/native-code-font-stack

This commit is contained in:
David Fischer 2018-05-15 14:06:41 -04:00 committed by GitHub
commit 23094a4ff6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 1 deletions

View File

@ -16,6 +16,7 @@ Other Changes
--------------
* Changed code and literals to use a native font stack (#612)
* Fix small styling issues
v0.3.1
======

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;
}

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
@ -246,6 +247,9 @@
border-color: $table-border-color
&:not(.field-list)
@extend .wy-table-striped
// Remove bottom margin for the last element (and it's last child)
td .last, td .last :last-child
margin-bottom: 0
// This table is what gets spit out for auto-generated API stuff. I style it smaller bits of padding.
table.field-list
@extend .wy-table
@ -285,12 +289,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.