rename -horizontal and -vertical vars to -x and -y for consistency

diff --git a/scss/_button-group.scss b/scss/_button-group.scss
index 96c3cc565208192ddb877c295f322de2b3c4312e..3be4fbc6efa711cefa17821efff3b9d6ae5c48fd 100644 (file)
--- a/scss/_button-group.scss
+++ b/scss/_button-group.scss
@@ -136,12 +136,12 @@
 }
 // Carets in other button sizes
 .btn-lg .caret {
-  border-width: $caret-width-large $caret-width-large 0;
+  border-width: $caret-width-lg $caret-width-lg 0;
   border-bottom-width: 0;
 }
 // Upside down carets for .dropup
 .dropup .btn-lg .caret {
-  border-width: 0 $caret-width-large $caret-width-large;
+  border-width: 0 $caret-width-lg $caret-width-lg;
 }
 
 

diff --git a/scss/_buttons.scss b/scss/_buttons.scss
index 23a5b8a77a5d30bd58b5208bc9a60d0910594230..57f23369aca0a2eeceddb458f52a8414e5da8204 100644 (file)
--- a/scss/_buttons.scss
+++ b/scss/_buttons.scss
@@ -17,7 +17,7 @@
   cursor: pointer;
   user-select: none;
   border: $border-width solid transparent;
-  @include button-size($padding-base-vertical, $padding-base-horizontal, $font-size-base, $line-height-base, $btn-border-radius-base);
+  @include button-size($padding-base-y, $padding-base-x, $font-size-base, $line-height-base, $btn-border-radius-base);
   transition: all .2s ease-in-out;
 
   &,
