diff --git a/Gruntfile.js b/Gruntfile.js
index 33a35807..ab6fff6a 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -390,6 +390,14 @@ module.exports = function (grunt) {
],
dest: 'docs/assets/js/vendor/'
},
+ 'bs-docs-plugins': {
+ expand: true,
+ cwd: '../bootstrap/docs/_plugins',
+ src: [
+ '**/*'
+ ],
+ dest: 'docs/_plugins/'
+ },
'bs-docs-scss': {
options: {
@@ -673,7 +681,8 @@ module.exports = function (grunt) {
'copy:bs-docs-scss',
'copy:bs-docs-components',
'copy:bs-docs-content',
- 'copy:bs-docs-examples'
+ 'copy:bs-docs-examples',
+ 'copy:bs-docs-plugins'
]);
grunt.registerTask('docs', ['clean:docs', 'docs-copy-bootstrap-docs', 'docs-css', 'docs-js', 'lint-docs-js', 'copy:docs']);
diff --git a/docs/_plugins/bridge.rb b/docs/_plugins/bridge.rb
index 9ffa1b76..69a13fbb 100644
--- a/docs/_plugins/bridge.rb
+++ b/docs/_plugins/bridge.rb
@@ -1,11 +1,10 @@
-require 'json'
require 'yaml'
module Bridge
class Generator < Jekyll::Generator
def generate(site)
- config_bridge_json = File.join(site.source, '../grunt/configBridge.json')
- site.data['configBridge'] = YAML.load_file(config_bridge_json)
+ path = File.join(site.source, "../grunt/configBridge.json")
+ site.data["configBridge"] = YAML.load_file(path)
end
end
end
diff --git a/docs/_plugins/highlight_alt.rb b/docs/_plugins/highlight_alt.rb
index 1fc9f5d2..d1ed9ccf 100644
--- a/docs/_plugins/highlight_alt.rb
+++ b/docs/_plugins/highlight_alt.rb
@@ -59,7 +59,7 @@ eos
end
def remove_holderjs(code)
- code = code.gsub(/"holder.js.+?"/, '"..."')
+ code = code.gsub(/data-src="holder.js.+?"/, 'src="..."')
end
def render_rouge(code)
diff --git a/docs/components/progress.md b/docs/components/progress.md
index b5c7ae71..a52d1f19 100644
--- a/docs/components/progress.md
+++ b/docs/components/progress.md
@@ -71,7 +71,7 @@ Uses a gradient to create a striped effect.
The striped gradient can also be animated. Add `.progress-animated` to `.progress` to animate the stripes right to left via CSS3 animations.
-**Animated progress bars do not work in IE9 and Opera 12** as they don't support CSS3 animations.
+**Animated progress bars do not work in IE9 and Opera 12** – as they don't support CSS3 animations – **nor in IE10+ and Microsoft Edge** – as they currently don't support CSS3 animations on the [`::-ms-fill` pseudo-element](https://msdn.microsoft.com/en-us/library/windows/apps/hh465757.aspx).
diff --git a/docs/components/utilities.md b/docs/components/utilities.md
index 9cd1952d..1ce28d00 100644
--- a/docs/components/utilities.md
+++ b/docs/components/utilities.md
@@ -177,14 +177,14 @@ These utility classes float an element to the left or right, or disable floating
Two similar non-responsive mixins (`pull-left` and `pull-right`) are also available.
{% example html %}
-
Float left on all viewport sizes
-
Float right on all viewport sizes
-
Don't float on all viewport sizes
+
Float left on all viewport sizes
+
Float right on all viewport sizes
+
Don't float on all viewport sizes
-
Float left on viewports sized SM (small) or wider
-
Float left on viewports sized MD (medium) or wider
-
Float left on viewports sized LG (large) or wider
-
Float left on viewports sized XL (extra-large) or wider
+
Float left on viewports sized SM (small) or wider
+
Float left on viewports sized MD (medium) or wider
+
Float left on viewports sized LG (large) or wider
+
Float left on viewports sized XL (extra-large) or wider
{% endexample %}
{% highlight scss %}
diff --git a/docs/content/images.md b/docs/content/images.md
index dad6dfdc..e3e616de 100644
--- a/docs/content/images.md
+++ b/docs/content/images.md
@@ -47,7 +47,7 @@ Add classes to an `
![]()
` element to easily style images in any project.
## Aligning images
-Align images with the [helper float classes]({{ site.baseurl }}/components/utilities/#floats) or [text alignment classes]({{ site.baseurl }}/components/utilities/#text-alignment). A simple centering class can also be used for `block` level images.
+Align images with the [helper float classes]({{ site.baseurl }}/components/utilities/#responsive-floats) or [text alignment classes]({{ site.baseurl }}/components/utilities/#text-alignment). A simple centering class can also be used for `block` level images.
![A generic square placeholder image with rounded corners]()
diff --git a/scss/_dropdown.scss b/scss/_dropdown.scss
index 51b2ab10..d3e714fa 100644
--- a/scss/_dropdown.scss
+++ b/scss/_dropdown.scss
@@ -1,15 +1,15 @@
-.dropdown-menu {
- border: 0;
- box-shadow: 0 2px 5px 0 rgba($black, 0.26);
- .divider {
- background-color: rgba(229, 229, 229, 0.12);
- }
- li {
- position: relative;
- overflow: hidden;
- a:hover {
- color: $brand-primary;
- background-color: transparent;
- }
- }
-}
+//.dropdown-menu {
+// border: 0;
+// box-shadow: 0 2px 5px 0 $gray-light;
+// .divider {
+// background-color: rgba(229, 229, 229, 0.12);
+// }
+// li {
+// position: relative;
+// overflow: hidden;
+// a:hover {
+// color: $brand-primary;
+// background-color: transparent;
+// }
+// }
+//}