Merge branch '3.0.0-wip' into bs3_remove_examples

Conflicts:
	docs/_includes/nav-getting-started.html
	docs/examples/navbar-fixed-top.html
	docs/examples/navbar-static-top.html
	docs/examples/navbar.html
	docs/getting-started.html

Makefile

@@ -22,7 +22,6 @@ build:
 	@recess --compile ${BOOTSTRAP_LESS} > ${BOOTSTRAP}
 	@echo "               ${CHECK}"
 	@printf "Prepping documentation assets..."
-	@cp fonts/* docs/assets/fonts/
 	@cp js/tests/vendor/jquery.js docs/assets/js/
 	@echo "            ${CHECK}"
 	@printf "Compiling and minifying JavaScript..."
@@ -61,7 +60,7 @@ clean:
 # recess & uglifyjs are required
 #
 
-bootstrap: bootstrap-fonts bootstrap-css bootstrap-js
+bootstrap: bootstrap-css bootstrap-js
 
 
 #
@@ -88,17 +87,6 @@ bootstrap/css/*.css: less/*.less
 	recess --compile ${BOOTSTRAP_LESS} > bootstrap/css/bootstrap.css
 	recess --compress ${BOOTSTRAP_LESS} > bootstrap/css/bootstrap.min.css
 
-#
-# FONTS
-#
-
-bootstrap-fonts: bootstrap/fonts/*
-
-bootstrap/fonts/*: fonts/*
-	mkdir -p bootstrap/fonts
-	cp fonts/* bootstrap/fonts/
-
-
 #
 # WATCH LESS FILES
 #
@@ -114,4 +102,4 @@ watch:
 run: build
 	jekyll build && jekyll server
 
-.PHONY: docs watch gh-pages bootstrap-img bootstrap-css bootstrap-js
+.PHONY: docs watch gh-pages bootstrap-css bootstrap-js

README.md

@@ -40,7 +40,7 @@ Learn more about using Jekyll by reading their [documentation](http://jekyllrb.c
 
 Documentation for v2.3.2 has been made available for the time being at [http://getbootstrap.com/2.3.2/docs](http://getbootstrap.com/2.3.2/docs) while folks transition to Bootstrap 3.
 
-For previous releases, documentation is available for [download via Git tags](https://github.com/twitter/bootstrap/tags).
+[Previous releases](https://github.com/twbs/bootstrap/releases) and their documentation are also available for download.
 
 
 

_config.yml

@@ -9,4 +9,3 @@ permalink:    pretty
 source:       ./docs
 destination:  ./_gh_pages
 port:         9001
-url:          http://getbootstrap.dev:9001

docs/_includes/colophon.html

@@ -5,7 +5,6 @@
 
   <p>Designed and built with all the love in the world by <a href="http://twitter.com/mdo" target="_blank">@mdo</a> and <a href="http://twitter.com/fat" target="_blank">@fat</a>.</p>
   <p>Code licensed under <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Apache License v2.0</a>, documentation under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p>
-  <p><a href="http://glyphicons.com">Glyphicons Free</a> licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p>
   <ul class="footer-links">
     <li><a href="http://blog.getbootstrap.com">Blog</a></li>
     <li class="muted">&middot;</li>

docs/_includes/footer.html

@@ -4,10 +4,6 @@
 <script src="/assets/js/jquery.js"></script>
 <script src="/assets/js/bootstrap.js"></script>
 
-<!-- Offcanvas example
-================================================== -->
-<script src="/assets/js/examples/bootstrap-offcanvas.js"></script>
-
 <script type="text/javascript" src="http://platform.twitter.com/widgets.js"></script>
 <script src="/assets/js/holder/holder.js"></script>
 

docs/_includes/nav-components.html

-<li>
-  <a href="#icons">Glyphicons</a>
-  <ul class="nav">
-    <li><a href="#icons-list">Icon list</a></li>
-    <li><a href="#icons-how-to">How to use</a></li>
-    <li><a href="#icons-examples">Examples</a></li>
-  </ul>
-</li>
 <li>
   <a href="#dropdowns">Dropdowns</a>
   <ul class="nav">
     <li><a href="#dropdowns-example">Example</a></li>
     <li><a href="#dropdowns-alignment">Alignment options</a></li>
     <li><a href="#dropdowns-disabled">Disabled menu items</a></li>
-    <li><a href="#dropdowns-submenus">Submenus</a></li>
   </ul>
 </li>
 <li>
@@ -102,9 +93,7 @@
   <a href="#list-group">List group</a>
   <ul class="nav">
     <li><a href="#list-group-basic">Basic list group</a></li>
-    <li><a href="#list-group-chevrons">Chevrons</a></li>
     <li><a href="#list-group-badges">Badges</a></li>
-    <li><a href="#list-group-badges-chevrons">Badges and chevrons</a></li>
     <li><a href="#list-group-linked">Linked items</a></li>
     <li><a href="#list-group-custom-content">Custom content</a></li>
     <!-- <li><a href="#list-group-pic">Leading picture</a></li> -->

docs/_includes/nav-css.html

@@ -9,6 +9,9 @@
     <li><a href="#overview-container">Container</a></li>
   </ul>
 </li>
+<li>
+  <a href="#glyphicons">Glyphicons</a>
+</li>
 <li>
   <a href="#grid">Grid system</a>
   <ul class="nav">
@@ -19,7 +22,6 @@
     <li><a href="#grid-offsetting">Offset columns</a></li>
     <li><a href="#grid-nesting">Nested columns</a></li>
     <li><a href="#grid-column-ordering">Column ordering</a></li>
-    <li><a href="#grid-small">Small device grid</a></li>
     <li><a href="#grid-less">LESS mixins and variables</a></li>
   </ul>
 </li>

docs/_includes/nav-customize.html

@@ -5,7 +5,7 @@
   <a href="#plugins">jQuery plugins</a>
 </li>
 <li>
-  <a href="#variables">LESS variables</a>
+  <a href="#less-variables">LESS variables</a>
   <ul class="nav">
     <li><a href="#variables-basics">Basics</a></li>
     <li><a href="#variables-buttons">Buttons</a></li>

docs/_includes/nav-getting-started.html

@@ -11,6 +11,12 @@
 <li>
   <a href="#template">Basic template</a>
 </li>
+<li>
+  <a href="#browsers">Browser support</a>
+</li>
+<li>
+  <a href="#license-faqs">License FAQs</a>
+</li>
 <li>
   <a href="#customizing">Customizing Bootstrap</a>
 </li>
\ No newline at end of file

docs/_includes/nav-javascript.html

@@ -2,7 +2,7 @@
   <a href="#js-overview">Overview</a>
   <ul class="nav">
     <li><a href="#js-individual-compiled">Individual or compiled</a></li>
-    <li><a href="#js-data-attributes">Data attributes</a></li>
+    <li><a href="#js-data-attrs">Data attributes</a></li>
     <li><a href="#js-programmatic-api">Programmatic API</a></li>
     <li><a href="#js-noconflict">No Conflict</a></li>
     <li><a href="#js-events">Events</a></li>

docs/assets/css/docs.css

@@ -81,7 +81,9 @@ body {
 
 /* Textual links */
 .bs-masthead-links {
-  margin: 20px 0;
+  margin-top: 20px;
+  margin-bottom: 20px;
+  padding-left: 0;
   list-style: none;
 }
 .bs-masthead-links li {
@@ -93,7 +95,6 @@ body {
 }
 
 
-
 /* Customize and Download button
 -------------------------------------------------- */
 
@@ -221,11 +222,10 @@ body {
 /* Side notes for calling out things
 -------------------------------------------------- */
 
+/* Base styles (regardless of theme) */
 .bs-callout {
   margin: 20px 0;
   padding: 15px 30px 15px 15px;
-  background-color: #fcf2f2;
-  border-left: 5px solid #df7c7b;
 }
 .bs-callout h4 {
   margin-top: 0;
@@ -238,6 +238,20 @@ body {
   background-color: #fff;
 }
 
+/* Themes for different contexts */
+.bs-callout-danger {
+  background-color: #fcf2f2;
+  border-left: 5px solid #df7c7b;
+}
+.bs-callout-warning {
+  background-color: #fefbed;
+  border-left: 5px solid #f5d659;
+}
+.bs-callout-info {
+  background-color: #f0f7fd;
+  border-left: 5px solid #55a9e1;
+}
+
 
 
 /* Special grid styles
@@ -311,7 +325,7 @@ body {
 .bs-example > .well:last-child {
   margin-bottom: 0;
 }
-.bs-example > .close {
+.bs-example > p > .close {
   float: none;
 }
 
@@ -478,43 +492,6 @@ body {
 
 
 
-/* Icons
--------------------------------------------------- */
-
-.the-icons {
-  padding-bottom: 1px;
-  margin-left: 0;
-  list-style: none;
-  margin-bottom: 20px;
-  overflow: hidden;
-}
-.the-icons li {
-  float: left;
-  width: 100px;
-  height: 110px;
-  padding: 10px;
-  border: 1px solid #ddd;
-  font-size: 12px;
-  line-height: 1.25;
-  text-align: center;
-  -webkit-box-sizing: border-box;
-     -moz-box-sizing: border-box;
-          box-sizing: border-box;
-  margin: 0 -1px -1px 0;
-}
-.the-icons .glyphicon {
-  display: block;
-  margin: 5px auto;
-  vertical-align: middle;
-  margin-right: 3px;
-  font-size: 24px;
-}
-.the-icons li:hover {
-  background-color: rgba(255,0,0,.1);
-}
-
-
-
 /* Responsive docs
 -------------------------------------------------- */
 
@@ -601,6 +578,7 @@ body {
 }
 .footer-links {
   margin: 10px 0;
+  padding-left: 0;
 }
 .footer-links li {
   display: inline;
@@ -616,7 +594,8 @@ body {
 }
 .bs-social-buttons {
   display: inline-block;
-  margin: 0;
+  margin-bottom: 0;
+  padding-left: 0;
   list-style: none;
 }
 .bs-social-buttons li {
@@ -711,13 +690,6 @@ input.focused {
 /* Tablets and up */
 @media screen and (min-width: 768px) {
 
-  /* Reaffix the fixed sidebar */
-  .bs-sidebar.affix {
-    position: fixed; /* Undo the static from mobile-first approach */
-    top: 50px;
-    width: 160px;
-  }
-
   /* Back to top link */
   .bs-top {
     display: block; /* Unhide */
@@ -779,6 +751,8 @@ input.focused {
 
   /* Widen the fixed sidebar */
   .bs-sidebar.affix {
+    position: fixed; /* Undo the static from mobile-first approach */
+    top: 50px;
     width: 213px;
   }
 

docs/assets/js/application.js

@@ -92,7 +92,6 @@
             .map(function () { return this.value })
             .toArray()
         , vars = {}
-        , img = ['glyphicons-halflings.png', 'glyphicons-halflings-white.png']
 
       $("#less-variables input")
         .each(function () {
@@ -107,7 +106,6 @@
           js: js
         , css: css
         , vars: vars
-        , img: img
       }
       })
     })

docs/assets/js/bootstrap.js

@@ -502,6 +502,10 @@
   Collapse.prototype.show = function () {
     if (this.transitioning || this.$element.hasClass('in')) return
 
+    var startEvent = $.Event('show.bs.collapse')
+    this.$element.trigger(startEvent)
+    if (startEvent.isDefaultPrevented()) return
+
     var dimension = this.dimension()
     var scroll    = $.camelCase(['scroll', dimension].join('-'))
     var actives   = this.$parent && this.$parent.find('> .accordion-group > .in')
@@ -514,16 +518,21 @@
     }
 
     this.$element[dimension](0)
-    this.transition('addClass', $.Event('show.bs.collapse'), 'shown.bs.collapse')
+    this.transition('addClass', 'shown.bs.collapse')
 
     if ($.support.transition) this.$element[dimension](this.$element[0][scroll])
   }
 
   Collapse.prototype.hide = function () {
     if (this.transitioning || !this.$element.hasClass('in')) return
+
+    var startEvent = $.Event('hide.bs.collapse')
+    this.$element.trigger(startEvent)
+    if (startEvent.isDefaultPrevented()) return
+
     var dimension = this.dimension()
     this.reset(this.$element[dimension]())
-    this.transition('removeClass', $.Event('hide.bs.collapse'), 'hidden')
+    this.transition('removeClass', 'shown.bs.hidden')
     this.$element[dimension](0)
   }
 
@@ -535,23 +544,19 @@
       [dimension](size || 'auto')
       [0].offsetWidth
 
-    this.$element[size !== null ? 'addClass' : 'removeClass']('collapse')
+    this.$element[size != null ? 'addClass' : 'removeClass']('collapse')
 
     return this
   }
 
-  Collapse.prototype.transition = function (method, startEvent, completeEvent) {
+  Collapse.prototype.transition = function (method, completeEvent) {
     var that     = this
     var complete = function () {
-      if (startEvent.type == 'show') that.reset()
+      if (completeEvent == 'shown.bs.collapse') that.reset()
       that.transitioning = 0
       that.$element.trigger(completeEvent)
     }
 
-    this.$element.trigger(startEvent)
-
-    if (startEvent.isDefaultPrevented()) return
-
     this.transitioning = 1
 
     this.$element[method]('in')
@@ -603,7 +608,10 @@
         || e.preventDefault()
         || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') //strip for ie7
     var option = $(target).data('collapse') ? 'toggle' : $this.data()
+    var parent = $this.attr('data-parent')
+    var $parent = parent && $(parent)
 
+    if ($parent) $parent.find('[data-toggle=collapse][data-parent=' + parent + ']').not($this).addClass('collapsed')
     $this[$(target).hasClass('in') ? 'addClass' : 'removeClass']('collapsed')
     $(target).collapse(option)
   })
@@ -1420,6 +1428,8 @@
     $tip.find('.popover-content')[this.options.html ? 'html' : 'text'](content)
 
     $tip.removeClass('fade top bottom left right in')
+
+    $tip.find('.popover-title:empty').hide()
   }
 
   Popover.prototype.hasContent = function () {