bs-docs sync

This commit is contained in:
Kevin Ross 2015-12-21 10:42:29 -06:00
parent 6bbfecf7aa
commit 6782be992b
7 changed files with 37 additions and 29 deletions

View File

@ -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']);

View File

@ -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

View File

@ -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)

View File

@ -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).
<div class="bd-example">
<progress class="progress progress-striped" value="25" max="100">25%</progress>

View File

@ -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 %}
<div class="pull-xs-left">Float left on all viewport sizes</div>
<div class="pull-xs-right">Float right on all viewport sizes</div>
<div class="pull-xs-none">Don't float on all viewport sizes</div>
<div class="pull-xs-left">Float left on all viewport sizes</div><br>
<div class="pull-xs-right">Float right on all viewport sizes</div><br>
<div class="pull-xs-none">Don't float on all viewport sizes</div><br>
<div class="pull-sm-left">Float left on viewports sized SM (small) or wider</div>
<div class="pull-md-left">Float left on viewports sized MD (medium) or wider</div>
<div class="pull-lg-left">Float left on viewports sized LG (large) or wider</div>
<div class="pull-xl-left">Float left on viewports sized XL (extra-large) or wider</div>
<div class="pull-sm-left">Float left on viewports sized SM (small) or wider</div><br>
<div class="pull-md-left">Float left on viewports sized MD (medium) or wider</div><br>
<div class="pull-lg-left">Float left on viewports sized LG (large) or wider</div><br>
<div class="pull-xl-left">Float left on viewports sized XL (extra-large) or wider</div><br>
{% endexample %}
{% highlight scss %}

View File

@ -47,7 +47,7 @@ Add classes to an `<img>` 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.
<div class="bd-example bd-example-images">
<img data-src="holder.js/200x200" class="img-rounded pull-xs-left" alt="A generic square placeholder image with rounded corners">

View File

@ -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;
// }
// }
//}