Greater standardization of sizing terminology

In class names: * large => lg * small => sm * mini => xs ("Extra small") In screen size categories: * Tiny => Extra small
2013-08-03 21:39:57 -07:00 · 2013-08-03 21:39:57 -07:00 · 23ef8c0c20
parent 30a01e0a33
commit 23ef8c0c20
16 changed files with 121 additions and 121 deletions
--- a/components.html
+++ b/components.html
@ -385,7 +385,7 @@ base_url: "../"
    <div class="bs-example">
      <div class="btn-toolbar" style="margin: 0;">
        <div class="btn-group">
-          <button class="btn btn-default btn-large dropdown-toggle" type="button" data-toggle="dropdown">
+          <button class="btn btn-default btn-lg dropdown-toggle" type="button" data-toggle="dropdown">
            Large button <span class="caret"></span>
          </button>
          <ul class="dropdown-menu">
@ -397,7 +397,7 @@ base_url: "../"
          </ul>
        </div><!-- /btn-group -->
        <div class="btn-group">
-          <button class="btn btn-default btn-small dropdown-toggle" type="button" data-toggle="dropdown">
+          <button class="btn btn-default btn-sm dropdown-toggle" type="button" data-toggle="dropdown">
            Small button <span class="caret"></span>
          </button>
          <ul class="dropdown-menu">
@ -413,7 +413,7 @@ base_url: "../"
 {% highlight html %}
 <!-- Large button group -->
 <div class="btn-group">
-  <button class="btn btn-default btn-large dropdown-toggle" type="button" data-toggle="dropdown">
+  <button class="btn btn-default btn-lg dropdown-toggle" type="button" data-toggle="dropdown">
    Large button <span class="caret"></span>
  </button>
  <ul class="dropdown-menu">
@ -423,7 +423,7 @@ base_url: "../"

 <!-- Small button group -->
 <div class="btn-group">
-  <button class="btn btn-default btn-small dropdown-toggle" type="button" data-toggle="dropdown">
+  <button class="btn btn-default btn-sm dropdown-toggle" type="button" data-toggle="dropdown">
    Small button <span class="caret"></span>
  </button>
  <ul class="dropdown-menu">
@ -535,8 +535,8 @@ base_url: "../"
    <p>Add the relative form sizing classes to the <code>.input-group-addon</code>.</p>
    <form class="bs-example bs-example-form">
      <div class="input-group">
-        <span class="input-group-addon input-large">@</span>
-        <input type="text" class="form-control input-large" placeholder="Username">
+        <span class="input-group-addon input-lg">@</span>
+        <input type="text" class="form-control input-lg" placeholder="Username">
      </div>
      <br>
      <div class="input-group">
@ -545,14 +545,14 @@ base_url: "../"
      </div>
      <br>
      <div class="input-group">
-        <span class="input-group-addon input-small">@</span>
-        <input type="text" class="form-control input-small" placeholder="Username">
+        <span class="input-group-addon input-sm">@</span>
+        <input type="text" class="form-control input-sm" placeholder="Username">
      </div>
    </form>
 {% highlight html %}
 <div class="input-group">
-  <span class="input-group-addon input-large">@</span>
-  <input type="text" class="form-control input-large" placeholder="Username">
+  <span class="input-group-addon input-lg">@</span>
+  <input type="text" class="form-control input-lg" placeholder="Username">
 </div>

 <div class="input-group">
@ -561,8 +561,8 @@ base_url: "../"
 </div>

 <div class="input-group">
-  <span class="input-group-addon input-small">@</span>
-  <input type="text" class="form-control input-small" placeholder="Username">
+  <span class="input-group-addon input-sm">@</span>
+  <input type="text" class="form-control input-sm" placeholder="Username">
 </div>
 {% endhighlight %}

@ -1446,10 +1446,10 @@ body { padding-bottom: 70px; }


    <h3>Sizes</h3>
-    <p>Fancy larger or smaller pagination? Add <code>.pagination-large</code> or <code>.pagination-small</code>  for additional sizes.</p>
+    <p>Fancy larger or smaller pagination? Add <code>.pagination-lg</code> or <code>.pagination-sm</code>  for additional sizes.</p>
    <div class="bs-example">
      <div>
