mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-17 19:21:23 +03:00
Code Activity

Merge pull request #18879 from twbs/vert-horiz-y-x

Browse Source 
Rename padding local vars per new naming convention
/fyi @mdo
This commit is contained in:
Chris Rebert
2016-01-13 15:37:08 -08:00
parent fa696d0465 d26b7c7a2c
commit bc220835a9
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scss/mixins/_forms.scss
+2 -2
View File
@@ -68,10 +68,10 @@
// horizontal sizing, wrap controls in the predefined grid classes. `<select>` // horizontal sizing, wrap controls in the predefined grid classes. `<select>`
// element gets special love because it's special, and that's a fact! // 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} { #{$parent} {
height: $input-height; height: $input-height;
padding: $padding-vertical $padding-horizontal; padding: $padding-y $padding-x;
font-size: $font-size; font-size: $font-size;
line-height: $line-height; line-height: $line-height;
@include border-radius($border-radius); @include border-radius($border-radius);
scss/mixins/_pagination.scss
+2 -2
View File
@@ -1,8 +1,8 @@
// Pagination // 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 { .page-link {
padding: $padding-vertical $padding-horizontal; padding: $padding-y $padding-x;
font-size: $font-size; font-size: $font-size;
line-height: $line-height; line-height: $line-height;
} }