diff options
| author | Gleb Mazovetskiy <glex.spb@gmail.com> | 2015-05-28 16:43:00 +0300 |
|---|---|---|
| committer | Gleb Mazovetskiy <glex.spb@gmail.com> | 2015-05-28 16:43:00 +0300 |
| commit | 01581510552f9fc3394df98599b4f3938a758356 (patch) | |
| tree | 20af4602009b9d08a1d2df65ed259712755ff507 /assets/stylesheets/bootstrap/mixins | |
| parent | 488c8b35ec0b84abc16f05ec7b2de21c79c9ec2c (diff) | |
rake convert
Diffstat (limited to 'assets/stylesheets/bootstrap/mixins')
| -rw-r--r-- | assets/stylesheets/bootstrap/mixins/_list-group.scss | 5 | ||||
| -rw-r--r-- | assets/stylesheets/bootstrap/mixins/_pagination.scss | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/assets/stylesheets/bootstrap/mixins/_list-group.scss b/assets/stylesheets/bootstrap/mixins/_list-group.scss index 5f05e7b..c478eeb 100644 --- a/assets/stylesheets/bootstrap/mixins/_list-group.scss +++ b/assets/stylesheets/bootstrap/mixins/_list-group.scss @@ -5,10 +5,11 @@ color: $color; background-color: $background; - // [converter] extracted a& to a.list-group-item-#{$state} + // [converter] extracted a&, button& to a.list-group-item-#{$state}, button.list-group-item-#{$state} } - a.list-group-item-#{$state} { + a.list-group-item-#{$state}, + button.list-group-item-#{$state} { color: $color; .list-group-item-heading { diff --git a/assets/stylesheets/bootstrap/mixins/_pagination.scss b/assets/stylesheets/bootstrap/mixins/_pagination.scss index 43fff68..d4a5404 100644 --- a/assets/stylesheets/bootstrap/mixins/_pagination.scss +++ b/assets/stylesheets/bootstrap/mixins/_pagination.scss @@ -1,11 +1,12 @@ // Pagination -@mixin pagination-size($padding-vertical, $padding-horizontal, $font-size, $border-radius) { +@mixin pagination-size($padding-vertical, $padding-horizontal, $font-size, $line-height, $border-radius) { > li { > a, > span { padding: $padding-vertical $padding-horizontal; font-size: $font-size; + line-height: $line-height; } &:first-child { > a, |