Merge remote-tracking branch 'upstream/master' into refactor

facebook · Jul 15, 2018 · e80ced2 · e80ced2
2 parents ada5cc4 + 03e237a
commit e80ced2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/lib/server/docs.js b/lib/server/docs.js
@@ -11,7 +11,6 @@ const fs = require('fs-extra');
 const React = require('react');
 const env = require('./env.js');
 const readMetadata = require('./readMetadata.js');
-const DocsLayout = require('../core/DocsLayout.js');
 const {insertTOC} = require('../core/toc.js');
 const {getPath} = require('../core/utils.js');
 
@@ -76,6 +75,7 @@ function getComponent(rawContent, mdToHtml, metadata) {
     `](${siteConfig.baseUrl}docs/assets/`
   );
 
+  const DocsLayout = require('../core/DocsLayout.js');
   return (
     <DocsLayout
       metadata={metadata}

diff --git a/lib/static/css/main.css b/lib/static/css/main.css
@@ -111,10 +111,16 @@ body {
   box-sizing: border-box;
 }
 
-strong {
+strong,
+b {
   font-weight: 600;
 }
 
+em,
+i {
+  font-style: italic;
+}
+
 [type='checkbox'] {
   box-sizing: border-box;
   padding: 0;