From: Mark Otto <otto@github.com>
Date: Thu, 12 Dec 2013 06:39:03 +0000 (-0800)
Subject: Merge branch 'master' into docs_derp
X-Git-Tag: v3.1.0~156
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4fc2907723e7f7bb5b14eb5cec94d629b6834e7f;p=thirdparty%2Fbootstrap.git

Merge branch 'master' into docs_derp

Conflicts:
	docs-assets/css/docs.css
	docs-assets/js/application.js
---

4fc2907723e7f7bb5b14eb5cec94d629b6834e7f
diff --cc docs-assets/css/docs.css
index 3f03db9cf0,15b533dd96..0b96a9663a
--- a/docs-assets/css/docs.css
+++ b/docs-assets/css/docs.css
@@@ -1088,11 -1041,11 +1079,11 @@@ h1[id] 
    width: 25%;
    height: 115px;
    padding: 10px;
-   font-size: 12px;
 -  margin: 0 -1px -1px 0;
+   font-size: 10px;
    line-height: 1.4;
    text-align: center;
 -  border: 1px solid #ddd;
 +  border: 1px solid #fff;
 +  background-color: #f9f9f9;
  }
  .bs-glyphicons .glyphicon {
    margin-top: 5px;
@@@ -1102,10 -1055,10 +1093,11 @@@
  .bs-glyphicons .glyphicon-class {
    display: block;
    text-align: center;
+   word-wrap: break-word; /* Help out IE10+ with class names */
  }
  .bs-glyphicons li:hover {
 -  background-color: rgba(86,61,124,.1);
 +  color: #fff;
 +  background-color: #563d7c;
  }
  
  @media (min-width: 768px) {
diff --cc docs-assets/js/application.js
index ea06e3ce23,3fd599eb7b..47ed967032
--- a/docs-assets/js/application.js
+++ b/docs-assets/js/application.js
@@@ -81,21 -81,16 +81,15 @@@
      $('.popover-test').popover()
  
      $('.bs-docs-navbar').tooltip({
-       selector: "a[data-toggle=tooltip]",
-       container: ".bs-docs-navbar .nav"
+       selector: 'a[data-toggle=tooltip]',
+       container: '.bs-docs-navbar .nav'
      })
  
-     // $('.bs-masthead').popover({
-     //   selector: ".btn-lg",
-     //   trigger: "hover",
-     //   placement: "top"
-     // })
- 
      // popover demo
 -    $('[data-toggle=popover]')
 -      .popover()
 +    $("[data-toggle=popover]").popover()
  
      // button state demo
-     $('#fat-btn')
+     $('#loading-example-btn')
        .click(function () {
          var btn = $(this)
          btn.button('loading')