Merge branch '3.0.0-wip' of https://github.com/juthilo/bootstrap-wip into 3.0.0-wip

2025-08-22 21:22:52 +02:00 · 2013-05-22 21:48:35 -07:00
parent bb9d867cf8 52a348aa3f
commit 41d2b707ed
21 changed files with 1315 additions and 447 deletions
--- a/docs/_includes/nav-customize.html
+++ b/docs/_includes/nav-customize.html
@@ -0,0 +1,37 @@
+<li>
+  <a href="#components">LESS components</a>
+  <ul class="nav">
+    <li><a href="#components-basics">The basics</a></li>
+    <li><a href="#components-standard">Standard styles</a></li>
+    <li><a href="#components-features">Bootstrap features</a></li>
+  </ul>
+</li>
+<li>
+  <a href="#plugins">jQuery plugins</a>
+</li>
+<li>
+  <a href="#variables">LESS variables</a>
+  <ul class="nav">
+    <li><a href="#customize-basics">The basics</a></li>
+    <li><a href="#customize-buttons">Buttons</a></li>
+    <li><a href="#customize-form-states">Form states</a></li>
+    <li><a href="#customize-alerts">Alerts</a></li>
+    <li><a href="#customize-navbar">Navbar</a></li>
+    <li><a href="#customize-tables">Tables</a></li>
+    <li><a href="#customize-forms">Forms</a></li>
+    <li><a href="#customize-dropdowns">Dropdowns</a></li>
+    <li><a href="#customize-panels-wells">Panels and wells</a></li>
+    <li><a href="#customize-jumbotron">Jumbotron</a></li>
+    <li><a href="#customize-modals">Modals</a></li>
+    <li><a href="#customize-list-group">List group</a></li>
+    <li><a href="#customize-thumbnails">Thumbnails</a></li>
+    <li><a href="#customize-progress">Progress bars</a></li>
+    <li><a href="#customize-pagination">Pagination</a></li>
+    <li><a href="#customize-labels">Labels</a></li>
+    <li><a href="#customize-tooltips-popovers">Tooltips and popovers</a></li>
+    <li><a href="#customize-other">Other</a></li>
+  </ul>
+</li>
+<li>
+  <a href="#download">Download</a>
+</li>
--- a/docs/_layouts/default.html
+++ b/docs/_layouts/default.html
@@ -31,6 +31,8 @@
                 {% include nav-components.html %}
              {% elsif page.slug == "js" %}
                 {% include nav-javascript.html %}
+              {% elsif page.slug == "customize" %}
+                 {% include nav-customize.html %}
              {% endif %}
            </ul>
          </div>
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -94,6 +94,29 @@ body {



+/* Customize and Download button
+-------------------------------------------------- */
+
+.bs-customize-download {
+  text-align:center;
+}
+.bs-customize-download .btn {
+  margin-top: 5px;
+  margin-bottom: 5px;
+  padding: 18px 24px;
+  font-size: 21px;
+  color: #b94a48;
+  background-color: #fff;
+  border-color: #b94a48;
+}
+.bs-customize-download .btn:hover,
+.bs-customize-download .btn:active {
+  color: #fff;
+  background-color: #b94a48;
+}
+
+
+
 /* Docs pages and sections
 -------------------------------------------------- */

--- a/docs/assets/js/bootstrap.js
+++ b/docs/assets/js/bootstrap.js
@@ -1,7 +1,7 @@
-/* ===================================================
+/* ========================================================================
 * Bootstrap: transition.js v3.0.0
 * http://twitter.github.com/bootstrap/javascript.html#transitions
- * ===================================================
+ * ========================================================================
 * Copyright 2013 Twitter, Inc.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,10 +15,10 @@
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
- * ========================================================== */
+ * ======================================================================== */


-!function ($) { "use strict";
+function ($) { "use strict";

  // CSS TRANSITION SUPPORT (Shoutout: http://www.modernizr.com/)
  // ============================================================
@@ -45,10 +45,10 @@
  })

 }(window.jQuery);
