Merge branch 'master' into v4

Conflicts: _config.yml dist/css/bootstrap-theme.css dist/css/bootstrap-theme.css.map dist/css/bootstrap-theme.min.css dist/css/bootstrap.css dist/css/bootstrap.css.map dist/css/bootstrap.min.css dist/js/bootstrap.min.js docs/_includes/components/thumbnails.html docs/_includes/css/forms.html docs/_includes/css/grid.html docs/_includes/customizer-variables.html docs/_includes/footer.html docs/_includes/getting-started/download.html docs/_includes/getting-started/template.html docs/_includes/js/overview.html docs/_includes/js/popovers.html docs/_includes/js/tooltips.html docs/assets/css/docs.min.css docs/assets/js/customize.min.js docs/assets/js/raw-files.min.js docs/assets/js/src/customizer.js docs/dist/css/bootstrap-theme.css docs/dist/css/bootstrap-theme.css.map 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/js/bootstrap.js docs/dist/js/bootstrap.min.js docs/examples/navbar-fixed-top/index.html docs/examples/navbar-static-top/index.html docs/examples/non-responsive/index.html docs/examples/theme/index.html grunt/configBridge.json less/alerts.less less/badges.less less/jumbotron.less less/panels.less less/tables.less less/theme.less less/variables.less package.json scss/_button-group.scss scss/_buttons.scss scss/_forms.scss
2025-08-13 09:04:14 +02:00 · 2015-01-19 14:48:12 -08:00
parent 0964504fda 4fd01b7ac1
commit 325748ff68
45 changed files with 553 additions and 904 deletions
--- a/js/.jscsrc
+++ b/js/.jscsrc
@@ -25,6 +25,7 @@
  "requireSpaceBetweenArguments": true,
  "requireSpacesInAnonymousFunctionExpression": { "beforeOpeningCurlyBrace": true, "beforeOpeningRoundBrace": true },
  "requireSpacesInConditionalExpression": true,
+  "requireSpacesInForStatement": true,
  "requireSpacesInFunctionDeclaration": { "beforeOpeningCurlyBrace": true },
  "requireSpacesInFunctionExpression": { "beforeOpeningCurlyBrace": true },
  "requireSpacesInNamedFunctionExpression": { "beforeOpeningCurlyBrace": true },
