From: Mark Otto Date: Mon, 1 Dec 2014 04:17:45 +0000 (-0800) Subject: Merge branch 'master' into v4 X-Git-Tag: v4.0.0-alpha~545 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b648a77ed36d2d3a38842a7ab5a19ba50c52bae6;p=thirdparty%2Fbootstrap.git Merge branch 'master' into v4 Conflicts: Gruntfile.js _config.yml dist/css/bootstrap-theme.css dist/css/bootstrap-theme.min.css dist/css/bootstrap.css dist/css/bootstrap.css.map dist/css/bootstrap.min.css dist/fonts/glyphicons-halflings-regular.eot dist/fonts/glyphicons-halflings-regular.svg dist/fonts/glyphicons-halflings-regular.ttf dist/fonts/glyphicons-halflings-regular.woff docs/_data/glyphicons.yml docs/_includes/components/alerts.html docs/_includes/components/badges.html docs/_includes/components/button-dropdowns.html docs/_includes/components/button-groups.html docs/_includes/components/dropdowns.html docs/_includes/components/glyphicons.html docs/_includes/components/input-groups.html docs/_includes/components/labels.html docs/_includes/components/media.html docs/_includes/components/navbar.html docs/_includes/components/navs.html docs/_includes/components/pagination.html docs/_includes/components/panels.html docs/_includes/components/progress-bars.html docs/_includes/css/buttons.html docs/_includes/css/forms.html docs/_includes/css/grid.html docs/_includes/css/helpers.html docs/_includes/css/images.html docs/_includes/css/less.html docs/_includes/css/responsive-utilities.html docs/_includes/css/sass.html docs/_includes/css/tables.html docs/_includes/css/type.html docs/_includes/getting-started/accessibility.html docs/_includes/getting-started/browser-device-support.html docs/_includes/getting-started/community.html docs/_includes/getting-started/download.html docs/_includes/getting-started/examples.html docs/_includes/getting-started/whats-included.html docs/_includes/js/affix.html docs/_includes/js/alerts.html docs/_includes/js/buttons.html docs/_includes/js/carousel.html docs/_includes/js/collapse.html docs/_includes/js/dropdowns.html docs/_includes/js/modal.html docs/_includes/js/overview.html docs/_includes/js/tabs.html docs/_includes/nav/components.html docs/_includes/nav/css.html docs/_includes/nav/javascript.html docs/_includes/nav/main.html docs/about.html docs/assets/css/docs.min.css docs/assets/js/customize.min.js docs/assets/js/raw-files.min.js docs/dist/css/bootstrap-theme.css docs/dist/css/bootstrap-theme.min.css docs/dist/css/bootstrap.css docs/dist/css/bootstrap.css.map docs/dist/css/bootstrap.min.css docs/dist/fonts/glyphicons-halflings-regular.eot docs/dist/fonts/glyphicons-halflings-regular.svg docs/dist/fonts/glyphicons-halflings-regular.ttf docs/dist/fonts/glyphicons-halflings-regular.woff docs/examples/carousel/index.html docs/examples/navbar-fixed-top/index.html docs/examples/navbar-static-top/index.html docs/examples/navbar/index.html docs/examples/non-responsive/index.html docs/examples/non-responsive/non-responsive.css docs/examples/sticky-footer-navbar/index.html docs/examples/theme/index.html fonts/glyphicons-halflings-regular.eot fonts/glyphicons-halflings-regular.svg fonts/glyphicons-halflings-regular.ttf fonts/glyphicons-halflings-regular.woff less/_carousel.less less/_forms.less less/glyphicons.less --- b648a77ed36d2d3a38842a7ab5a19ba50c52bae6 diff --cc _config.yml index 1a8327268d,1be38fc140..6fe14e2ad9 --- a/_config.yml +++ b/_config.yml @@@ -32,12 -27,6 +32,12 @@@ blog: http://blog.getbootst expo: http://expo.getbootstrap.com cdn: - css: https://maxcdn.bootstrapcdn.com/bootstrap/3.3.0/css/bootstrap.min.css - js: https://maxcdn.bootstrapcdn.com/bootstrap/3.3.0/js/bootstrap.min.js + css: https://maxcdn.bootstrapcdn.com/bootstrap/3.3.1/css/bootstrap.min.css - css_theme: https://maxcdn.bootstrapcdn.com/bootstrap/3.3.1/css/bootstrap-theme.min.css + js: https://maxcdn.bootstrapcdn.com/bootstrap/3.3.1/js/bootstrap.min.js + jquery: //code.jquery.com/jquery-2.1.1.min.js + +bug: + firefox: https://bugzilla.mozilla.org/show_bug.cgi?id= + webkit: https://bugs.webkit.org/show_bug.cgi?id= + chrome: https://code.google.com/p/chromium/issues/detail?id= + github: https://github.com/twbs/bootstrap/issues/ diff --cc docs/about/brand.md index b753452af1,0000000000..e4468d9d77 mode 100644,000000..100644 --- a/docs/about/brand.md +++ b/docs/about/brand.md @@@ -1,75 -1,0 +1,75 @@@ +--- +layout: page +title: Brand guidelines +--- + +Have a need for Bootstrap's brand resources? Great! We have only a few guidelines we follow, and in turn ask you to follow as well. These guidelines were inspired by MailChimp's [Brand Assets](http://mailchimp.com/about/brand-assets/). + +## Mark and logo + +Use either the Bootstrap mark (a capital **B**) or the standard logo (just **Bootstrap**). It should always appear in Helvetica Neue Bold. **Do not use the Twitter bird** in association with Bootstrap. + +
+
+
B
+
+
+
B
+
+
+
+
+