-        <ul class="pagination pagination-large">
+        <ul class="pagination pagination-lg">
          <li><a href="#">&laquo;</a></li>
          <li><a href="#">1</a></li>
          <li><a href="#">2</a></li>
@ -1471,7 +1471,7 @@ body { padding-bottom: 70px; }
        </ul>
      </div>
      <div>
-        <ul class="pagination pagination-small">
+        <ul class="pagination pagination-sm">
          <li><a href="#">&laquo;</a></li>
          <li><a href="#">1</a></li>
          <li><a href="#">2</a></li>
@ -1483,9 +1483,9 @@ body { padding-bottom: 70px; }
      </div>
    </div>
 {% highlight html %}
-<ul class="pagination pagination-large">...</ul>
+<ul class="pagination pagination-lg">...</ul>
 <ul class="pagination pagination">...</ul>
-<ul class="pagination pagination-small">...</ul>
+<ul class="pagination pagination-sm">...</ul>
 {% endhighlight %}


@ -1659,14 +1659,14 @@ body { padding-bottom: 70px; }
      <div class="jumbotron">
        <h1>Hello, world!</h1>
        <p>This is a simple hero unit, a simple jumbotron-style component for calling extra attention to featured content or information.</p>
-        <p><a class="btn btn-primary btn-large">Learn more</a></p>
+        <p><a class="btn btn-primary btn-lg">Learn more</a></p>
      </div>
    </div>
 {% highlight html %}
 <div class="jumbotron">
  <h1>Hello, world!</h1>
  <p>...</p>
-  <p><a class="btn btn-primary btn-large">Learn more</a></p>
+  <p><a class="btn btn-primary btn-lg">Learn more</a></p>
 </div>
 {% endhighlight %}

@ -2402,20 +2402,20 @@ body { padding-bottom: 70px; }
    <h3>Optional classes</h3>
    <p>Control padding and rounded corners with two optional modifier classes.</p>
    <div class="bs-example">
-      <div class="well well-large">
+      <div class="well well-lg">
        Look, I'm in a well!
      </div>
    </div>
 {% highlight html %}
-<div class="well well-large">...</div>
+<div class="well well-lg">...</div>
 {% endhighlight %}

    <div class="bs-example">
-      <div class="well well-small">
+      <div class="well well-sm">
        Look, I'm in a well!
      </div>
    </div>
 {% highlight html %}
-<div class="well well-small">...</div>
+<div class="well well-sm">...</div>
 {% endhighlight %}
  </div>
--- a/css.html
+++ b/css.html
@ -69,7 +69,7 @@ base_url: "../"
    </div>
    <p class="lead">With the launch of Bootstrap 3, icons have been moved to a <a href="https://github.com/twbs/bootstrap-glyphicons">separate repository</a>. This keeps the primary project as lean as possible, makes it easier for folks to swap icon libraries, and makes Glyphicons icon fonts more readily available to more people outside Bootstrap.</p>
    <p class="lead">
-      <a href="http://glyphicons.getbootstrap.com/" class="btn btn-default btn-large">Visit Glyphicons for Bootstrap</a> or <a href="https://github.com/twbs/bootstrap-glyphicons">download from GitHub</a>
+      <a href="http://glyphicons.getbootstrap.com/" class="btn btn-default btn-lg">Visit Glyphicons for Bootstrap</a> or <a href="https://github.com/twbs/bootstrap-glyphicons">download from GitHub</a>
    </p>
  </div>

@ -91,7 +91,7 @@ base_url: "../"
          <tr>
            <th></th>
            <th>
-              Tiny devices
+              Extra small devices
              <small>Phones (&lt;768px)</small>
            </th>
            <th>
@ -1585,35 +1585,35 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.


    <h2 id="forms-control-sizes">Control sizing</h2>
-    <p>Set heights using classes like <code>.input-large</code>, and set widths using grid column classes like <code>.col-lg-*</code>.</p>
+    <p>Set heights using classes like <code>.input-lg</code>, and set widths using grid column classes like <code>.col-lg-*</code>.</p>

    <h3>Height sizing</h3>
    <p>Create larger or smaller form controls that match button sizes.</p>
    <form class="bs-example bs-example-control-sizing">
      <div class="controls docs-input-sizes">
