aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjonschlinkert <[email protected]>2014-10-26 06:38:10 -0400
committerjonschlinkert <[email protected]>2014-10-26 06:38:10 -0400
commit3e9b461766fffe71c58da2d61cd3773f83caa2cf (patch)
tree5b3844558a96e2998ddda4d37af3d9f0a7f5126f
parentbab3679d1031ac77503c0c14b56aeda885721584 (diff)
downloadbootstrap-3e9b461766fffe71c58da2d61cd3773f83caa2cf.tar.xz
bootstrap-3e9b461766fffe71c58da2d61cd3773f83caa2cf.zip
Replaces markdown.js with [remarkable](https://github.com/jonschlinkert/remarkable).
- remarkable has 100% support for [commonmark](http://jgm.github.io/CommonMark/spec.html) - [faster](https://github.com/jonschlinkert/remarkable/tree/master/benchmark) - easier to monkeypatch. this is a goal of ours, might be useful to you at some point given the custom tokenizing/parsing you're doing for documentation.
-rw-r--r--docs/_includes/customizer-variables.html2
-rw-r--r--grunt/bs-lessdoc-parser.js6
-rw-r--r--package.json2
3 files changed, 6 insertions, 4 deletions
diff --git a/docs/_includes/customizer-variables.html b/docs/_includes/customizer-variables.html
index 21a0b8797..e3e3dab39 100644
--- a/docs/_includes/customizer-variables.html
+++ b/docs/_includes/customizer-variables.html
@@ -295,7 +295,7 @@
</div>
</div>
<h2 id="buttons">Buttons</h2>
-<p>For each of Bootstrap&#39;s buttons, define text, background and border color.</p>
+<p>For each of Bootstrap's buttons, define text, background and border color.</p>
<div class="row">
<div class="bs-customizer-input">
<label for="input-@btn-font-weight">@btn-font-weight</label>
diff --git a/grunt/bs-lessdoc-parser.js b/grunt/bs-lessdoc-parser.js
index c1821de1c..fb1666187 100644
--- a/grunt/bs-lessdoc-parser.js
+++ b/grunt/bs-lessdoc-parser.js
@@ -6,11 +6,13 @@
*/
'use strict';
-var markdown = require('markdown').markdown;
+var Remarkable = require('remarkable');
function markdown2html(markdownString) {
+ var md = new Remarkable();
+
// the slice removes the <p>...</p> wrapper output by Markdown processor
- return markdown.toHTML(markdownString.trim()).slice(3, -4);
+ return md.render(markdownString.trim()).slice(3, -5);
}
diff --git a/package.json b/package.json
index 624625ce2..f52ca15f8 100644
--- a/package.json
+++ b/package.json
@@ -56,8 +56,8 @@
"grunt-saucelabs": "~8.3.2",
"grunt-sed": "~0.1.1",
"load-grunt-tasks": "~1.0.0",
- "markdown": "~0.5.0",
"npm-shrinkwrap": "~4.0.0",
+ "remarkable": "^1.2.0",
"time-grunt": "~1.0.0"
},
"engines": {