Bootstrap

+
+
+

Bootstrap

+
+
+ +## Download mark + +Download the Bootstrap mark in one of three styles, each available as an SVG file. Right click, Save as. + +
+
+ Bootstrap +
+
+ Bootstrap +
+
+ Bootstrap +
+
+ +## Name + +The project and framework should always be referred to as **Bootstrap**. No Twitter before it, no capital _s_, and no abbreviations except for one, a capital **B**. + +
+
+

Bootstrap

- ++ Right +
+
+

BootStrap

- ++ Wrong +
+
+

Twitter Bootstrap

- ++ Wrong +
+
+ +## Colors + +Our docs and branding use a handful of primary colors to differentiate what *is* Bootstrap from what *is in* Bootstrap. In other words, if it's purple, it's representative of Bootstrap. + +
+
+
+
+
+
+
+
diff --cc docs/components/button-dropdown.md index c7e9a37bf4,0000000000..1a6c0961fd mode 100644,000000..100644 --- a/docs/components/button-dropdown.md +++ b/docs/components/button-dropdown.md @@@ -1,324 -1,0 +1,324 @@@ +--- +layout: page +title: Button dropdown +--- + +Use any button to trigger a dropdown menu by placing it within a `.btn-group` and providing the proper menu markup. + +
+

Plugin dependency

+

Button dropdowns require the dropdown plugin to be included in your version of Bootstrap.

+
+ +### Single button dropdowns + +Turn a button into a dropdown toggle with some basic markup changes. + +
+
- ++ + +
+
- ++ + +
+
- ++ + +
+
- ++ + +
+
- ++ + +
+
- ++ + +
+
+ +{% highlight html %} + +
- + +
+{% endhighlight %} + +### Split button dropdowns + + +
+ - + +
+
+ - + +
+
+ - + +
+
+ - + +
+
+ - + +
+
+ - + +
+ + +{% highlight html %} + +
+ - + +
+{% endhighlight %} + +### Sizing + +Button dropdowns work with buttons of all sizes. + +
+ + + +
+ +{% highlight html %} + +
- + +
+ + +
- + +
+ + +
- + +
+{% endhighlight %} + +### Dropup variation + +Trigger dropdown menus above elements by adding `.dropup` to the parent. + +
+ +
+ +{% highlight html %} +
+ - + +
+{% endhighlight %} diff --cc docs/components/button-group.md index 370f4afcc5,0000000000..80c69b5b98 mode 100644,000000..100644 --- a/docs/components/button-group.md +++ b/docs/components/button-group.md @@@ -1,240 -1,0 +1,231 @@@ +--- +layout: page +title: Button group +--- + +Group a series of buttons together on a single line with the button group. Add on optional JavaScript radio and checkbox style behavior with [our buttons plugin](../javascript/#buttons). + +
+

Tooltips & popovers in button groups require special setting

+

When using tooltips or popovers on elements within a .btn-group, you'll have to specify the option container: 'body' to avoid unwanted side effects (such as the element growing wider and/or losing its rounded corners when the tooltip or popover is triggered).

+
+ ++
++

Ensure correct role and provide a label

++

In order for assistive technologies – such as screen readers – to convey that a series of buttons is grouped, an appropriate role attribute needs to be provided. For button groups, this would be role="group", while toolbars should have a role="toolbar".

++

One exception are groups which only contain a single control (for instance the justified button groups with <button> elements) or a dropdown.

++

In addition, groups and toolbars should be given an explicit label, as most assistive technologies will otherwise not announce them, despite the presence of the correct role attribute. In the examples provided here, we use aria-label, but alternatives such as aria-labelledby can also be used.

++
++ +### Basic example + +Wrap a series of buttons with `.btn` in `.btn-group`. + +{% example html %} -
++
+ + + +
+{% endexample %} + +### Button toolbar + +Combine sets of button groups into button toolbars for more complex components. + +{% example html %} -