diff options
| author | Mark Otto <[email protected]> | 2016-07-23 21:05:18 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2016-07-23 21:05:18 -0700 |
| commit | 7fd00263e35f891bfc792f9dd12c17a5025cd93c (patch) | |
| tree | 28d07418fb7abfacccb317b501937e02ffccf096 /docs/_plugins | |
| parent | d4457b33032d2540a4a3b7fa600f22055ce2000d (diff) | |
| parent | 38312640df9c4b84a47e62d7dfeb16b25049aafb (diff) | |
| download | bootstrap-7fd00263e35f891bfc792f9dd12c17a5025cd93c.tar.xz bootstrap-7fd00263e35f891bfc792f9dd12c17a5025cd93c.zip | |
Merge branch 'v4-dev' into v4-navbars
Diffstat (limited to 'docs/_plugins')
| -rw-r--r-- | docs/_plugins/bugify.rb | 1 | ||||
| -rw-r--r-- | docs/_plugins/highlight_alt.rb | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/docs/_plugins/bugify.rb b/docs/_plugins/bugify.rb index 0c5a0f5f5..5562dd5de 100644 --- a/docs/_plugins/bugify.rb +++ b/docs/_plugins/bugify.rb @@ -4,6 +4,7 @@ module Jekyll upstream_map = { "Bootstrap" => "https://github.com/twbs/bootstrap/issues/", "Edge" => ["https://developer.microsoft.com/en-us/microsoft-edge/platform/issues/", "Edge issue"], + "UserVoice" => ["https://wpdev.uservoice.com/forums/257854-microsoft-edge-developer/suggestions/", "Edge UserVoice idea"], "Mozilla" => ["https://bugzilla.mozilla.org/show_bug.cgi?id=", "Mozilla bug"], "Chromium" => ["https://bugs.chromium.org/p/chromium/issues/detail?id=", "Chromium issue"], "WebKit" => ["https://bugs.webkit.org/show_bug.cgi?id=", "WebKit bug"], diff --git a/docs/_plugins/highlight_alt.rb b/docs/_plugins/highlight_alt.rb index d1ed9ccff..bdcada251 100644 --- a/docs/_plugins/highlight_alt.rb +++ b/docs/_plugins/highlight_alt.rb @@ -27,14 +27,14 @@ module Jekyll @options[key.to_sym] = value || true end end - @options[:linenos] = "inline" if @options.key?(:linenos) and @options[:linenos] == true + @options[:linenos] = false else raise SyntaxError.new <<-eos -Syntax Error in tag 'highlight' while parsing the following markup: +Syntax Error in tag 'example' while parsing the following markup: #{markup} -Valid syntax: highlight <lang> [linenos] +Valid syntax: example <lang> eos end end |