Merge remote-tracking branch 'twbs/v4-dev' into patch-1

Conflicts:
	scss/_custom-forms.scss
	scss/_variables.scss

3 files changed, 5 insertions, 4 deletions

diff --git a/docs/_plugins/bridge.rb b/docs/_plugins/bridge.rb
index 450a6cce3..69a13fbbb 100644
--- a/docs/_plugins/bridge.rb
+++ b/docs/_plugins/bridge.rb
@@ -3,7 +3,8 @@ require 'yaml'
 module Bridge
   class Generator < Jekyll::Generator
     def generate(site)
-      site.data["configBridge"] = YAML.load_file("./grunt/configBridge.json")
+      path = File.join(site.source, "../grunt/configBridge.json")
+      site.data["configBridge"] = YAML.load_file(path)
     end
   end
-end
\ No newline at end of file
+end
diff --git a/docs/_plugins/bugify.rb b/docs/_plugins/bugify.rb
index 3cee9e43f..e085b5a38 100644
--- a/docs/_plugins/bugify.rb
+++ b/docs/_plugins/bugify.rb
@@ -22,4 +22,4 @@ module Jekyll
   end
 end
 
-Liquid::Template.register_filter(Jekyll::BugFilter)
\ No newline at end of file
+Liquid::Template.register_filter(Jekyll::BugFilter)
diff --git a/docs/_plugins/callout.rb b/docs/_plugins/callout.rb
index 536ca588e..0ed6687db 100644
--- a/docs/_plugins/callout.rb
+++ b/docs/_plugins/callout.rb
@@ -1,4 +1,4 @@
-# Source: http://stackoverflow.com/questions/19169849/how-to-get-markdown-processed-content-in-jekyll-tag-plugin
+# Source: https://stackoverflow.com/questions/19169849/how-to-get-markdown-processed-content-in-jekyll-tag-plugin
 
 module Jekyll
   module Tags