-        <input class="form-control input-large" type="text" placeholder=".input-large">
+        <input class="form-control input-lg" type="text" placeholder=".input-lg">
        <input type="text" class="form-control" placeholder="Default input">
-        <input class="form-control input-small" type="text" placeholder=".input-small">
+        <input class="form-control input-sm" type="text" placeholder=".input-sm">

-        <select class="form-control input-large">
-          <option value="">.input-large</option>
+        <select class="form-control input-lg">
+          <option value="">.input-lg</option>
        </select>
        <select class="form-control">
          <option value="">Default select</option>
        </select>
-        <select class="form-control input-small">
-          <option value="">.input-small</option>
+        <select class="form-control input-sm">
+          <option value="">.input-sm</option>
        </select>
      </div>
    </form>
 {% highlight html %}
-<input class="form-control input-large" type="text" placeholder=".input-large">
+<input class="form-control input-lg" type="text" placeholder=".input-lg">
 <input class="form-control" type="text" placeholder="Default input">
-<input class="form-control input-small" type="text" placeholder=".input-small">
+<input class="form-control input-sm" type="text" placeholder=".input-sm">

-<select class="form-control input-large">...</select>
+<select class="form-control input-lg">...</select>
 <select class="form-control">...</select>
-<select class="form-control input-small">...</select>
+<select class="form-control input-sm">...</select>
 {% endhighlight %}

    <h3>Column sizing</h3>
@ -1701,54 +1701,54 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
 {% endhighlight %}

    <h2 id="buttons-sizes">Button sizes</h2>
-    <p>Fancy larger or smaller buttons? Add <code>.btn-large</code> or <code>.btn-small</code> for additional sizes.</p>
+    <p>Fancy larger or smaller buttons? Add <code>.btn-lg</code> or <code>.btn-sm</code> for additional sizes.</p>
    <div class="bs-example">
      <p>
-        <button type="button" class="btn btn-primary btn-large">Large button</button>
-        <button type="button" class="btn btn-default btn-large">Large button</button>
+        <button type="button" class="btn btn-primary btn-lg">Large button</button>
+        <button type="button" class="btn btn-default btn-lg">Large button</button>
      </p>
      <p>
        <button type="button" class="btn btn-primary">Default button</button>
        <button type="button" class="btn btn-default">Default button</button>
      </p>
      <p>
-        <button type="button" class="btn btn-primary btn-small">Small button</button>
-        <button type="button" class="btn btn-default btn-small">Small button</button>
+        <button type="button" class="btn btn-primary btn-sm">Small button</button>
+        <button type="button" class="btn btn-default btn-sm">Small button</button>
      </p>
      <p>
-        <button type="button" class="btn btn-primary btn-mini">Mini button</button>
-        <button type="button" class="btn btn-default btn-mini">Mini button</button>
+        <button type="button" class="btn btn-primary btn-xs">Extra small button</button>
+        <button type="button" class="btn btn-default btn-xs">Extra small button</button>
      </p>
    </div>
 {% highlight html %}
 <p>
-  <button type="button" class="btn btn-primary btn-large">Large button</button>
-  <button type="button" class="btn btn-default btn-large">Large button</button>
+  <button type="button" class="btn btn-primary btn-lg">Large button</button>
+  <button type="button" class="btn btn-default btn-lg">Large button</button>
 </p>
 <p>
  <button type="button" class="btn btn-primary">Default button</button>
  <button type="button" class="btn btn-default">Default button</button>
 </p>
 <p>
-  <button type="button" class="btn btn-primary btn-small">Small button</button>
-  <button type="button" class="btn btn-default btn-small">Small button</button>
+  <button type="button" class="btn btn-primary btn-sm">Small button</button>
+  <button type="button" class="btn btn-default btn-sm">Small button</button>
 </p>
 <p>