--- a/js/affix.js
+++ b/js/affix.js
@@ -1,5 +1,5 @@
 /* ========================================================================
- * Bootstrap: affix.js v3.3.1
+ * Bootstrap: affix.js v3.3.2
 * http://getbootstrap.com/javascript/#affix
 * ========================================================================
 * Copyright 2011-2015 Twitter, Inc.
@@ -28,7 +28,7 @@
    this.checkPosition()
  }

-  Affix.VERSION  = '3.3.1'
+  Affix.VERSION  = '3.3.2'

  Affix.RESET    = 'affix affix-top affix-bottom'

--- a/js/alert.js
+++ b/js/alert.js
@@ -1,5 +1,5 @@
 /* ========================================================================
- * Bootstrap: alert.js v3.3.1
+ * Bootstrap: alert.js v3.3.2
 * http://getbootstrap.com/javascript/#alerts
 * ========================================================================
 * Copyright 2011-2015 Twitter, Inc.
@@ -18,7 +18,7 @@
    $(el).on('click', dismiss, this.close)
  }

-  Alert.VERSION = '3.3.1'
+  Alert.VERSION = '3.3.2'

  Alert.TRANSITION_DURATION = 150

--- a/js/button.js
+++ b/js/button.js
@@ -1,5 +1,5 @@
 /* ========================================================================
- * Bootstrap: button.js v3.3.1
+ * Bootstrap: button.js v3.3.2
 * http://getbootstrap.com/javascript/#buttons
 * ========================================================================
 * Copyright 2011-2015 Twitter, Inc.
@@ -19,7 +19,7 @@
    this.isLoading = false
  }

-  Button.VERSION  = '3.3.1'
+  Button.VERSION  = '3.3.2'

  Button.DEFAULTS = {
    loadingText: 'loading...'
--- a/js/carousel.js
+++ b/js/carousel.js
@@ -1,5 +1,5 @@
 /* ========================================================================
- * Bootstrap: carousel.js v3.3.1
+ * Bootstrap: carousel.js v3.3.2
 * http://getbootstrap.com/javascript/#carousel
 * ========================================================================
 * Copyright 2011-2015 Twitter, Inc.
@@ -30,7 +30,7 @@
      .on('mouseleave.bs.carousel', $.proxy(this.cycle, this))
  }

-  Carousel.VERSION  = '3.3.1'
+  Carousel.VERSION  = '3.3.2'

  Carousel.TRANSITION_DURATION = 600

--- a/js/collapse.js
+++ b/js/collapse.js
@@ -1,5 +1,5 @@
 /* ========================================================================
- * Bootstrap: collapse.js v3.3.1
+ * Bootstrap: collapse.js v3.3.2
 * http://getbootstrap.com/javascript/#collapse
 * ========================================================================
 * Copyright 2011-2015 Twitter, Inc.
@@ -28,7 +28,7 @@
    if (this.options.toggle) this.toggle()
  }

-  Collapse.VERSION  = '3.3.1'
+  Collapse.VERSION  = '3.3.2'

  Collapse.TRANSITION_DURATION = 350

--- a/js/dropdown.js
+++ b/js/dropdown.js
@@ -1,5 +1,5 @@
 /* ========================================================================
- * Bootstrap: dropdown.js v3.3.1
+ * Bootstrap: dropdown.js v3.3.2
 * http://getbootstrap.com/javascript/#dropdowns
 * ========================================================================
 * Copyright 2011-2015 Twitter, Inc.
@@ -19,7 +19,7 @@
    $(element).on('click.bs.dropdown', this.toggle)
  }

-  Dropdown.VERSION = '3.3.1'
+  Dropdown.VERSION = '3.3.2'

  Dropdown.prototype.toggle = function (e) {
    var $this = $(this)
--- a/js/modal.js
+++ b/js/modal.js
@@ -1,5 +1,5 @@
 /* ========================================================================
- * Bootstrap: modal.js v3.3.1
+ * Bootstrap: modal.js v3.3.2
 * http://getbootstrap.com/javascript/#modals
 * ========================================================================
 * Copyright 2011-2015 Twitter, Inc.
@@ -30,7 +30,7 @@
    }
  }

-  Modal.VERSION  = '3.3.1'
+  Modal.VERSION  = '3.3.2'

  Modal.TRANSITION_DURATION = 300
  Modal.BACKDROP_TRANSITION_DURATION = 150
--- a/js/popover.js
+++ b/js/popover.js
@@ -1,5 +1,5 @@
 /* ========================================================================
- * Bootstrap: popover.js v3.3.1
+ * Bootstrap: popover.js v3.3.2
 * http://getbootstrap.com/javascript/#popovers
 * ========================================================================
 * Copyright 2011-2015 Twitter, Inc.
@@ -19,7 +19,7 @@

  if (!$.fn.tooltip) throw new Error('Popover requires tooltip.js')

-  Popover.VERSION  = '3.3.1'
+  Popover.VERSION  = '3.3.2'

  Popover.DEFAULTS = $.extend({}, $.fn.tooltip.Constructor.DEFAULTS, {
    placement: 'right',
--- a/js/scrollspy.js
+++ b/js/scrollspy.js
@@ -1,5 +1,5 @@
 /* ========================================================================
- * Bootstrap: scrollspy.js v3.3.1
+ * Bootstrap: scrollspy.js v3.3.2
 * http://getbootstrap.com/javascript/#scrollspy
 * ========================================================================
 * Copyright 2011-2015 Twitter, Inc.
@@ -30,7 +30,7 @@
    this.process()
  }

-  ScrollSpy.VERSION  = '3.3.1'
+  ScrollSpy.VERSION  = '3.3.2'

  ScrollSpy.DEFAULTS = {
    offset: 10
--- a/js/tab.js
+++ b/js/tab.js
@@ -1,5 +1,5 @@
 /* ========================================================================
- * Bootstrap: tab.js v3.3.1
+ * Bootstrap: tab.js v3.3.2
 * http://getbootstrap.com/javascript/#tabs
 * ========================================================================
 * Copyright 2011-2015 Twitter, Inc.
@@ -17,7 +17,7 @@
    this.element = $(element)
  }

-  Tab.VERSION = '3.3.1'
+  Tab.VERSION = '3.3.2'

  Tab.TRANSITION_DURATION = 150

--- a/js/tests/vendor/jquery.min.js
+++ b/js/tests/vendor/jquery.min.js
--- a/js/tooltip.js
+++ b/js/tooltip.js
@@ -1,5 +1,5 @@
 /* ========================================================================
- * Bootstrap: tooltip.js v3.3.1
+ * Bootstrap: tooltip.js v3.3.2
 * http://getbootstrap.com/javascript/#tooltip
 * Inspired by the original jQuery.tipsy by Jason Frame
 * ========================================================================
@@ -25,7 +25,7 @@
    this.init('tooltip', element, options)
  }

-  Tooltip.VERSION  = '3.3.1'
+  Tooltip.VERSION  = '3.3.2'

  Tooltip.TRANSITION_DURATION = 150

@@ -346,10 +346,10 @@
  }

  Tooltip.prototype.getCalculatedOffset = function (placement, pos, actualWidth, actualHeight) {
-    return placement == 'bottom' ? { top: pos.top + pos.height,   left: pos.left + pos.width / 2 - actualWidth / 2  } :
-           placement == 'top'    ? { top: pos.top - actualHeight, left: pos.left + pos.width / 2 - actualWidth / 2  } :
+    return placement == 'bottom' ? { top: pos.top + pos.height,   left: pos.left + pos.width / 2 - actualWidth / 2 } :
+           placement == 'top'    ? { top: pos.top - actualHeight, left: pos.left + pos.width / 2 - actualWidth / 2 } :
           placement == 'left'   ? { top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left - actualWidth } :
-        /* placement == 'right' */ { top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width   }
+        /* placement == 'right' */ { top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width }

  }

--- a/js/transition.js
+++ b/js/transition.js
@@ -1,5 +1,5 @@
 /* ========================================================================
- * Bootstrap: transition.js v3.3.1
+ * Bootstrap: transition.js v3.3.2
 * http://getbootstrap.com/javascript/#transitions
 * ========================================================================
 * Copyright 2011-2015 Twitter, Inc.