diff --git a/LICENSE b/LICENSE index 8d94aa9ac9..f4c52d6a4b 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2011-2014 Twitter, Inc +Copyright (c) 2011-2015 Twitter, Inc Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index 0d8488f1b5..372f72b807 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ # [Bootstrap](http://getbootstrap.com) -[![Bower version](https://badge.fury.io/bo/bootstrap.svg)](http://badge.fury.io/bo/bootstrap) -[![npm version](https://badge.fury.io/js/bootstrap.svg)](http://badge.fury.io/js/bootstrap) -[![Build Status](https://secure.travis-ci.org/twbs/bootstrap.svg?branch=master)](https://travis-ci.org/twbs/bootstrap) -[![devDependency Status](https://david-dm.org/twbs/bootstrap/dev-status.svg)](https://david-dm.org/twbs/bootstrap#info=devDependencies) +![Bower version](https://img.shields.io/bower/v/bootstrap.svg?style=flat) +[![npm version](https://img.shields.io/npm/v/bootstrap.svg?style=flat)](https://www.npmjs.com/package/bootstrap) +[![Build Status](https://img.shields.io/travis/twbs/bootstrap/master.svg?style=flat)](https://travis-ci.org/twbs/bootstrap) +[![devDependency Status](https://img.shields.io/david/dev/twbs/bootstrap.svg?style=flat)](https://david-dm.org/twbs/bootstrap#info=devDependencies) [![Selenium Test Status](https://saucelabs.com/browser-matrix/bootstrap.svg)](https://saucelabs.com/u/bootstrap) Bootstrap is a sleek, intuitive, and powerful front-end framework for faster and easier web development, created by [Mark Otto](https://twitter.com/mdo) and [Jacob Thornton](https://twitter.com/fat), and maintained by the [core team](https://github.com/orgs/twbs/people) with the massive support and involvement of the community. @@ -39,8 +39,10 @@ Within the download you'll find the following directories and files, logically g bootstrap/ ├── css/ │ ├── bootstrap.css +│ ├── bootstrap.css.map │ ├── bootstrap.min.css │ ├── bootstrap-theme.css +│ ├── bootstrap-theme.css.map │ └── bootstrap-theme.min.css ├── js/ │ ├── bootstrap.js @@ -49,10 +51,11 @@ bootstrap/ ├── glyphicons-halflings-regular.eot ├── glyphicons-halflings-regular.svg ├── glyphicons-halflings-regular.ttf - └── glyphicons-halflings-regular.woff + ├── glyphicons-halflings-regular.woff + └── glyphicons-halflings-regular.woff2 ``` -We provide compiled CSS and JS (`bootstrap.*`), as well as compiled and minified CSS and JS (`bootstrap.min.*`). Fonts from Glyphicons are included, as is the optional Bootstrap theme. +We provide compiled CSS and JS (`bootstrap.*`), as well as compiled and minified CSS and JS (`bootstrap.min.*`). CSS [source maps](https://developers.google.com/chrome-developer-tools/docs/css-preprocessors) (`bootstrap.*.map`) are available for use with certain browsers' developer tools. Fonts from Glyphicons are included, as is the optional Bootstrap theme. @@ -126,4 +129,4 @@ For transparency into our release cycle and in striving to maintain backward com ## Copyright and license -Code and documentation copyright 2011-2014 Twitter, Inc. Code released under [the MIT license](https://github.com/twbs/bootstrap/blob/master/LICENSE). Docs released under [Creative Commons](https://github.com/twbs/bootstrap/blob/master/docs/LICENSE). +Code and documentation copyright 2011-2015 Twitter, Inc. Code released under [the MIT license](https://github.com/twbs/bootstrap/blob/master/LICENSE). Docs released under [Creative Commons](https://github.com/twbs/bootstrap/blob/master/docs/LICENSE). diff --git a/dist/fonts/glyphicons-halflings-regular.woff2 b/dist/fonts/glyphicons-halflings-regular.woff2 new file mode 100644 index 0000000000..64539b54c3 Binary files /dev/null and b/dist/fonts/glyphicons-halflings-regular.woff2 differ diff --git a/dist/js/bootstrap.js b/dist/js/bootstrap.js index 0403c2c336..22155b0f68 100644 --- a/dist/js/bootstrap.js +++ b/dist/js/bootstrap.js @@ -19,7 +19,7 @@ if (typeof jQuery === 'undefined') { * Bootstrap: transition.js v3.3.1 * http://getbootstrap.com/javascript/#transitions * ======================================================================== - * Copyright 2011-2014 Twitter, Inc. + * Copyright 2011-2015 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * ======================================================================== */ @@ -79,7 +79,7 @@ if (typeof jQuery === 'undefined') { * Bootstrap: alert.js v3.3.1 * http://getbootstrap.com/javascript/#alerts * ======================================================================== - * Copyright 2011-2014 Twitter, Inc. + * Copyright 2011-2015 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * ======================================================================== */ @@ -174,7 +174,7 @@ if (typeof jQuery === 'undefined') { * Bootstrap: button.js v3.3.1 * http://getbootstrap.com/javascript/#buttons * ======================================================================== - * Copyright 2011-2014 Twitter, Inc. + * Copyright 2011-2015 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * ======================================================================== */ @@ -291,7 +291,7 @@ if (typeof jQuery === 'undefined') { * Bootstrap: carousel.js v3.3.1 * http://getbootstrap.com/javascript/#carousel * ======================================================================== - * Copyright 2011-2014 Twitter, Inc. + * Copyright 2011-2015 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * ======================================================================== */ @@ -529,7 +529,7 @@ if (typeof jQuery === 'undefined') { * Bootstrap: collapse.js v3.3.1 * http://getbootstrap.com/javascript/#collapse * ======================================================================== - * Copyright 2011-2014 Twitter, Inc. + * Copyright 2011-2015 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * ======================================================================== */ @@ -741,7 +741,7 @@ if (typeof jQuery === 'undefined') { * Bootstrap: dropdown.js v3.3.1 * http://getbootstrap.com/javascript/#dropdowns * ======================================================================== - * Copyright 2011-2014 Twitter, Inc. + * Copyright 2011-2015 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * ======================================================================== */ @@ -903,7 +903,7 @@ if (typeof jQuery === 'undefined') { * Bootstrap: modal.js v3.3.1 * http://getbootstrap.com/javascript/#modals * ======================================================================== - * Copyright 2011-2014 Twitter, Inc. + * Copyright 2011-2015 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * ======================================================================== */ @@ -1229,7 +1229,7 @@ if (typeof jQuery === 'undefined') { * http://getbootstrap.com/javascript/#tooltip * Inspired by the original jQuery.tipsy by Jason Frame * ======================================================================== - * Copyright 2011-2014 Twitter, Inc. + * Copyright 2011-2015 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * ======================================================================== */ @@ -1671,18 +1671,12 @@ if (typeof jQuery === 'undefined') { function Plugin(option) { return this.each(function () { - var $this = $(this) - var data = $this.data('bs.tooltip') - var options = typeof option == 'object' && option - var selector = options && options.selector + var $this = $(this) + var data = $this.data('bs.tooltip') + var options = typeof option == 'object' && option if (!data && option == 'destroy') return - if (selector) { - if (!data) $this.data('bs.tooltip', (data = {})) - if (!data[selector]) data[selector] = new Tooltip(this, options) - } else { - if (!data) $this.data('bs.tooltip', (data = new Tooltip(this, options))) - } + if (!data) $this.data('bs.tooltip', (data = new Tooltip(this, options))) if (typeof option == 'string') data[option]() }) } @@ -1707,7 +1701,7 @@ if (typeof jQuery === 'undefined') { * Bootstrap: popover.js v3.3.1 * http://getbootstrap.com/javascript/#popovers * ======================================================================== - * Copyright 2011-2014 Twitter, Inc. + * Copyright 2011-2015 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * ======================================================================== */ @@ -1791,18 +1785,12 @@ if (typeof jQuery === 'undefined') { function Plugin(option) { return this.each(function () { - var $this = $(this) - var data = $this.data('bs.popover') - var options = typeof option == 'object' && option - var selector = options && options.selector + var $this = $(this) + var data = $this.data('bs.popover') + var options = typeof option == 'object' && option if (!data && option == 'destroy') return - if (selector) { - if (!data) $this.data('bs.popover', (data = {})) - if (!data[selector]) data[selector] = new Popover(this, options) - } else { - if (!data) $this.data('bs.popover', (data = new Popover(this, options))) - } + if (!data) $this.data('bs.popover', (data = new Popover(this, options))) if (typeof option == 'string') data[option]() }) } @@ -1827,7 +1815,7 @@ if (typeof jQuery === 'undefined') { * Bootstrap: scrollspy.js v3.3.1 * http://getbootstrap.com/javascript/#scrollspy * ======================================================================== - * Copyright 2011-2014 Twitter, Inc. + * Copyright 2011-2015 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * ======================================================================== */ @@ -2003,7 +1991,7 @@ if (typeof jQuery === 'undefined') { * Bootstrap: tab.js v3.3.1 * http://getbootstrap.com/javascript/#tabs * ======================================================================== - * Copyright 2011-2014 Twitter, Inc. + * Copyright 2011-2015 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * ======================================================================== */ @@ -2157,7 +2145,7 @@ if (typeof jQuery === 'undefined') { * Bootstrap: affix.js v3.3.1 * http://getbootstrap.com/javascript/#affix * ======================================================================== - * Copyright 2011-2014 Twitter, Inc. + * Copyright 2011-2015 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * ======================================================================== */ diff --git a/docs/_data/browser-bugs.yml b/docs/_data/browser-bugs.yml index e0cda34f0b..a4ddae0264 100644 --- a/docs/_data/browser-bugs.yml +++ b/docs/_data/browser-bugs.yml @@ -98,16 +98,6 @@ origin: > Bootstrap#12078 -- - browser: > - Safari (OS X) - summary: > - Scrollbar clipped in `select[multiple]` with padding. - upstream_bug: > - WebKit#128489 - origin: > - Bootstrap#12536 - - browser: > Chrome @@ -128,6 +118,16 @@ origin: > Bootstrap#14409 +- + browser: > + Safari (OS X) + summary: > + Scrollbar clipped in `select[multiple]` with padding. + upstream_bug: > + WebKit#128489, Safari#19208483 + origin: > + Bootstrap#12536 + - browser: > Safari (OS X) @@ -150,16 +150,6 @@ origin: > Bootstrap#9774 -- - browser: > - Safari (iOS) - summary: > - `transform: translate3d(0,0,0);` rendering bug. - upstream_bug: > - WebKit#138162, Safari#18804973 - origin: > - Bootstrap#14603 - - browser: > Safari (OS X) @@ -170,6 +160,26 @@ origin: > Bootstrap#14868 +- + browser: > + Safari (OS X) + summary: > + Alpha linear-gradient has dark line at its edge. + upstream_bug: > + WebKit#139803 + origin: > + Bootstrap#15205 + +- + browser: > + Safari (iOS) + summary: > + `transform: translate3d(0,0,0);` rendering bug. + upstream_bug: > + WebKit#138162, Safari#18804973 + origin: > + Bootstrap#14603 + - browser: > Safari (iOS) @@ -182,10 +192,10 @@ - browser: > - Chrome (Windows & Linux) + Safari (iOS) summary: > - Body content can be scrolled even though `overflow: hidden;` is applied to it. + `display: block` causes text of temporal ``s to become vertically misaligned upstream_bug: > - Chromium#175502 + WebKit#139848 origin: > - Bootstrap#14972 + Bootstrap#11266, Bootstrap#13098 diff --git a/docs/_data/core-team.yml b/docs/_data/core-team.yml index b9e67f230d..d1fd76320a 100644 --- a/docs/_data/core-team.yml +++ b/docs/_data/core-team.yml @@ -21,3 +21,7 @@ - name: Heinrich Fenkart user: hnrch02 gravatar: 0d53f5d3d3d28bd470f394d98f7ef48f + +- name: Patrick H. Lauke + user: patrickhlauke + gravatar: 357f279672db832fc41a5a2f36559fcb diff --git a/docs/_includes/js/popovers.html b/docs/_includes/js/popovers.html deleted file mode 100644 index 4557a44a42..0000000000 --- a/docs/_includes/js/popovers.html +++ /dev/null @@ -1,303 +0,0 @@ -
-