-  <button type="button" class="btn btn-primary btn-mini">Mini button</button>
-  <button type="button" class="btn btn-default btn-mini">Mini button</button>
+  <button type="button" class="btn btn-primary btn-xs">Extra small button</button>
+  <button type="button" class="btn btn-default btn-xs">Extra small button</button>
 </p>
 {% endhighlight %}

    <p>Create block level buttons&mdash;those that span the full width of a parent&mdash; by adding <code>.btn-block</code>.</p>
    <div class="bs-example">
      <div class="well" style="max-width: 400px; margin: 0 auto 10px;">
-        <button type="button" class="btn btn-primary btn-large btn-block">Block level button</button>
-        <button type="button" class="btn btn-default btn-large btn-block">Block level button</button>
+        <button type="button" class="btn btn-primary btn-lg btn-block">Block level button</button>
+        <button type="button" class="btn btn-default btn-lg btn-block">Block level button</button>
      </div>
    </div>
 {% highlight html %}
-<button type="button" class="btn btn-primary btn-large btn-block">Block level button</button>
-<button type="button" class="btn btn-default btn-large btn-block">Block level button</button>
+<button type="button" class="btn btn-primary btn-lg btn-block">Block level button</button>
+<button type="button" class="btn btn-default btn-lg btn-block">Block level button</button>
 {% endhighlight %}


@ -1758,12 +1758,12 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
    <h3>Button element</h3>
    <p>Add the <code>disabled</code> attribute to <code>&lt;button&gt;</code> buttons.</p>
    <p class="bs-example">
-      <button type="button" class="btn btn-primary btn-large" disabled="disabled">Primary button</button>
-      <button type="button" class="btn btn-default btn-large" disabled="disabled">Button</button>
+      <button type="button" class="btn btn-primary btn-lg" disabled="disabled">Primary button</button>
+      <button type="button" class="btn btn-default btn-lg" disabled="disabled">Button</button>
    </p>
 {% highlight html %}
-<button type="button" class="btn btn-large btn-primary" disabled="disabled">Primary button</button>
-<button type="button" class="btn btn-default btn-large" disabled="disabled">Button</button>
+<button type="button" class="btn btn-lg btn-primary" disabled="disabled">Primary button</button>
+<button type="button" class="btn btn-default btn-lg" disabled="disabled">Button</button>
 {% endhighlight %}

    <div class="bs-callout bs-callout-danger">
@ -1774,12 +1774,12 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
    <h3>Anchor element</h3>
    <p>Add the <code>.disabled</code> class to <code>&lt;a&gt;</code> buttons.</p>
    <p class="bs-example">
-      <a href="#" class="btn btn-primary btn-large disabled">Primary link</a>
-      <a href="#" class="btn btn-default btn-large disabled">Link</a>
+      <a href="#" class="btn btn-primary btn-lg disabled">Primary link</a>
+      <a href="#" class="btn btn-default btn-lg disabled">Link</a>
    </p>
 {% highlight html %}
-<a href="#" class="btn btn-primary btn-large disabled">Primary link</a>
-<a href="#" class="btn btn-default btn-large disabled">Link</a>
+<a href="#" class="btn btn-primary btn-lg disabled">Primary link</a>
+<a href="#" class="btn btn-default btn-lg disabled">Link</a>
 {% endhighlight %}
    <p>
      We use <code>.disabled</code> as a utility class here, similar to the common <code>.active</code> class, so no prefix is required.
--- a/customize.html
+++ b/customize.html
@ -486,7 +486,7 @@ base_url: "../"
    <p>Define the breakpoints at which your layout will change, adapting to different screen sizes.</p>
    <div class="row">
      <div class="col-lg-6">
-        <label>@screen-tiny</label>
+        <label>@screen-xsmall</label>
        <input type="text" class="form-control" placeholder="480px">
        <label>@screen-small</label>
        <input type="text" class="form-control" placeholder="768px">
@ -1439,7 +1439,7 @@ base_url: "../"
    </div>
    <p class="lead">Hooray! Your custom version of Bootstrap is now ready to be compiled. Just click the button below to finish the process.</p>
    <div class="bs-customize-download">
