Merge branch 'master' into version-in-js

Gruntfile.js

@@ -49,14 +49,6 @@ module.exports = function(grunt) {
                     'bower_components/robotoslab-googlefont/RobotoSlab-Regular.ttf'],
               dest: 'sphinx_rtd_theme/static/fonts/',
               filter: 'isFile'
-          },
-          {
-              expand: true,
-              flatten: true,
-              src: ['bower_components/inconsolata-googlefont/Inconsolata-Bold.ttf',
-                    'bower_components/inconsolata-googlefont/Inconsolata-Regular.ttf'],
-              dest: 'sphinx_rtd_theme/static/fonts/',
-              filter: 'isFile'
           }
         ]
       }

OFL-License.txt

@@ -1,6 +1,4 @@
-sphinx_rtd_theme/static/fonts/Inconsolata-Bold.ttf
 sphinx_rtd_theme/static/fonts/Lato-Bold.ttf
-sphinx_rtd_theme/static/fonts/Inconsolata.ttf
 sphinx_rtd_theme/static/fonts/Lato-Regular.ttf
 
 

bower.json

@@ -31,7 +31,6 @@
   "dependencies": {
     "lato-googlefont": "*",
     "robotoslab-googlefont": "*",
-    "inconsolata-googlefont": "*",
     "font-awesome": "~4.7"
   },
   "resolutions": {

docs/changelog.rst

@@ -16,6 +16,8 @@ Other Changes
 --------------
 
 * Write theme version and build date at top of JavaScript and CSS
+* Changed code and literals to use a native font stack (#612)
+* Fix small styling issues
 
 v0.3.1
 ======

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

sass/_theme_font_local.sass

@@ -1,15 +1,3 @@
-@font-face 
-  font-family: 'Inconsolata'
-  font-style: normal
-  font-weight: 400
-  src: local('Inconsolata'), local('Inconsolata-Regular'), url(../fonts/Inconsolata-Regular.ttf) format('truetype')
-
-@font-face
-  font-family: 'Inconsolata'
-  font-style: normal
-  font-weight: 700
-  src: local('Inconsolata Bold'), local('Inconsolata-Bold'), url(../fonts/Inconsolata-Bold.ttf) format('truetype')
-
 @font-face
   font-family: 'Lato'
   font-style: normal

sass/_theme_rst.sass

@@ -76,7 +76,6 @@
     white-space: pre
     margin: 0
     padding: $base-line-height / 2 $base-line-height / 2
-    font-family: $code-font-family
     display: block
     overflow: auto
     & .hll
@@ -85,6 +84,7 @@
       margin: 0 -1 * $base-line-height / 2
       padding: 0 $base-line-height / 2
   pre.literal-block, div[class^='highlight'] pre, .linenodiv pre
+    font-family: $code-font-family
     font-size: 12px
     line-height: normal
 
@@ -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
@@ -265,6 +269,7 @@
   tt, code
     @extend code
     color: $black
+    font-family: $code-font-family
     padding: 2px 5px
     big, em
       font-size: 100% !important
@@ -275,6 +280,8 @@
     &.xref, a &
       font-weight: bold
       color: $text-codexref-color
+  pre, kbd, samp
+    font-family: $code-font-family
   // If the literal is inside an a tag, let's color it like a link
   a tt, a code
     color: $link-color
@@ -282,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.

sass/_theme_variables.sass

@@ -63,4 +63,4 @@ $highlight-color:                     $yellow
 $base-font-family:                    "Lato", "proxima-nova", "Helvetica Neue", Arial, sans-serif
 $custom-font-family:                  "Roboto Slab", "ff-tisa-web-pro", "Georgia", Arial, sans-serif
 $custom-font-family2:                 Georgia, serif
-$code-font-family:                    Consolas, "Andale Mono WT", "Andale Mono", "Lucida Console", "Lucida Sans Typewriter", "DejaVu Sans Mono", "Bitstream Vera Sans Mono", "Liberation Mono", "Nimbus Mono L", Monaco, "Courier New", Courier, monospace
+$code-font-family:                    SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", Courier, monospace