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

[skip sauce]
[skip validator]

diff --git a/scss/mixins/_forms.scss b/scss/mixins/_forms.scss
index eab8063e0a6f381bfdeb6b875a15d6b9752cb1eb..b87429c1b0798f67ee90aa9dafb554d9e5a716ca 100644 (file)
--- 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 eaebe89558c1e1da3518b15828d2a606319546d2..ff36eb6b40a8ad577ae61f304cc5f23402d74cef 100644 (file)
--- 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;
   }