Skip to content

Commit 23094a4

Browse files
authored
Merge branch 'master' into davidfischer/native-code-font-stack
2 parents 141e328 + 5f9ec36 commit 23094a4

File tree

3 files changed

+8
-1
lines changed

3 files changed

+8
-1
lines changed

docs/changelog.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ Other Changes
1616
--------------
1717

1818
* Changed code and literals to use a native font stack (#612)
19+
* Fix small styling issues
1920

2021
v0.3.1
2122
======

js/theme.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ function ThemeNav () {
2222
// out from the RTD assets. This just ensures old projects that are
2323
// calling `enable()` get the sticky menu on by default. All other cals
2424
// to `enable` should include an argument for enabling the sticky menu.
25-
if (typeof(withStickNav) == 'undefined') {
25+
if (typeof(withStickyNav) == 'undefined') {
2626
withStickyNav = true;
2727
}
2828

sass/_theme_rst.sass

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,7 @@
132132
.line-block
133133
margin-left: 0px
134134
margin-bottom: $base-line-height
135+
line-height: $base-line-height
135136
.line-block .line-block
136137
margin-left: $base-line-height
137138
margin-bottom: 0px
@@ -246,6 +247,9 @@
246247
border-color: $table-border-color
247248
&:not(.field-list)
248249
@extend .wy-table-striped
250+
// Remove bottom margin for the last element (and it's last child)
251+
td .last, td .last :last-child
252+
margin-bottom: 0
249253
// This table is what gets spit out for auto-generated API stuff. I style it smaller bits of padding.
250254
table.field-list
251255
@extend .wy-table
@@ -285,12 +289,14 @@
285289
margin-bottom: $base-line-height
286290
dt
287291
font-weight: bold
292+
margin-bottom: $base-line-height / 2
288293
// Most of the content within these dls are one liners, so I halve the normal margins.
289294
p, table, ul, ol
290295
margin-bottom: $base-line-height / 2 !important
291296
// rST seems to want dds to be treated as the browser would, indented.
292297
dd
293298
margin: 0 0 $base-line-height / 2 $base-line-height
299+
line-height: $base-line-height
294300
// This is what Sphinx spits out for it's autodocs. Depending upon what language the person is referencing
295301
// these things usually have a class of "method" or "class" or something similar, but really who knows.
296302
// Sphinx doesn't give me a generic class on these, so unfortunately I have to apply it to the root dl.

0 commit comments

Comments
 (0)