app/assets/stylesheets/twitter/bootstrap/_pagination.scss in bootstrap-sass-rails-2.3.2.1 vs app/assets/stylesheets/twitter/bootstrap/_pagination.scss in bootstrap-sass-rails-3.0.0.0.rc1

- old
+ new

@@ -1,123 +1,108 @@ -/* Partial: twitter/bootstrap/_pagination.scss */ // // Pagination (multiple pages) // -------------------------------------------------- - -// Space out pagination from surrounding content .pagination { - margin: $baseLineHeight 0; - } -.pagination ul { - // Allow for text-based alignment display: inline-block; - @include ie7-inline-block(); - // Reset default ul styles - margin-left: 0; - margin-bottom: 0; - // Visuals - @include border-radius($baseBorderRadius); - @include box-shadow(0 1px 2px rgba(0,0,0,.05)); + padding-left: 0; + margin: $line-height-computed 0; + border-radius: $border-radius-base; + + > li { + display: inline; // Remove list-style and block-level defaults + > a, + > span { + float: left; // Collapse white-space + padding: 4px 12px; + line-height: $line-height-base; + text-decoration: none; + background-color: $pagination-bg; + border: 1px solid $pagination-border; + border-left-width: 0; + } + &:first-child { + > a, + > span { + border-left-width: 1px; + @include border-left-radius($border-radius-base); + } + } + &:last-child { + > a, + > span { + @include border-right-radius($border-radius-base); + } + } + } + + > li > a:hover, + > li > a:focus, + > .active > a, + > .active > span { + background-color: $pagination-active-bg; + } + > .active > a, + > .active > span { + color: $pagination-active-color; + cursor: default; + } + + > .disabled { + > span, + > a, + > a:hover, + > a:focus { + color: $pagination-disabled-color; + background-color: $pagination-bg; + cursor: not-allowed; + } + } } -.pagination ul > li { - display: inline; // Remove list-style and block-level defaults -} -.pagination ul > li > a, -.pagination ul > li > span { - float: left; // Collapse white-space - padding: 4px 12px; - line-height: $baseLineHeight; - text-decoration: none; - background-color: $paginationBackground; - border: 1px solid $paginationBorder; - border-left-width: 0; -} -.pagination ul > li > a:hover, -.pagination ul > li > a:focus, -.pagination ul > .active > a, -.pagination ul > .active > span { - background-color: $paginationActiveBackground; -} -.pagination ul > .active > a, -.pagination ul > .active > span { - color: $grayLight; - cursor: default; -} -.pagination ul > .disabled > span, -.pagination ul > .disabled > a, -.pagination ul > .disabled > a:hover, -.pagination ul > .disabled > a:focus { - color: $grayLight; - background-color: transparent; - cursor: default; -} -.pagination ul > li:first-child > a, -.pagination ul > li:first-child > span { - border-left-width: 1px; - @include border-left-radius($baseBorderRadius); -} -.pagination ul > li:last-child > a, -.pagination ul > li:last-child > span { - @include border-radius(0 3px 3px 0); -} - -// Alignment -// -------------------------------------------------- - -.pagination-centered { - text-align: center; -} -.pagination-right { - text-align: right; -} - - // Sizing // -------------------------------------------------- // Large .pagination-large { - ul > li > a, - ul > li > span { - padding: $paddingLarge; - font-size: $fontSizeLarge; + > li { + > a, + > span { + padding: $padding-large-vertical $padding-large-horizontal; + font-size: $font-size-large; + } + &:first-child { + > a, + > span { + @include border-left-radius($border-radius-large); + } + } + &:last-child { + > a, + > span { + @include border-right-radius($border-radius-large); + } + } } - ul > li:first-child > a, - ul > li:first-child > span { - @include border-left-radius($borderRadiusLarge); - } - ul > li:last-child > a, - ul > li:last-child > span { - @include border-right-radius($borderRadiusLarge); - } } -// Small and mini -.pagination-mini, -.pagination-small { - ul > li:first-child > a, - ul > li:first-child > span { - @include border-left-radius($borderRadiusSmall); - } - ul > li:last-child > a, - ul > li:last-child > span { - @include border-right-radius($borderRadiusSmall); - } -} - // Small .pagination-small { - ul > li > a, - ul > li > span { - padding: $paddingSmall; - font-size: $fontSizeSmall; - } -} -// Mini -.pagination-mini { - ul > li > a, - ul > li > span { - padding: $paddingMini; - font-size: $fontSizeMini; + > li { + > a, + > span { + padding: $padding-small-vertical $padding-small-horizontal; + font-size: $font-size-small; + } + &:first-child { + > a, + > span { + @include border-left-radius($border-radius-small); + } + } + &:last-child { + > a, + > span { + @include border-right-radius($border-radius-small); + } + } } }