diff options
| author | Chris Rebert <[email protected]> | 2016-01-13 15:37:08 -0800 |
|---|---|---|
| committer | Chris Rebert <[email protected]> | 2016-01-13 15:37:08 -0800 |
| commit | bc220835a90f6ce430c4fc788507cf6cbb0407a5 (patch) | |
| tree | 01f623249b8b82a24e8537607ec38735b6444474 | |
| parent | fa696d04659bf1298e06b1926a82513d5a8d691f (diff) | |
| parent | d26b7c7a2ca8ab45ad59995d3bae679f15c4baff (diff) | |
| download | bootstrap-bc220835a90f6ce430c4fc788507cf6cbb0407a5.tar.xz bootstrap-bc220835a90f6ce430c4fc788507cf6cbb0407a5.zip | |
Merge pull request #18879 from twbs/vert-horiz-y-x
Rename padding local vars per new naming convention
/fyi @mdo
| -rw-r--r-- | scss/mixins/_forms.scss | 4 | ||||
| -rw-r--r-- | scss/mixins/_pagination.scss | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/scss/mixins/_forms.scss b/scss/mixins/_forms.scss index eab8063e0..b87429c1b 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 eaebe8955..ff36eb6b4 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; } |