Popovers popover.js

- -

Add small overlays of content, like those on the iPad, to any element for housing secondary information.

-

Popovers whose both title and content are zero-length are never displayed.

- -
-

Plugin dependency

-

Popovers require the tooltip plugin to be included in your version of Bootstrap.

-
-
-

Opt-in functionality

-

For performance reasons, the Tooltip and Popover data-apis are opt-in, meaning you must initialize them yourself.

-

One way to initialize all popovers on a page would be to select them by their data-toggle attribute:

-{% highlight js %} -$(function () { - $('[data-toggle="popover"]').popover() -}) -{% endhighlight %} -
-
-

Popovers in button groups and input groups require special setting

-

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

-
-
-

Don't try to show popovers on hidden elements

-

Invoking $(...).popover('show') when the target element is display: none; will cause the popover to be incorrectly positioned.

-
-
-

Popovers on disabled elements require wrapper elements

-

To add a popover to a disabled or .disabled element, put the element inside of a <div> and apply the popover to that <div> instead.

-
-
-

Multiple-line links

-

Sometimes you want to add a popover to a hyperlink that wraps multiple lines. The default behavior of the popover plugin is to center it horizontally and vertically. Add white-space: nowrap; to your anchors to avoid this.

-
- -

Examples

-

Static popover