-/* ==========================================================
+/* ========================================================================
 * Bootstrap: alert.js v3.0.0
 * http://twitter.github.com/bootstrap/javascript.html#alerts
- * ==========================================================
+ * ========================================================================
 * Copyright 2013 Twitter, Inc.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
@@ -62,10 +62,10 @@
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
- * ========================================================== */
+ * ======================================================================== */


-!function ($) { "use strict";
+function ($) { "use strict";

  // ALERT CLASS DEFINITION
  // ======================
@@ -141,10 +141,10 @@
  $(document).on('click.bs.alert.data-api', dismiss, Alert.prototype.close)

 }(window.jQuery);
-/* ============================================================
+/* ========================================================================
 * Bootstrap: button.js v3.0.0
 * http://twitter.github.com/bootstrap/javascript.html#buttons
- * ============================================================
+ * ========================================================================
 * Copyright 2013 Twitter, Inc.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
@@ -158,10 +158,10 @@
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
- * ============================================================ */
+ * ======================================================================== */


-!function ($) { "use strict";
+function ($) { "use strict";

  // BUTTON PUBLIC CLASS DEFINITION
  // ==============================
@@ -246,10 +246,10 @@
  })

 }(window.jQuery);
-/* ==========================================================
+/* ========================================================================
 * Bootstrap: carousel.js v3.0.0
 * http://twitter.github.com/bootstrap/javascript.html#carousel
- * ==========================================================
+ * ========================================================================
 * Copyright 2012 Twitter, Inc.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
@@ -263,10 +263,10 @@
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
- * ========================================================== */
+ * ======================================================================== */


-!function ($) { "use strict";
+function ($) { "use strict";

  // CAROUSEL CLASS DEFINITION
  // =========================
@@ -449,10 +449,10 @@
  })

 }(window.jQuery);
-/* =============================================================
+/* ========================================================================
 * Bootstrap: collapse.js v3.0.0
 * http://twitter.github.com/bootstrap/javascript.html#collapse
- * =============================================================
+ * ========================================================================
 * Copyright 2012 Twitter, Inc.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
@@ -466,10 +466,10 @@
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
- * ============================================================ */
+ * ======================================================================== */


-!function ($) { "use strict";
+function ($) { "use strict";

  // COLLAPSE PUBLIC CLASS DEFINITION
  // ================================
@@ -602,10 +602,10 @@
  })

 }(window.jQuery);
-/* ============================================================
+/* ========================================================================
 * Bootstrap: dropdown.js v3.0.0
 * http://twitter.github.com/bootstrap/javascript.html#dropdowns
- * ============================================================
+ * ========================================================================
 * Copyright 2012 Twitter, Inc.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
@@ -619,10 +619,10 @@
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
- * ============================================================ */
+ * ======================================================================== */


