From: Chris Rebert <code@chrisrebert.com>
Date: Wed, 13 Jan 2016 23:28:23 +0000 (-0800)
Subject: Rename local vars per new naming convention: $padding-{vertical=>y} $padding-{horizon... 
X-Git-Tag: v4.0.0-alpha.3~373^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d26b7c7a2ca8ab45ad59995d3bae679f15c4baff;p=thirdparty%2Fbootstrap.git

Rename local vars per new naming convention: $padding-{vertical=>y} $padding-{horizontal=>x}

[skip sauce]
[skip validator]
---

diff --git a/scss/mixins/_forms.scss b/scss/mixins/_forms.scss
index eab8063e0a..b87429c1b0 100644
--- a/scss/mixins/_forms.scss
+++ b/scss/mixins/_forms.scss
@@ -68,10 +68,10 @@
 // horizontal sizing, wrap controls in the predefined grid classes. `<select>`
 // element gets special love because it's special, and that's a fact!
 
-@mixin input-size($parent, $input-height, $padding-vertical, $padding-horizontal, $font-size, $line-height, $border-radius) {
+@mixin input-size($parent, $input-height, $padding-y, $padding-x, $font-size, $line-height, $border-radius) {
   #{$parent} {
     height: $input-height;
-    padding: $padding-vertical $padding-horizontal;
+    padding: $padding-y $padding-x;
     font-size: $font-size;
     line-height: $line-height;
     @include border-radius($border-radius);
diff --git a/scss/mixins/_pagination.scss b/scss/mixins/_pagination.scss
index eaebe89558..ff36eb6b40 100644
--- a/scss/mixins/_pagination.scss
+++ b/scss/mixins/_pagination.scss
@@ -1,8 +1,8 @@
 // Pagination
 
-@mixin pagination-size($padding-vertical, $padding-horizontal, $font-size, $line-height, $border-radius) {
+@mixin pagination-size($padding-y, $padding-x, $font-size, $line-height, $border-radius) {
   .page-link {
-    padding: $padding-vertical $padding-horizontal;
+    padding: $padding-y $padding-x;
     font-size: $font-size;
     line-height: $line-height;
   }