-

Four options are available: top, right, bottom, and left aligned.

-
-
-
-

Popover top

-
-

Sed posuere consectetur est at lobortis. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum.

-
-
- -
-
-

Popover right

-
-

Sed posuere consectetur est at lobortis. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum.

-
-
- -
-
-

Popover bottom

- -
-

Sed posuere consectetur est at lobortis. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum.

-
-
- -
-
-

Popover left

-
-

Sed posuere consectetur est at lobortis. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum.

-
-
- -
-
- -

Live demo

-
- -
-{% highlight html %} - -{% endhighlight %} - -

Four directions

-
-
- - - - -
-
-{% highlight html %} - - - - - - - -{% endhighlight %} - -

Dismiss on next click

-

Use the focus trigger to dismiss popovers on the next click that the user makes.

-
-

Specific markup required for dismiss-on-next-click

-

For proper cross-browser and cross-platform behavior, you must use the <a> tag, not the <button> tag, and you also must include a tabindex attribute.

-
-
- Dismissible popover -
-{% highlight html %} -Dismissible popover -{% endhighlight %} - - -

Usage

-

Enable popovers via JavaScript:

- {% highlight js %}$('#example').popover(options){% endhighlight %} - -

Options

-

Options can be passed via data attributes or JavaScript. For data attributes, append the option name to data-, as in data-animation="".