-!function ($) { "use strict";
+function ($) { "use strict";

  // DROPDOWN CLASS DEFINITION
  // =========================
@@ -747,10 +747,10 @@
    .on('keydown.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown)

 }(window.jQuery);
-/* =========================================================
+/* ========================================================================
 * Bootstrap: modal.js v3.0.0
 * http://twitter.github.com/bootstrap/javascript.html#modals
- * =========================================================
+ * ========================================================================
 * Copyright 2012 Twitter, Inc.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
@@ -764,10 +764,10 @@
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
- * ========================================================= */
+ * ======================================================================== */


-!function ($) { "use strict";
+function ($) { "use strict";

  // MODAL CLASS DEFINITION
  // ======================
@@ -989,11 +989,11 @@
      .on('bs.modal.hidden', '.modal', function () { $body.removeClass('modal-open') })

 }(window.jQuery);
-/* ===========================================================
+/* ========================================================================
 * Bootstrap: tooltip.js v3.0.0
- * http://twitter.github.com/bootstrap/javascript.html#tooltips
+ * http://twitter.github.com/bootstrap/javascript.html#affix
 * Inspired by the original jQuery.tipsy by Jason Frame
- * ===========================================================
+ * ========================================================================
 * Copyright 2012 Twitter, Inc.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
@@ -1007,10 +1007,10 @@
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
- * ========================================================== */
+ * ======================================================================== */


-!function ($) { "use strict";
+function ($) { "use strict";

  // TOOLTIP PUBLIC CLASS DEFINITION
  // ===============================
@@ -1342,10 +1342,10 @@
  }

 }(window.jQuery);
-/* ===========================================================
+/* ========================================================================
 * Bootstrap: popover.js v3.0.0
 * http://twitter.github.com/bootstrap/javascript.html#popovers
- * ===========================================================
+ * ========================================================================
 * Copyright 2012 Twitter, Inc.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
@@ -1359,10 +1359,10 @@
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
- * =========================================================== */
+ * ======================================================================== */


-!function ($) { "use strict";
+function ($) { "use strict";

  // POPOVER PUBLIC CLASS DEFINITION
  // ===============================
@@ -1451,10 +1451,10 @@
  }

 }(window.jQuery);
-/* =============================================================
+/* ========================================================================
 * Bootstrap: scrollspy.js v3.0.0
 * http://twitter.github.com/bootstrap/javascript.html#scrollspy
- * =============================================================
+ * ========================================================================
 * Copyright 2012 Twitter, Inc.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
@@ -1468,10 +1468,10 @@
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
- * ============================================================== */
+ * ======================================================================== */


-!function ($) { "use strict";
+function ($) { "use strict";

  // SCROLLSPY CLASS DEFINITION
  // ==========================
@@ -1607,10 +1607,10 @@
  })

 }(window.jQuery);
-/* ========================================================
+/* ========================================================================
 * Bootstrap: tab.js v3.0.0
 * http://twitter.github.com/bootstrap/javascript.html#tabs
- * ========================================================
+ * ========================================================================
 * Copyright 2012 Twitter, Inc.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
@@ -1624,10 +1624,10 @@
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
- * ======================================================== */
+ * ======================================================================== */


-!function ($) { "use strict";
+function ($) { "use strict";

  // TAB CLASS DEFINITION
  // ====================
@@ -1740,10 +1740,10 @@
  })

 }(window.jQuery);
-/* ==========================================================
+/* ========================================================================
 * Bootstrap: affix.js v3.0.0
 * http://twitter.github.com/bootstrap/javascript.html#affix
- * ==========================================================
+ * ========================================================================
 * Copyright 2012 Twitter, Inc.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
@@ -1757,10 +1757,10 @@
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
- * ========================================================== */
+ * ======================================================================== */


-!function ($) { "use strict";
+function ($) { "use strict";

  // AFFIX CLASS DEFINITION
  // ======================
--- a/docs/assets/js/bootstrap.min.js
+++ b/docs/assets/js/bootstrap.min.js
--- a/docs/customize.html
+++ b/docs/customize.html
--- a/docs/getting-started.html
+++ b/docs/getting-started.html
@@ -276,7 +276,7 @@ bootstrap/
    </div>

    <h3>Removing potential bloat</h3>
-    <p>Not all sites and applications need to make use of everything Bootstrap has to offer, especially in production environments where bandwidth literally becomes a financial issue. We encourage folks to remove whatever is unused with our <a href="./customizer/">Customizer</a>.</p>
+    <p>Not all sites and applications need to make use of everything Bootstrap has to offer, especially in production environments where bandwidth literally becomes a financial issue. We encourage folks to remove whatever is unused with our <a href="/customize/">Customizer</a>.</p>
    <p>Using the Customizer, simply uncheck any component, feature, or asset you don't need. Hit download and swap out the default Bootstrap files with these newly customized ones. You'll get vanilla Bootstrap, but without the features *you* deem unnecessary. All custom builds include compiled and minified versions, so use whichever works for you.</p>

  </div>
--- a/js/.jshintrc
+++ b/js/.jshintrc
@@ -9,4 +9,4 @@
  "boss"     : true,
  "expr"     : true,
  "asi"      : true
-}
+}
--- a/js/affix.js
+++ b/js/affix.js
@@ -1,7 +1,7 @@
-/* ==========================================================
+/* ========================================================================
 * Bootstrap: affix.js v3.0.0
 * http://twitter.github.com/bootstrap/javascript.html#affix
- * ==========================================================
+ * ========================================================================
 * Copyright 2012 Twitter, Inc.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,10 +15,10 @@
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
- * ========================================================== */
+ * ======================================================================== */


-!function ($) { "use strict";
+function ($) { "use strict";

  // AFFIX CLASS DEFINITION
  // ======================
--- a/js/alert.js
+++ b/js/alert.js
@@ -1,7 +1,7 @@
-/* ==========================================================
+/* ========================================================================
 * Bootstrap: alert.js v3.0.0
 * http://twitter.github.com/bootstrap/javascript.html#alerts
- * ==========================================================
+ * ========================================================================
 * Copyright 2013 Twitter, Inc.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,10 +15,10 @@
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
- * ========================================================== */
+ * ======================================================================== */


-!function ($) { "use strict";
+function ($) { "use strict";

  // ALERT CLASS DEFINITION
  // ======================
--- a/js/button.js
+++ b/js/button.js
@@ -1,7 +1,7 @@
-/* ============================================================
+/* ========================================================================
 * Bootstrap: button.js v3.0.0
 * http://twitter.github.com/bootstrap/javascript.html#buttons
- * ============================================================
+ * ========================================================================
 * Copyright 2013 Twitter, Inc.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,10 +15,10 @@
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
- * ============================================================ */
+ * ======================================================================== */


-!function ($) { "use strict";
+function ($) { "use strict";

  // BUTTON PUBLIC CLASS DEFINITION
  // ==============================
--- a/js/carousel.js
+++ b/js/carousel.js
@@ -1,7 +1,7 @@
-/* ==========================================================
+/* ========================================================================
 * Bootstrap: carousel.js v3.0.0
 * http://twitter.github.com/bootstrap/javascript.html#carousel
- * ==========================================================
+ * ========================================================================
 * Copyright 2012 Twitter, Inc.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,10 +15,10 @@
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
- * ========================================================== */
+ * ======================================================================== */


-!function ($) { "use strict";
+function ($) { "use strict";

  // CAROUSEL CLASS DEFINITION
  // =========================
--- a/js/collapse.js
+++ b/js/collapse.js
@@ -1,7 +1,7 @@
-/* =============================================================
+/* ========================================================================
 * Bootstrap: collapse.js v3.0.0
 * http://twitter.github.com/bootstrap/javascript.html#collapse
- * =============================================================
+ * ========================================================================
 * Copyright 2012 Twitter, Inc.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,10 +15,10 @@
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
- * ============================================================ */
+ * ======================================================================== */


-!function ($) { "use strict";
+function ($) { "use strict";

  // COLLAPSE PUBLIC CLASS DEFINITION
  // ================================
--- a/js/dropdown.js
+++ b/js/dropdown.js
@@ -1,7 +1,7 @@
-/* ============================================================
+/* ========================================================================
 * Bootstrap: dropdown.js v3.0.0
 * http://twitter.github.com/bootstrap/javascript.html#dropdowns
- * ============================================================
+ * ========================================================================
 * Copyright 2012 Twitter, Inc.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,10 +15,10 @@
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
- * ============================================================ */
+ * ======================================================================== */


-!function ($) { "use strict";
+function ($) { "use strict";

  // DROPDOWN CLASS DEFINITION
  // =========================
--- a/js/modal.js
+++ b/js/modal.js
@@ -1,7 +1,7 @@
-/* =========================================================
+/* ========================================================================
 * Bootstrap: modal.js v3.0.0
 * http://twitter.github.com/bootstrap/javascript.html#modals
- * =========================================================
+ * ========================================================================
 * Copyright 2012 Twitter, Inc.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,10 +15,10 @@
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
- * ========================================================= */
+ * ======================================================================== */


-!function ($) { "use strict";
+function ($) { "use strict";

  // MODAL CLASS DEFINITION
  // ======================
--- a/js/popover.js
+++ b/js/popover.js
@@ -1,7 +1,7 @@
-/* ===========================================================
+/* ========================================================================
 * Bootstrap: popover.js v3.0.0
 * http://twitter.github.com/bootstrap/javascript.html#popovers
- * ===========================================================
+ * ========================================================================
 * Copyright 2012 Twitter, Inc.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,10 +15,10 @@
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
- * =========================================================== */
+ * ======================================================================== */


-!function ($) { "use strict";
+function ($) { "use strict";

  // POPOVER PUBLIC CLASS DEFINITION
  // ===============================
--- a/js/scrollspy.js
+++ b/js/scrollspy.js
@@ -1,7 +1,7 @@
-/* =============================================================
+/* ========================================================================
 * Bootstrap: scrollspy.js v3.0.0
 * http://twitter.github.com/bootstrap/javascript.html#scrollspy
- * =============================================================
+ * ========================================================================
 * Copyright 2012 Twitter, Inc.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,10 +15,10 @@
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
- * ============================================================== */
+ * ======================================================================== */


-!function ($) { "use strict";
+function ($) { "use strict";

  // SCROLLSPY CLASS DEFINITION
  // ==========================
--- a/js/tab.js
+++ b/js/tab.js
@@ -1,7 +1,7 @@
-/* ========================================================
+/* ========================================================================
 * Bootstrap: tab.js v3.0.0
 * http://twitter.github.com/bootstrap/javascript.html#tabs
- * ========================================================
+ * ========================================================================
 * Copyright 2012 Twitter, Inc.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,10 +15,10 @@
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
- * ======================================================== */
+ * ======================================================================== */


-!function ($) { "use strict";
+function ($) { "use strict";

  // TAB CLASS DEFINITION
  // ====================
--- a/js/tooltip.js
+++ b/js/tooltip.js
@@ -1,8 +1,8 @@
-/* ===========================================================
+/* ========================================================================
 * Bootstrap: tooltip.js v3.0.0
- * http://twitter.github.com/bootstrap/javascript.html#tooltips
+ * http://twitter.github.com/bootstrap/javascript.html#affix
 * Inspired by the original jQuery.tipsy by Jason Frame
- * ===========================================================
+ * ========================================================================
 * Copyright 2012 Twitter, Inc.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,10 +16,10 @@
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
- * ========================================================== */
+ * ======================================================================== */


-!function ($) { "use strict";
+function ($) { "use strict";

  // TOOLTIP PUBLIC CLASS DEFINITION
  // ===============================
--- a/js/transition.js
+++ b/js/transition.js
@@ -1,7 +1,7 @@
-/* ===================================================
+/* ========================================================================
 * Bootstrap: transition.js v3.0.0
 * http://twitter.github.com/bootstrap/javascript.html#transitions
- * ===================================================
+ * ========================================================================
 * Copyright 2013 Twitter, Inc.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,10 +15,10 @@
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
- * ========================================================== */
+ * ======================================================================== */


-!function ($) { "use strict";
+function ($) { "use strict";

  // CSS TRANSITION SUPPORT (Shoutout: http://www.modernizr.com/)
  // ============================================================
--- a/package.json
+++ b/package.json
@@ -18,7 +18,7 @@
  ]
  , "devDependencies": {
      "uglify-js": "1.3.4"
-    , "jshint": "0.9.1"
+    , "jshint": "2.1.2"
    , "recess": "1.1.6"
    , "connect": "2.1.3"
  }