mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-13 09:04:14 +02:00
Code Issues Releases Wiki Activity

Merge pull request #8412 from cvrebert/pagination-nesting

Browse Source 
use nesting more in pagination.less
This commit is contained in:
Mark Otto
2013-07-08 06:55:50 -07:00
parent 46378c7ba3 6bda16f6be
commit e0d1b83e25
2 changed files with 63 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
docs/assets/css/bootstrap.css vendored
View File

@@ -3323,6 +3323,19 @@ button.close {
border-left-width: 0; border-left-width: 0;
} }
.pagination > li:first-child > a,
.pagination > li:first-child > span {
border-left-width: 1px;
border-bottom-left-radius: 4px;
border-top-left-radius: 4px;
}
.pagination > li:last-child > a,
.pagination > li:last-child > span {
border-top-right-radius: 4px;
border-bottom-right-radius: 4px;
}
.pagination > li > a:hover, .pagination > li > a:hover,
.pagination > li > a:focus, .pagination > li > a:focus,
.pagination > .active > a, .pagination > .active > a,
@@ -3345,19 +3358,6 @@ button.close {
background-color: #ffffff; background-color: #ffffff;
} }
.pagination > li:first-child > a,
.pagination > li:first-child > span {
border-left-width: 1px;
border-bottom-left-radius: 4px;
border-top-left-radius: 4px;
}
.pagination > li:last-child > a,
.pagination > li:last-child > span {
border-top-right-radius: 4px;
border-bottom-right-radius: 4px;
}
.pagination-large > li > a, .pagination-large > li > a,
.pagination-large > li > span { .pagination-large > li > span {
padding: 14px 16px; padding: 14px 16px;

66
less/pagination.less
View File

@@ -10,7 +10,7 @@
> li { > li {
display: inline; // Remove list-style and block-level defaults display: inline; // Remove list-style and block-level defaults
> a, > a,
> span,{ > span {
float: left; // Collapse white-space float: left; // Collapse white-space
padding: 4px 12px; padding: 4px 12px;
line-height: @line-height-base; line-height: @line-height-base;
@@ -19,6 +19,19 @@
border: 1px solid @pagination-border; border: 1px solid @pagination-border;
border-left-width: 0; border-left-width: 0;
} }
&:first-child {
> a,
> span {
border-left-width: 1px;
.border-left-radius(@border-radius-base);
}
}
&:last-child {
> a,
> span {
.border-right-radius(@border-radius-base);
}
}
} }
> li > a:hover, > li > a:hover,
@@ -43,21 +56,6 @@
cursor: default; cursor: default;
} }
} }
> li:first-child {
> a,
> span {
border-left-width: 1px;
.border-left-radius(@border-radius-base);
}
}
> li:last-child {
> a,
> span {
.border-right-radius(@border-radius-base);
}
}
} }
// Sizing // Sizing
@@ -65,34 +63,46 @@
// Large // Large
.pagination-large { .pagination-large {
> li > a, > li {
> li > span { > a,
> span {
padding: @padding-large-vertical @padding-large-horizontal; padding: @padding-large-vertical @padding-large-horizontal;
font-size: @font-size-large; font-size: @font-size-large;
} }
> li:first-child > a, &:first-child {
> li:first-child > span { > a,
> span {
.border-left-radius(@border-radius-large); .border-left-radius(@border-radius-large);
} }
> li:last-child > a, }
> li:last-child > span { &:last-child {
> a,
> span {
.border-right-radius(@border-radius-large); .border-right-radius(@border-radius-large);
} }
} }
}
}
// Small // Small
.pagination-small { .pagination-small {
> li > a, > li {
> li > span { > a,
> span {
padding: @padding-small-vertical @padding-small-horizontal; padding: @padding-small-vertical @padding-small-horizontal;
font-size: @font-size-small; font-size: @font-size-small;
} }
> li:first-child > a, &:first-child {
> li:first-child > span { > a,
> span {
.border-left-radius(@border-radius-small); .border-left-radius(@border-radius-small);
} }
> li:last-child > a, }
> li:last-child > span { &:last-child {
> a,
> span {
.border-right-radius(@border-radius-small); .border-right-radius(@border-radius-small);
} }
} }
}
}