-      <a class="btn btn-block btn-large btn-bs" href="#" onclick="_gaq.push(['_trackEvent', 'Customize', 'Download', 'Customize and Download']);">Customize and Download</a>
+      <a class="btn btn-block btn-lg btn-bs" href="#" onclick="_gaq.push(['_trackEvent', 'Customize', 'Download', 'Customize and Download']);">Customize and Download</a>
    </div>
    <div class="bs-callout bs-callout-danger">
      <h4>What's included?</h4>
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@ -1537,7 +1537,7 @@ textarea.form-control {
  margin-left: 10px;
 }

-.input-large {
+.input-lg {
  height: 45px;
  padding: 10px 16px;
  font-size: 18px;
@ -1545,7 +1545,7 @@ textarea.form-control {
  border-radius: 6px;
 }

-.input-small {
+.input-sm {
  height: 30px;
  padding: 5px 10px;
  font-size: 12px;
@ -1553,18 +1553,18 @@ textarea.form-control {
  border-radius: 3px;
 }

-select.input-large {
+select.input-lg {
  height: 45px;
  line-height: 45px;
 }

-select.input-small {
+select.input-sm {
  height: 30px;
  line-height: 30px;
 }

-textarea.input-large,
-textarea.input-small {
+textarea.input-lg,
+textarea.input-sm {
  height: auto;
 }

@ -1989,22 +1989,22 @@ fieldset[disabled] .btn-link:focus {
  text-decoration: none;
 }

-.btn-large {
+.btn-lg {
  padding: 10px 16px;
  font-size: 18px;
  line-height: 1.33;
  border-radius: 6px;
 }

-.btn-small,
-.btn-mini {
+.btn-sm,
+.btn-xs {
  padding: 5px 10px;
  font-size: 12px;
  line-height: 1.5;
  border-radius: 3px;
 }

-.btn-mini {
+.btn-xs {
  padding: 3px 5px;
 }

@ -2101,14 +2101,14 @@ input[type="button"].btn-block {
          box-sizing: border-box;
 }

-.input-group-addon.input-small {
+.input-group-addon.input-sm {
  padding: 5px 10px;
  font-size: 12px;
  line-height: 1.5;
  border-radius: 3px;
 }

-.input-group-addon.input-large {
+.input-group-addon.input-lg {
  padding: 10px 16px;
  font-size: 18px;
  line-height: 1.33;
@ -2496,12 +2496,12 @@ a.list-group-item.active .list-group-item-text {
  border-color: rgba(0, 0, 0, 0.15);
 }

-.well-large {
+.well-lg {
  padding: 24px;
  border-radius: 6px;
 }

-.well-small {
+.well-sm {
  padding: 9px;
  border-radius: 3px;
 }
@ -3220,7 +3220,7 @@ button.close {
  padding-left: 8px;
 }

-.btn-group > .btn-large + .dropdown-toggle {
+.btn-group > .btn-lg + .dropdown-toggle {
  padding-right: 12px;
  padding-left: 12px;
 }
@ -3234,11 +3234,11 @@ button.close {
  margin-left: 0;
 }

-.btn-large .caret {
+.btn-lg .caret {
  border-width: 5px;
 }

-.dropup .btn-large .caret {
+.dropup .btn-lg .caret {
  border-bottom-width: 5px;
 }

@ -3363,38 +3363,38 @@ button.close {
  background-color: #ffffff;
 }

-.pagination-large > li > a,
-.pagination-large > li > span {
+.pagination-lg > li > a,
+.pagination-lg > li > span {
  padding: 10px 16px;
  font-size: 18px;
 }

-.pagination-large > li:first-child > a,
-.pagination-large > li:first-child > span {
+.pagination-lg > li:first-child > a,
+.pagination-lg > li:first-child > span {
  border-bottom-left-radius: 6px;
  border-top-left-radius: 6px;
 }

-.pagination-large > li:last-child > a,
-.pagination-large > li:last-child > span {
+.pagination-lg > li:last-child > a,
+.pagination-lg > li:last-child > span {
  border-top-right-radius: 6px;
  border-bottom-right-radius: 6px;
 }

-.pagination-small > li > a,
-.pagination-small > li > span {
+.pagination-sm > li > a,
+.pagination-sm > li > span {
  padding: 5px 10px;
  font-size: 12px;
 }

-.pagination-small > li:first-child > a,
-.pagination-small > li:first-child > span {
+.pagination-sm > li:first-child > a,
+.pagination-sm > li:first-child > span {
  border-bottom-left-radius: 3px;
  border-top-left-radius: 3px;
 }

-.pagination-small > li:last-child > a,
-.pagination-small > li:last-child > span {
+.pagination-sm > li:last-child > a,
+.pagination-sm > li:last-child > span {
  border-top-right-radius: 3px;
  border-bottom-right-radius: 3px;
 }
--- a/dist/css/bootstrap.min.css
+++ b/dist/css/bootstrap.min.css
--- a/getting-started.html
+++ b/getting-started.html
@ -17,7 +17,7 @@ base_url: "../"

    <h3>Download compiled CSS and JS</h3>
    <p class="lead">The fastest way to get started is to get the compiled and minified versions of our CSS and JavaScript. No documentation or original source files are included.</p>
-    <p><a class="btn btn-large btn-primary" href="{{ site.download_dist }}" onclick="_gaq.push(['_trackEvent', 'Getting started', 'Download', 'Download compiled']);">Download Bootstrap</a></p>
+    <p><a class="btn btn-lg btn-primary" href="{{ site.download_dist }}" onclick="_gaq.push(['_trackEvent', 'Getting started', 'Download', 'Download compiled']);">Download Bootstrap</a></p>

    <hr>

--- a/index.html
+++ b/index.html
@ -9,7 +9,7 @@ base_url: "./"
    <h1>Bootstrap 3</h1>
    <p class="lead">Sleek, intuitive, and powerful mobile-first front-end framework for faster and easier web development.</p>
    <p>
-      <a href="{{ site.download_dist }}" class="btn btn-outline btn-large" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Download', 'Download 3.0.0 RC1']);">Download Bootstrap</a>
+      <a href="{{ site.download_dist }}" class="btn btn-outline btn-lg" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Download', 'Download 3.0.0 RC1']);">Download Bootstrap</a>
    </p>
  </div>
 </div>
--- a/javascript.html
+++ b/javascript.html
@ -189,11 +189,11 @@ $('#myModal').on('show.bs.modal', function (e) {
    </div><!-- /.modal -->

    <div class="bs-example" style="padding-bottom: 24px;">
-      <a data-toggle="modal" href="#myModal" class="btn btn-primary btn-large">Launch demo modal</a>
+      <a data-toggle="modal" href="#myModal" class="btn btn-primary btn-lg">Launch demo modal</a>
    </div><!-- /example -->
 {% highlight html %}
  <!-- Button trigger modal -->
-  <a data-toggle="modal" href="#myModal" class="btn btn-primary btn-large">Launch demo modal</a>
+  <a data-toggle="modal" href="#myModal" class="btn btn-primary btn-lg">Launch demo modal</a>

  <!-- Modal -->
  <div class="modal fade" id="myModal">
@ -957,7 +957,7 @@ $('#myTooltip').on('hidden.bs.tooltip', function () {

    <h3>Live demo</h3>
    <div class="bs-example" style="padding-bottom: 24px;">
-      <a href="#" class="btn btn-large btn-danger" data-toggle="popover" title="A Title" data-content="And here's some amazing content. It's very engaging. right?">Click to toggle popover</a>
+      <a href="#" class="btn btn-lg btn-danger" data-toggle="popover" title="A Title" data-content="And here's some amazing content. It's very engaging. right?">Click to toggle popover</a>
    </div>

    <h4>Four directions</h4>
--- a/less/button-groups.less
+++ b/less/button-groups.less
@ -100,7 +100,7 @@
  padding-left: 8px;
  padding-right: 8px;
 }
-.btn-group > .btn-large + .dropdown-toggle {
+.btn-group > .btn-lg + .dropdown-toggle {
  padding-left: 12px;
  padding-right: 12px;
 }
@ -117,11 +117,11 @@
  margin-left: 0;
 }
 // Carets in other button sizes
-.btn-large .caret {
+.btn-lg .caret {
  border-width: 5px;
 }
 // Upside down carets for .dropup
-.dropup .btn-large .caret {
+.dropup .btn-lg .caret {
  border-bottom-width: 5px;
 }

--- a/less/buttons.less
+++ b/less/buttons.less
@ -120,20 +120,20 @@
 // Button Sizes
 // --------------------------------------------------

-.btn-large {
+.btn-lg {
  padding: @padding-large-vertical @padding-large-horizontal;
  font-size: @font-size-large;
  line-height: @line-height-large; // ensure even-numbered height of button next to large input
  border-radius: @border-radius-large;
 }
-.btn-small,
-.btn-mini {
+.btn-sm,
+.btn-xs {
  padding: @padding-small-vertical @padding-small-horizontal;
  font-size: @font-size-small;
  line-height: @line-height-small; // ensure proper height of button next to small input
  border-radius: @border-radius-small;
 }
-.btn-mini {
+.btn-xs {
  padding: 3px 5px;
 }

--- a/less/forms.less
+++ b/less/forms.less
@ -218,14 +218,14 @@ input[type="number"] {
 // horizontal sizing, wrap controls in the predefined grid classes. `<select>`
 // element gets special love because it's special, and that's a fact!

-.input-large {
+.input-lg {
  height: @input-height-large;
  padding: @padding-large-vertical @padding-large-horizontal;
  font-size: @font-size-large;
  line-height: @line-height-large;
  border-radius: @border-radius-large;
 }
-.input-small {
+.input-sm {
  height: @input-height-small;
  padding: @padding-small-vertical @padding-small-horizontal;
  font-size: @font-size-small;
@ -234,18 +234,18 @@ input[type="number"] {
 }

 select {
-  &.input-large {
+  &.input-lg {
    height: @input-height-large;
    line-height: @input-height-large;
  }
-  &.input-small {
+  &.input-sm {
    height: @input-height-small;
    line-height: @input-height-small;
  }
 }
 textarea {
-  &.input-large,
-  &.input-small {
+  &.input-lg,
+  &.input-sm {
    height: auto;
  }
 }
--- a/less/grid.less
+++ b/less/grid.less
@ -63,7 +63,7 @@
 // Container and grid column sizing
 //

-// Tiny device columns (smartphones)
+// Extra small device columns (smartphones)
 .col-1,
 .col-2,
 .col-3,
--- a/less/input-groups.less
+++ b/less/input-groups.less
@ -55,13 +55,13 @@
  border-radius: @border-radius-base;

  // Sizing
-  &.input-small {
+  &.input-sm {
    padding: @padding-small-vertical @padding-small-horizontal;
    font-size: @font-size-small;
    border-radius: @border-radius-small;
    line-height: @line-height-small;
  }
-  &.input-large {
+  &.input-lg {
    padding: @padding-large-vertical @padding-large-horizontal;
    font-size: @font-size-large;
    border-radius: @border-radius-large;
--- a/less/pagination.less
+++ b/less/pagination.less
@ -62,7 +62,7 @@
 // --------------------------------------------------

 // Large
-.pagination-large {
+.pagination-lg {
  > li {
    > a,
    > span {
@ -85,7 +85,7 @@
 }

 // Small
-.pagination-small {
+.pagination-sm {
  > li {
    > a,
    > span {
--- a/less/variables.less
+++ b/less/variables.less
@ -180,9 +180,9 @@
 // Media queries breakpoints
 // --------------------------------------------------

-// Tiny screen / phone
-@screen-tiny:                480px;
-@screen-phone:               @screen-tiny;
+// Extra small screen / phone
+@screen-xsmall:              480px;
+@screen-phone:               @screen-xsmall;

 // Small screen / tablet
@screen-small:               768px;
--- a/less/wells.less
+++ b/less/wells.less
@ -19,11 +19,11 @@
 }

 // Sizes
-.well-large {
+.well-lg {
  padding: 24px;
  border-radius: @border-radius-large;
 }
-.well-small {
+.well-sm {
  padding: 9px;
  border-radius: @border-radius-small;
 }