Merge pull request #9056 from twbs/large-to-lg-etc

Greater standardization of sizing terminology

8 files changed, 23 insertions, 23 deletions

diff --git a/less/button-groups.less b/less/button-groups.less
index 4ee5616f3..d8eae0a50 100644
--- 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;
 }
 
diff --git a/less/buttons.less b/less/buttons.less
index e53b0132f..8fad99cc8 100644
--- 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;
 }
 
diff --git a/less/forms.less b/less/forms.less
index 41d50a5e0..127f6a67a 100644
--- 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;
   }
 }
diff --git a/less/grid.less b/less/grid.less
index dfaf4f970..395a7947f 100644
--- 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,
diff --git a/less/input-groups.less b/less/input-groups.less
index 77be68d92..79d1afcd4 100644
--- 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;
diff --git a/less/pagination.less b/less/pagination.less
index 3441106c9..65679beff 100644
--- 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 {
diff --git a/less/variables.less b/less/variables.less
index a869ce960..a500097c9 100644
--- 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;
diff --git a/less/wells.less b/less/wells.less
index 6a909f44b..865abc2eb 100644
--- 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;
 }