fixes and grunt

2014-11-30 21:01:50 -08:00 · 2014-11-30 21:01:50 -08:00 · 7a799af939
parent 4bba2d0e0c
commit 7a799af939
11 changed files with 125 additions and 96 deletions
--- a/dist/css/bootstrap.css.map
+++ b/dist/css/bootstrap.css.map
--- a/docs/assets/js/customize.min.js
+++ b/docs/assets/js/customize.min.js
--- a/docs/assets/js/raw-files.min.js
+++ b/docs/assets/js/raw-files.min.js
--- a/docs/assets/js/src/customizer.js
+++ b/docs/assets/js/src/customizer.js
@ -11,7 +11,7 @@
 window.onload = function () { // wait for load in a dumb way because B-0
  'use strict';
  var cw = '/*!\n' +
-           ' * Bootstrap v3.3.1 (http://getbootstrap.com)\n' +
+           ' * Bootstrap v3.3.0 (http://getbootstrap.com)\n' +
           ' * Copyright 2011-' + new Date().getFullYear() + ' Twitter, Inc.\n' +
           ' * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)\n' +
           ' */\n\n'
@ -22,8 +22,8 @@ window.onload = function () { // wait for load in a dumb way because B-0
  function showError(msg, err) {
    $('<div id="bsCustomizerAlert" class="bs-customizer-alert">' +
        '<div class="container">' +
-          '<a href="#bsCustomizerAlert" data-dismiss="alert" class="close pull-right" aria-label="Close" role="button"><span aria-hidden="true">&times;</span></a>' +
-          '<p class="bs-customizer-alert-text"><span class="glyphicon glyphicon-warning-sign" aria-hidden="true"></span><span class="sr-only">Warning:</span>' + msg + '</p>' +
+          '<a href="#bsCustomizerAlert" data-dismiss="alert" class="close pull-right">&times;</a>' +
+          '<p class="bs-customizer-alert-text"><span class="glyphicon glyphicon-warning-sign"></span>' + msg + '</p>' +
          (err.extract ? '<pre class="bs-customizer-alert-extract">' + err.extract.join('\n') + '</pre>' : '') +
        '</div>' +
      '</div>').appendTo('body').alert()
@ -32,7 +32,7 @@ window.onload = function () { // wait for load in a dumb way because B-0

  function showSuccess(msg) {
    $('<div class="bs-callout bs-callout-info">' +
-      '<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>' + msg +
+      '<button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>' + msg +
    '</div>').insertAfter('.bs-customize-download')
  }

@ -50,7 +50,7 @@ window.onload = function () { // wait for load in a dumb way because B-0
  }

  function showAlert(type, msg, insertAfter) {
-    $('<div class="alert alert-' + type + '">' + msg + '<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button></div>')
+    $('<div class="alert alert-' + type + '">' + msg + '<button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button></div>')
      .insertAfter(insertAfter)
  }

@ -293,11 +293,13 @@ window.onload = function () { // wait for load in a dumb way because B-0
      })

    var bsLessSource    = preamble + generateLESS('bootstrap.less', lessFileIncludes, vars)
+    var themeLessSource = preamble + generateLESS('theme.less',     lessFileIncludes, vars)

    var prefixer = autoprefixer({ browsers: __configBridge.autoprefixerBrowsers })

    $.when(
      compileLESS(bsLessSource, 'bootstrap', result),
+      compileLESS(themeLessSource, 'bootstrap-theme', result)
    ).done(function () {
      for (var key in result) {
        result[key] = prefixer.process(result[key]).css
--- a/docs/components/tables.md
+++ b/docs/components/tables.md
@ -19,19 +19,19 @@ Due to the widespread use of tables across plugins like calendars and date picke
  </thead>
  <tbody>
    <tr>
-      <th scope="rowspan">1</th>
+      <th scope="row">1</th>
      <td>Mark</td>
      <td>Otto</td>
      <td>@mdo</td>
    </tr>
    <tr>
-      <th scope="rowspan">2</th>
+      <th scope="row">2</th>
      <td>Jacob</td>
      <td>Thornton</td>
      <td>@fat</td>
    </tr>
    <tr>
-      <th scope="rowspan">3</th>
+      <th scope="row">3</th>
      <td>Larry</td>
      <td>the Bird</td>
      <td>@twitter</td>
@ -54,19 +54,19 @@ Due to the widespread use of tables across plugins like calendars and date picke
  </thead>
  <tbody>
    <tr>
-      <th scope="rowspan">1</th>
+      <th scope="row">1</th>
      <td>Mark</td>
      <td>Otto</td>
      <td>@mdo</td>
    </tr>
    <tr>
-      <th scope="rowspan">2</th>
+      <th scope="row">2</th>
      <td>Jacob</td>
      <td>Thornton</td>
      <td>@fat</td>
    </tr>
    <tr>
-      <th scope="rowspan">3</th>
+      <th scope="row">3</th>
      <td>Larry</td>
      <td>the Bird</td>
      <td>@twitter</td>
@ -91,19 +91,19 @@ Use one of two modifier classes to make `<thead>`s appear light or dark gray.
  </thead>
  <tbody>
    <tr>
-      <th scope="rowspan">1</th>
+      <th scope="row">1</th>
      <td>Mark</td>
      <td>Otto</td>
      <td>@mdo</td>
    </tr>
    <tr>
-      <th scope="rowspan">2</th>
+      <th scope="row">2</th>
      <td>Jacob</td>
      <td>Thornton</td>
      <td>@fat</td>
    </tr>
    <tr>
-      <th scope="rowspan">3</th>
+      <th scope="row">3</th>
      <td>Larry</td>
      <td>the Bird</td>
      <td>@twitter</td>
@ -119,19 +119,19 @@ Use one of two modifier classes to make `<thead>`s appear light or dark gray.
  </thead>
  <tbody>
    <tr>
-      <th scope="rowspan">1</th>
+      <th scope="row">1</th>
      <td>Mark</td>
      <td>Otto</td>
      <td>@mdo</td>
    </tr>
    <tr>
-      <th scope="rowspan">2</th>
+      <th scope="row">2</th>
      <td>Jacob</td>
      <td>Thornton</td>
      <td>@fat</td>
    </tr>
    <tr>
-      <th scope="rowspan">3</th>
+      <th scope="row">3</th>
      <td>Larry</td>
      <td>the Bird</td>
      <td>@twitter</td>
@ -156,19 +156,19 @@ Use `.table-striped` to add zebra-striping to any table row within the `<tbody>`
  </thead>
  <tbody>
    <tr>
-      <th scope="rowspan">1</th>
+      <th scope="row">1</th>
      <td>Mark</td>
      <td>Otto</td>
      <td>@mdo</td>
    </tr>
    <tr>
-      <th scope="rowspan">2</th>
+      <th scope="row">2</th>
      <td>Jacob</td>
      <td>Thornton</td>
      <td>@fat</td>
    </tr>
    <tr>
-      <th scope="rowspan">3</th>
+      <th scope="row">3</th>
      <td>Larry</td>
      <td>the Bird</td>
      <td>@twitter</td>
@ -193,24 +193,25 @@ Add `.table-bordered` for borders on all sides of the table and cells.
  </thead>
  <tbody>
    <tr>
-      <th scope="rowspan" rowspan="2">1</tg>
+      <th scope="row">1</tg>
      <td>Mark</td>
      <td>Otto</td>
      <td>@mdo</td>
    </tr>
    <tr>
+      <th scope="row">2</tg>
      <td>Mark</td>
      <td>Otto</td>
      <td>@TwBootstrap</td>
    </tr>
    <tr>
-      <th scope="rowspan">2</th>
+      <th scope="row">3</th>
      <td>Jacob</td>
      <td>Thornton</td>
      <td>@fat</td>
    </tr>
    <tr>
-      <th scope="rowspan">3</th>
+      <th scope="row">4</th>
      <td colspan="2">Larry the Bird</td>
      <td>@twitter</td>
    </tr>
@ -234,19 +235,19 @@ Add `.table-hover` to enable a hover state on table rows within a `<tbody>`.
  </thead>
  <tbody>
    <tr>
-      <th scope="rowspan">1</th>
+      <th scope="row">1</th>
      <td>Mark</td>
      <td>Otto</td>
      <td>@mdo</td>
    </tr>
    <tr>
-      <th scope="rowspan">2</th>
+      <th scope="row">2</th>
      <td>Jacob</td>
      <td>Thornton</td>
      <td>@fat</td>
    </tr>
    <tr>
-      <th scope="rowspan">3</th>
+      <th scope="row">3</th>
      <td colspan="2">Larry the Bird</td>
      <td>@twitter</td>
    </tr>
@ -270,19 +271,19 @@ Add `.table-sm` to make tables more compact by cutting cell padding in half.
  </thead>
  <tbody>
    <tr>
-      <th scope="rowspan">1</th>
+      <th scope="row">1</th>
      <td>Mark</td>
      <td>Otto</td>
      <td>@mdo</td>
    </tr>
    <tr>
-      <th scope="rowspan">2</th>
+      <th scope="row">2</th>
      <td>Jacob</td>
      <td>Thornton</td>
      <td>@fat</td>
    </tr>
    <tr>
-      <th scope="rowspan">3</th>
+      <th scope="row">3</th>
      <td colspan="2">Larry the Bird</td>
      <td>@twitter</td>
    </tr>
@ -308,31 +309,31 @@ Use contextual classes to color table rows or individual cells.
    </thead>
    <tbody>
      <tr>
-        <th scope="rowspan">
+        <th scope="row">
          <code>.active</code>
        </th>
        <td>Applies the hover color to a particular row or cell</td>
      </tr>
      <tr>
-        <th scope="rowspan">
+        <th scope="row">
          <code>.success</code>
        </th>
        <td>Indicates a successful or positive action</td>
      </tr>
      <tr>
-        <th scope="rowspan">
+        <th scope="row">
          <code>.info</code>
        </th>
        <td>Indicates a neutral informative change or action</td>
      </tr>
      <tr>
-        <th scope="rowspan">
+        <th scope="row">
          <code>.warning</code>
        </th>
        <td>Indicates a warning that might need attention</td>
      </tr>
      <tr>
-        <th scope="rowspan">
+        <th scope="row">
          <code>.danger</code>
        </th>
        <td>Indicates a dangerous or potentially negative action</td>
@ -353,55 +354,55 @@ Use contextual classes to color table rows or individual cells.
    </thead>
    <tbody>
      <tr class="active">
-        <th scope="rowspan">1</th>
+        <th scope="row">1</th>
        <td>Column content</td>
        <td>Column content</td>
        <td>Column content</td>
      </tr>
      <tr>
-        <th scope="rowspan">2</th>
+        <th scope="row">2</th>
        <td>Column content</td>
        <td>Column content</td>
        <td>Column content</td>
      </tr>
      <tr class="success">
-        <th scope="rowspan">3</th>
+        <th scope="row">3</th>
        <td>Column content</td>
        <td>Column content</td>
        <td>Column content</td>
      </tr>
      <tr>
-        <th scope="rowspan">4</th>
+        <th scope="row">4</th>
        <td>Column content</td>
        <td>Column content</td>
        <td>Column content</td>
      </tr>
      <tr class="info">
-        <th scope="rowspan">5</th>
+        <th scope="row">5</th>
        <td>Column content</td>
        <td>Column content</td>
        <td>Column content</td>
      </tr>
      <tr>
-        <th scope="rowspan">6</th>
+        <th scope="row">6</th>
        <td>Column content</td>
        <td>Column content</td>
        <td>Column content</td>
      </tr>
      <tr class="warning">
-        <th scope="rowspan">7</th>
+        <th scope="row">7</th>
        <td>Column content</td>
        <td>Column content</td>
        <td>Column content</td>
      </tr>
      <tr>
-        <th scope="rowspan">8</th>
+        <th scope="row">8</th>
        <td>Column content</td>
        <td>Column content</td>
        <td>Column content</td>
      </tr>
      <tr class="danger">
-        <th scope="rowspan">9</th>
+        <th scope="row">9</th>
        <td>Column content</td>
        <td>Column content</td>
        <td>Column content</td>
@ -459,7 +460,7 @@ Create responsive tables by wrapping any `.table` in `.table-responsive` to make
      </thead>
      <tbody>
        <tr>
-          <th scope="rowspan">1</th>
+          <th scope="row">1</th>
          <td>Table cell</td>
          <td>Table cell</td>
          <td>Table cell</td>
@ -468,7 +469,7 @@ Create responsive tables by wrapping any `.table` in `.table-responsive` to make
          <td>Table cell</td>
        </tr>
        <tr>
-          <th scope="rowspan">2</th>
+          <th scope="row">2</th>
          <td>Table cell</td>
          <td>Table cell</td>
          <td>Table cell</td>
@ -477,7 +478,7 @@ Create responsive tables by wrapping any `.table` in `.table-responsive` to make
          <td>Table cell</td>
        </tr>
        <tr>
-          <th scope="rowspan">3</th>
+          <th scope="row">3</th>
          <td>Table cell</td>
          <td>Table cell</td>
          <td>Table cell</td>
@ -504,7 +505,7 @@ Create responsive tables by wrapping any `.table` in `.table-responsive` to make
      </thead>
      <tbody>
        <tr>
-          <th scope="rowspan">1</th>
+          <th scope="row">1</th>
          <td>Table cell</td>
          <td>Table cell</td>
          <td>Table cell</td>
@ -513,7 +514,7 @@ Create responsive tables by wrapping any `.table` in `.table-responsive` to make
          <td>Table cell</td>
        </tr>
        <tr>
-          <th scope="rowspan">2</th>
+          <th scope="row">2</th>
          <td>Table cell</td>
          <td>Table cell</td>
          <td>Table cell</td>
@ -522,7 +523,7 @@ Create responsive tables by wrapping any `.table` in `.table-responsive` to make
          <td>Table cell</td>
        </tr>
        <tr>
-          <th scope="rowspan">3</th>
+          <th scope="row">3</th>
          <td>Table cell</td>
          <td>Table cell</td>
          <td>Table cell</td>
@ -561,7 +562,7 @@ Create responsive tables by wrapping any `.table` in `.table-responsive` to make
  </thead>
  <tbody>
    <tr>
-      <th scope="rowspan">1</th>
+      <th scope="row">1</th>
      <td>Table cell</td>
      <td>Table cell</td>
      <td>Table cell</td>
@ -570,7 +571,7 @@ Create responsive tables by wrapping any `.table` in `.table-responsive` to make
      <td>Table cell</td>
    </tr>
    <tr>
-      <th scope="rowspan">2</th>
+      <th scope="row">2</th>
      <td>Table cell</td>
      <td>Table cell</td>
      <td>Table cell</td>
@ -579,7 +580,7 @@ Create responsive tables by wrapping any `.table` in `.table-responsive` to make
      <td>Table cell</td>
    </tr>
    <tr>
-      <th scope="rowspan">3</th>
+      <th scope="row">3</th>
      <td>Table cell</td>
      <td>Table cell</td>
      <td>Table cell</td>
--- a/docs/dist/css/bootstrap.css
+++ b/docs/dist/css/bootstrap.css
@ -1,5 +1,5 @@
 /*!
- * Bootstrap v3.3.0 (http://getbootstrap.com)
+ * Bootstrap v3.3.1 (http://getbootstrap.com)
 * Copyright 2011-2014 Twitter, Inc.
 * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
 */
@ -1806,7 +1806,21 @@ fieldset[disabled] .checkbox label {
  padding-right: 0;
  padding-left: 0;
 }
-.input-sm,
+.input-sm {
+  height: 2.025rem;
+  padding: .3rem .75rem;
+  font-size: .85rem;
+  line-height: 1.5;
+  border-radius: .2rem;
+}
+select.input-sm {
+  height: 2.025rem;
+  line-height: 2.025rem;
+}
+textarea.input-sm,
+select[multiple].input-sm {
+  height: auto;
+}
 .form-group-sm .form-control {
  height: 2.025rem;
  padding: .3rem .75rem;
@ -1814,18 +1828,29 @@ fieldset[disabled] .checkbox label {
  line-height: 1.5;
  border-radius: .2rem;
 }
-select.input-sm,
 select.form-group-sm .form-control {
  height: 2.025rem;
  line-height: 2.025rem;
 }
-textarea.input-sm,
 textarea.form-group-sm .form-control,
-select[multiple].input-sm,
 select[multiple].form-group-sm .form-control {
  height: auto;
 }
-.input-lg,
+.input-lg {
+  height: 3.3125rem;
+  padding: .75rem 1.5rem;
+  font-size: 1.25rem;
+  line-height: 1.33;
+  border-radius: .3rem;
+}
+select.input-lg {
+  height: 3.3125rem;
+  line-height: 3.3125rem;
+}
+textarea.input-lg,
+select[multiple].input-lg {
+  height: auto;
+}
 .form-group-lg .form-control {
  height: 3.3125rem;
  padding: .75rem 1.5rem;
@ -1833,14 +1858,11 @@ select[multiple].form-group-sm .form-control {
  line-height: 1.33;
  border-radius: .3rem;
 }
-select.input-lg,
 select.form-group-lg .form-control {
  height: 3.3125rem;
  line-height: 3.3125rem;
 }
-textarea.input-lg,
 textarea.form-group-lg .form-control,
-select[multiple].input-lg,
 select[multiple].form-group-lg .form-control {
  height: auto;
 }
@ -2627,7 +2649,7 @@ tbody.collapse.in {
 .navbar-fixed-bottom .dropdown .dropdown-menu {
  top: auto;
  bottom: 100%;
-  margin-bottom: 1px;
+  margin-bottom: 2px;
 }
@media (min-width: 48em) {
  .navbar-right .dropdown-menu {
@ -2660,10 +2682,6 @@ tbody.collapse.in {
 .btn-group-vertical > .btn.active {
  z-index: 2;
 }
-.btn-group > .btn:focus,
-.btn-group-vertical > .btn:focus {
-  outline: 0;
-}
 .btn-group .btn + .btn,
 .btn-group .btn + .btn-group,
 .btn-group .btn-group + .btn,
@ -4322,6 +4340,14 @@ a.badge:focus {
 .media:first-child {
  margin-top: 0;
 }
+.media,
+.media-body {
+  overflow: hidden;
+  zoom: 1;
+}
+.media-object {
+  display: block;
+}
 .media-right,
 .media > .pull-right {
  padding-left: 10px;
@ -5035,6 +5061,7 @@ button.close {
  height: 20px;
  margin-top: -10px;
  font-family: serif;
+  line-height: 1;
 }
 .carousel-control .icon-prev {
  left: 50%;
--- a/docs/dist/css/bootstrap.css.map
+++ b/docs/dist/css/bootstrap.css.map
--- a/docs/dist/css/bootstrap.min.css
+++ b/docs/dist/css/bootstrap.min.css
--- a/docs/javascript/tabs.md
+++ b/docs/javascript/tabs.md
@ -7,8 +7,8 @@ title: Tabs

 Add quick, dynamic tab functionality to transition through panes of local content, even via dropdown menus.

-<div class="bs-example bs-example-tabs">
-  <ul id="myTab" class="nav nav-tabs" role="tabpanel">
+<div class="bs-example bs-example-tabs" role="tabpanel">
+  <ul id="myTab" class="nav nav-tabs" role="tablist">
    <li role="presentation" class="active">
      <a href="#home" id="home-tab" role="tab" data-toggle="tab" aria-controls="home" aria-expanded="true">Home</a>
    </li>
--- a/docs/layout/responsive-utilities.md
+++ b/docs/layout/responsive-utilities.md
@ -36,28 +36,28 @@ Use a single or combination of the available classes for toggling content across
    </thead>
    <tbody>
      <tr>
-        <th scope="rowspan"><code>.visible-xs-*</code></th>
+        <th scope="row"><code>.visible-xs-*</code></th>
        <td class="is-visible">Visible</td>
        <td class="is-hidden">Hidden</td>
        <td class="is-hidden">Hidden</td>
        <td class="is-hidden">Hidden</td>
      </tr>
      <tr>
-        <th scope="rowspan"><code>.visible-sm-*</code></th>
+        <th scope="row"><code>.visible-sm-*</code></th>
        <td class="is-hidden">Hidden</td>
        <td class="is-visible">Visible</td>
        <td class="is-hidden">Hidden</td>
        <td class="is-hidden">Hidden</td>
      </tr>
      <tr>
-        <th scope="rowspan"><code>.visible-md-*</code></th>
+        <th scope="row"><code>.visible-md-*</code></th>
        <td class="is-hidden">Hidden</td>
        <td class="is-hidden">Hidden</td>
        <td class="is-visible">Visible</td>
        <td class="is-hidden">Hidden</td>
      </tr>
      <tr>
-        <th scope="rowspan"><code>.visible-lg-*</code></th>
+        <th scope="row"><code>.visible-lg-*</code></th>
        <td class="is-hidden">Hidden</td>
        <td class="is-hidden">Hidden</td>
        <td class="is-hidden">Hidden</td>
@ -66,28 +66,28 @@ Use a single or combination of the available classes for toggling content across
    </tbody>
    <tbody>
      <tr>
-        <th scope="rowspan"><code>.hidden-xs</code></th>
+        <th scope="row"><code>.hidden-xs</code></th>
        <td class="is-hidden">Hidden</td>
        <td class="is-visible">Visible</td>
        <td class="is-visible">Visible</td>
        <td class="is-visible">Visible</td>
      </tr>
      <tr>
-        <th scope="rowspan"><code>.hidden-sm</code></th>
+        <th scope="row"><code>.hidden-sm</code></th>
        <td class="is-visible">Visible</td>
        <td class="is-hidden">Hidden</td>
        <td class="is-visible">Visible</td>
        <td class="is-visible">Visible</td>
      </tr>
      <tr>
-        <th scope="rowspan"><code>.hidden-md</code></th>
+        <th scope="row"><code>.hidden-md</code></th>
        <td class="is-visible">Visible</td>
        <td class="is-visible">Visible</td>
        <td class="is-hidden">Hidden</td>
        <td class="is-visible">Visible</td>
      </tr>
      <tr>
-        <th scope="rowspan"><code>.hidden-lg</code></th>
+        <th scope="row"><code>.hidden-lg</code></th>
        <td class="is-visible">Visible</td>
        <td class="is-visible">Visible</td>
        <td class="is-visible">Visible</td>
--- a/grunt/bs-raw-files-generator.js
+++ b/grunt/bs-raw-files-generator.js
@ -31,7 +31,7 @@ module.exports = function generateRawFilesJs(grunt, banner) {
  if (!banner) {
    banner = '';
  }
-  var dirs = ['js', 'less', 'fonts'];
+  var dirs = ['js', 'less'];
  var files = banner + dirs.map(getFiles).reduce(function (combined, file) {
    return combined + file;
  }, '');