@@ -130,14 +130,14 @@ fieldset[disabled] a.btn {
 
 .btn-lg {
   // line-height: ensure even-numbered height of button next to large input
-  @include button-size($padding-lg-vertical, $padding-lg-horizontal, $font-size-lg, $line-height-lg, $btn-border-radius-lg);
+  @include button-size($padding-lg-y, $padding-lg-x, $font-size-lg, $line-height-lg, $btn-border-radius-lg);
 }
 .btn-sm {
   // line-height: ensure proper height of button next to small input
-  @include button-size($padding-sm-vertical, $padding-sm-horizontal, $font-size-sm, $line-height-sm, $btn-border-radius-sm);
+  @include button-size($padding-sm-y, $padding-sm-x, $font-size-sm, $line-height-sm, $btn-border-radius-sm);
 }
 .btn-xs {
-  @include button-size($padding-xs-vertical, $padding-xs-horizontal, $font-size-xs, $line-height-sm, $btn-border-radius-sm);
+  @include button-size($padding-xs-y, $padding-xs-x, $font-size-xs, $line-height-sm, $btn-border-radius-sm);
 }
 
 

diff --git a/scss/_forms.scss b/scss/_forms.scss
index 1426fe793841d39d0cdcd244d878ce2d90174cbf..d7da46a7a6125171c6c51070015ea50fa0fe273f 100644 (file)
--- a/scss/_forms.scss
+++ b/scss/_forms.scss
@@ -12,7 +12,7 @@
   width: 100%;
   // // Make inputs at least the height of their button counterpart (base line-height + padding + border)
   // height: $input-height-base;
-  padding: $padding-base-vertical $padding-base-horizontal;
+  padding: $padding-base-y $padding-base-x;
   font-size: $font-size-base;
   line-height: $line-height-base;
   color: $input-color;
@@ -83,7 +83,7 @@
 // For use with horizontal and inline forms, when you need the label text to
 // align with the form controls.
 .form-control-label {
-  padding: ($padding-base-vertical + $border-width) $padding-base-horizontal;
+  padding: ($padding-base-y + $border-width) $padding-base-x;
   margin-bottom: 0; // Override the `<label>` default
 }
 
@@ -127,8 +127,8 @@
 .form-control-static {
   min-height: $input-height-base;
   // Size it appropriately next to real form controls
-  padding-top: ($padding-base-vertical + $border-width);
-  padding-bottom: ($padding-base-vertical + $border-width);
+  padding-top: ($padding-base-y + $border-width);
+  padding-bottom: ($padding-base-y + $border-width);
   // Remove default margin from `p`
   margin-bottom: 0;
 
@@ -150,7 +150,7 @@
 
 .form-control-sm {
   height: $input-height-sm;
-  padding: $padding-sm-vertical $padding-sm-horizontal;
+  padding: $padding-sm-y $padding-sm-x;
   font-size: $font-size-sm;
   line-height: $line-height-sm;
   border-radius: $input-border-radius-sm;
@@ -158,7 +158,7 @@
 
 .form-control-lg {
   height: $input-height-lg;
-  padding: $padding-lg-vertical $padding-lg-horizontal;
+  padding: $padding-lg-y $padding-lg-x;
   font-size: $font-size-lg;
   line-height: $line-height-lg;
   border-radius: $input-border-radius-lg;

diff --git a/scss/_input-group.scss b/scss/_input-group.scss
index 8d1a238c7392a9b04ef76100cce5898386b4f0e0..fc1e4ff5bf5d078fd55e6be8a320ee4c4805717a 100644 (file)
--- a/scss/_input-group.scss
+++ b/scss/_input-group.scss
@@ -85,7 +85,7 @@
 //
 
 .input-group-addon {
-  padding: $padding-base-vertical $padding-base-horizontal;
+  padding: $padding-base-y $padding-base-x;
   font-size: $font-size-base;
   font-weight: normal;
   line-height: 1;
@@ -97,12 +97,12 @@
 
   // Sizing
   &.form-control-sm {
-    padding: $padding-sm-vertical $padding-sm-horizontal;
+    padding: $padding-sm-y $padding-sm-x;
     font-size: $font-size-sm;
     @include border-radius($border-radius-sm);
   }
   &.form-control-lg {
-    padding: $padding-lg-vertical $padding-lg-horizontal;
+    padding: $padding-lg-y $padding-lg-x;
     font-size: $font-size-lg;
     @include border-radius($border-radius-lg);
   }

diff --git a/scss/_pagination.scss b/scss/_pagination.scss
index d52bda41b5723aa9a2d40b16e553c1ea598551c5..5ef31de26fef352c371f1023f2a8a043546cf4ec 100644 (file)
--- a/scss/_pagination.scss
+++ b/scss/_pagination.scss
@@ -17,7 +17,7 @@
     > span {
       position: relative;
       float: left; // Collapse white-space
-      padding: $padding-base-vertical $padding-base-horizontal;
+      padding: $padding-base-y $padding-base-x;
       margin-left: -1px;
       line-height: $line-height-base;
       color: $pagination-color;
@@ -79,9 +79,9 @@
 //
 
 .pagination-lg {
-  @include pagination-size($padding-lg-vertical, $padding-lg-horizontal, $font-size-lg, $line-height-lg, $border-radius-lg);
+  @include pagination-size($padding-lg-y, $padding-lg-x, $font-size-lg, $line-height-lg, $border-radius-lg);
 }
 
 .pagination-sm {
-  @include pagination-size($padding-sm-vertical, $padding-sm-horizontal, $font-size-sm, $line-height-sm, $border-radius-sm);
+  @include pagination-size($padding-sm-y, $padding-sm-x, $font-size-sm, $line-height-sm, $border-radius-sm);
 }

diff --git a/scss/_variables.scss b/scss/_variables.scss
index 7615d2f0c31d160a55987456275175103ba499e4..ac4b3090606cf2400c83214febb86af53eb3b2f2 100644 (file)
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -96,17 +96,17 @@ $headings-color:             inherit !default;
 //
 // Define common padding and border radius sizes and more. Values based on 14px text and 1.428 line-height (~20px to start).
 
-$padding-base-vertical:     .5rem !default;
-$padding-base-horizontal:   .75rem !default;
+$padding-base-y:     .5rem !default;
+$padding-base-x:   .75rem !default;
 
-$padding-lg-vertical:    .75rem !default;
-$padding-lg-horizontal:  1.5rem !default;
+$padding-lg-y:    .75rem !default;
+$padding-lg-x:  1.5rem !default;
 
-$padding-sm-vertical:    .275rem !default;
-$padding-sm-horizontal:  .75rem !default;
+$padding-sm-y:    .275rem !default;
+$padding-sm-x:  .75rem !default;
 
-$padding-xs-vertical:       .2rem !default;
-$padding-xs-horizontal:     .5rem !default;
+$padding-xs-y:       .2rem !default;
+$padding-xs-x:     .5rem !default;
 
 $line-height-lg:         (4/3) !default;
 $line-height-sm:         1.5 !default;
@@ -119,7 +119,7 @@ $component-active-color:    #fff !default;
 $component-active-bg:       $brand-primary !default;
 
 $caret-width-base:          .3em !default;
-$caret-width-large:         $caret-width-base !default;
+$caret-width-lg:         $caret-width-base !default;
 
 
 // Tables
@@ -193,9 +193,9 @@ $input-box-shadow-focus:         rgba(102,175,233,.6) !default;
 
 $input-color-placeholder:        #999 !default;
 
-$input-height-base:              (($font-size-base * $line-height-base) + ($padding-base-vertical * 2) + ($border-width * 2)) !default;
-$input-height-lg:                (($font-size-lg * $line-height-lg) + ($padding-lg-vertical * 2) + ($border-width * 2)) !default;
-$input-height-sm:                (($font-size-sm * $line-height-sm) + ($padding-sm-vertical * 2) + ($border-width * 2)) !default;
+$input-height-base:              (($font-size-base * $line-height-base) + ($padding-base-y * 2) + ($border-width * 2)) !default;
+$input-height-lg:                (($font-size-lg * $line-height-lg) + ($padding-lg-y * 2) + ($border-width * 2)) !default;
+$input-height-sm:                (($font-size-sm * $line-height-sm) + ($padding-sm-y * 2) + ($border-width * 2)) !default;
 
 $form-group-margin-bottom:       15px;