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

WiWaG · May 15, 2018 · 1b43a8e · 1b43a8e
2 parents bdd313a + 8e86b27
commit 1b43a8e
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 1 deletion.
diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -3,6 +3,21 @@
 Changelog
 *********
 
+master
+======
+
+New Features
+-------------
+
+Fixes
+-----
+
+* Fix small styling issues
+
+Other Changes
+--------------
+
+
 v0.3.1
 ======
 

diff --git a/js/theme.js b/js/theme.js
@@ -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;
         }
 

diff --git a/sass/_theme_rst.sass b/sass/_theme_rst.sass
@@ -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.