Merge branch 'master' into line-number-support

lib/default-theme/styles/code.styl

@@ -89,6 +89,9 @@ div[class="language-c"]:before
 div[class="language-bash"]:before
   content "sh"
 
+div[class="language-yaml"]:before
+  content "yaml"
+
 $lineNumberWrapperWidth = 3rem
 
 .content pre[line-number-mode]

lib/markdown/highlightLines.js

@@ -14,7 +14,6 @@ module.exports = md => {
       return `<div class="language-${langName}">${fence(...args)}</div>`
     }
 
-    const langName = token.info.replace(RE, '').trim()
     token.info = langName
 
     const lineNumbers = RE.exec(token.info)[1]
@@ -54,6 +53,6 @@ module.exports = md => {
         highlightedCode += `${split.code}\n`
       }
     })
-    return `<div class="language-${langName}">${highlightedCode}</div>`
+    return highlightedCode
   }
 }