-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDefaultDescription
animationbooleantrueApply a CSS fade transition to the popover
containerstring | falsefalse -

Appends the popover to a specific element. Example: container: 'body'. This option is particularly useful in that it allows you to position the popover in the flow of the document near the triggering element - which will prevent the popover from floating away from the triggering element during a window resize.

-
contentstring | function'' -

Default content value if data-content attribute isn't present.

-

If a function is given, it will be called with its this reference set to the element that the popover is attached to.

-
delaynumber | object0 -

Delay showing and hiding the popover (ms) - does not apply to manual trigger type

-

If a number is supplied, delay is applied to both hide/show

-

Object structure is: delay: { "show": 500, "hide": 100 }

-
htmlbooleanfalseInsert HTML into the popover. If false, jQuery's text method will be used to insert content into the DOM. Use text if you're worried about XSS attacks.
placementstring | function'right' -

How to position the popover - top | bottom | left | right | auto.
When "auto" is specified, it will dynamically reorient the popover. For example, if placement is "auto left", the popover will display to the left when possible, otherwise it will display right.

-

When a function is used to determine the placement, it is called with the popover DOM node as its first argument and the triggering element DOM node as its second. The this context is set to the popover instance.

-
selectorstringfalseIf a selector is provided, popover objects will be delegated to the specified targets. In practice, this is used to enable dynamic HTML content to have popovers added. See this and an informative example.
templatestring'<div class="popover" role="tooltip"><div class="popover-arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>' -

Base HTML to use when creating the popover.

-

The popover's title will be injected into the .popover-title.

-

The popover's content will be injected into the .popover-content.

-

.popover-arrow will become the popover's arrow.

-

The outermost wrapper element should have the .popover class.

-
titlestring | function'' -

Default title value if title attribute isn't present.

-

If a function is given, it will be called with its this reference set to the element that the popover is attached to.

-
triggerstring'click'How popover is triggered - click | hover | focus | manual. You may pass multiple triggers; separate them with a space.
viewportstring | object{ selector: 'body', padding: 0 } -

Keeps the popover within the bounds of this element. Example: viewport: '#viewport' or { "selector": "#viewport", "padding": 0 }

-
-
-
-

Data attributes for individual popovers

-

Options for individual popovers can alternatively be specified through the use of data attributes, as explained above.

-
- -

Methods

-

$().popover(options)

-

Initializes popovers for an element collection.

- -

.popover('show')

-

Reveals an element's popover. Popovers whose both title and content are zero-length are never displayed.

- {% highlight js %}$('#element').popover('show'){% endhighlight %} - -

.popover('hide')

-

Hides an element's popover.

- {% highlight js %}$('#element').popover('hide'){% endhighlight %} - -

.popover('toggle')

-

Toggles an element's popover.

- {% highlight js %}$('#element').popover('toggle'){% endhighlight %} - -

.popover('destroy')

-

Hides and destroys an element's popover.

- {% highlight js %}$('#element').popover('destroy'){% endhighlight %} -

Events

-
- - - - - - - - - - - - - - - - - - - - - - - - - -
Event TypeDescription
show.bs.popoverThis event fires immediately when the show instance method is called.
shown.bs.popoverThis event is fired when the popover has been made visible to the user (will wait for CSS transitions to complete).
hide.bs.popoverThis event is fired immediately when the hide instance method has been called.
hidden.bs.popoverThis event is fired when the popover has finished being hidden from the user (will wait for CSS transitions to complete).
-
-{% highlight js %} -$('#myPopover').on('hidden.bs.popover', function () { - // do something… -}) -{% endhighlight %} -
diff --git a/docs/_includes/js/scrollspy.html b/docs/_includes/js/scrollspy.html index 2b42e8492f..6023731725 100644 --- a/docs/_includes/js/scrollspy.html +++ b/docs/_includes/js/scrollspy.html @@ -3,7 +3,7 @@

Example in navbar

The ScrollSpy plugin is for automatically updating nav targets based on scroll position. Scroll the area below the navbar and watch the active class change. The dropdown sub items will be highlighted as well.

-
+