kotovalexarian-likes-github/twbs--bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2022-11-09 12:25:43 -05:00
Code Releases Activity

Refactor pagination code to remove unnecessary ancestor requirements in selectors

Browse source
This commit is contained in:
Chris Rebert 2015-10-29 22:24:25 -07:00
parent 5f35ce2095
commit 0c1df9912f
2 changed files with 41 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

73
scss/_pagination.scss
View file

@ -4,43 +4,24 @@
margin-top: $spacer-y; margin-top: $spacer-y;
margin-bottom: $spacer-y; margin-bottom: $spacer-y;
@include border-radius(); @include border-radius();
}
.page { .page {
display: inline; // Remove list-style and block-level defaults display: inline; // Remove list-style and block-level defaults
&:first-child {
.page-link { .page-link {
position: relative; margin-left: 0;
float: left; // Collapse white-space @include border-left-radius($border-radius);
padding: $pagination-padding-y $pagination-padding-x;
margin-left: -1px;
line-height: $line-height;
color: $pagination-color;
text-decoration: none;
background-color: $pagination-bg;
border: $pagination-border-width solid $pagination-border-color;
} }
&:first-child { }
.page-link { &:last-child {
margin-left: 0; .page-link {
@include border-left-radius($border-radius); @include border-right-radius($border-radius);
}
}
&:last-child {
.page-link {
@include border-right-radius($border-radius);
}
} }
} }
.page .page-link { &.active .page-link {
@include hover-focus {
color: $pagination-hover-color;
background-color: $pagination-hover-bg;
border-color: $pagination-hover-border;
}
}
.page.active .page-link {
@include plain-hover-focus { @include plain-hover-focus {
z-index: 2; z-index: 2;
color: $pagination-active-color; color: $pagination-active-color;
@ -50,18 +31,34 @@
} }
} }
.page.disabled { &.disabled .page-link {
.page-link { @include plain-hover-focus {
@include plain-hover-focus { color: $pagination-disabled-color;
color: $pagination-disabled-color; cursor: $cursor-disabled;
cursor: $cursor-disabled; background-color: $pagination-disabled-bg;
background-color: $pagination-disabled-bg; border-color: $pagination-disabled-border;
border-color: $pagination-disabled-border;
}
} }
} }
} }
.page-link {
position: relative;
float: left; // Collapse white-space
padding: $pagination-padding-y $pagination-padding-x;
margin-left: -1px;
line-height: $line-height;
color: $pagination-color;
text-decoration: none;
background-color: $pagination-bg;
border: 1px solid $pagination-border;
@include hover-focus {
color: $pagination-hover-color;
background-color: $pagination-hover-bg;
border-color: $pagination-hover-border;
}
}
// //
// Sizing // Sizing

11
scss/mixins/_pagination.scss
View file

@ -1,12 +1,13 @@
// Pagination // Pagination
@mixin pagination-size($padding-vertical, $padding-horizontal, $font-size, $line-height, $border-radius) { @mixin pagination-size($padding-vertical, $padding-horizontal, $font-size, $line-height, $border-radius) {
.page-link {
padding: $padding-vertical $padding-horizontal;
font-size: $font-size;
line-height: $line-height;
}
.page { .page {
.page-link {
padding: $padding-vertical $padding-horizontal;
font-size: $font-size;
line-height: $line-height;
}
&:first-child { &:first-child {
.page-link { .page-link {
@include border-left-radius($border-radius); @include border-left-radius($border-radius);