aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-06-19 23:37:47 -0700
committerMark Otto <[email protected]>2012-06-19 23:37:47 -0700
commitd704d6f0ed3d87377b2c53f29c5d196f75c24e6d (patch)
tree6bb34c2d7c0f45fb9970b0c28bad539f42e3c190
parentce140662a0a52d8ff2cd1acee4a57591d336249d (diff)
downloadbootstrap-d704d6f0ed3d87377b2c53f29c5d196f75c24e6d.tar.xz
bootstrap-d704d6f0ed3d87377b2c53f29c5d196f75c24e6d.zip
#3861: add span to pagination selectors for full support of non-link pagination items
-rw-r--r--docs/assets/css/bootstrap.css15
-rw-r--r--less/pagination.less15
2 files changed, 20 insertions, 10 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 56405b5ff..177fd693f 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -4111,7 +4111,8 @@ input[type="submit"].btn.btn-mini {
display: inline;
}
-.pagination a {
+.pagination a,
+.pagination span {
float: left;
padding: 0 14px;
line-height: 34px;
@@ -4121,11 +4122,13 @@ input[type="submit"].btn.btn-mini {
}
.pagination a:hover,
-.pagination .active a {
+.pagination .active a,
+.pagination .active span {
background-color: #f5f5f5;
}
-.pagination .active a {
+.pagination .active a,
+.pagination .active span {
color: #999999;
cursor: default;
}
@@ -4138,14 +4141,16 @@ input[type="submit"].btn.btn-mini {
background-color: transparent;
}
-.pagination li:first-child a {
+.pagination li:first-child a,
+.pagination li:first-child span {
border-left-width: 1px;
-webkit-border-radius: 3px 0 0 3px;
-moz-border-radius: 3px 0 0 3px;
border-radius: 3px 0 0 3px;
}
-.pagination li:last-child a {
+.pagination li:last-child a,
+.pagination li:last-child span {
-webkit-border-radius: 0 3px 3px 0;
-moz-border-radius: 0 3px 3px 0;
border-radius: 0 3px 3px 0;
diff --git a/less/pagination.less b/less/pagination.less
index 38cf65cc4..d978a7b8c 100644
--- a/less/pagination.less
+++ b/less/pagination.less
@@ -16,7 +16,8 @@
.pagination li {
display: inline;
}
-.pagination a {
+.pagination a,
+.pagination span {
float: left;
padding: 0 14px;
line-height: (@baseLineHeight * 2) - 2;
@@ -25,10 +26,12 @@
border-left-width: 0;
}
.pagination a:hover,
-.pagination .active a {
+.pagination .active a,
+.pagination .active span {
background-color: #f5f5f5;
}
-.pagination .active a {
+.pagination .active a,
+.pagination .active span {
color: @grayLight;
cursor: default;
}
@@ -39,11 +42,13 @@
background-color: transparent;
cursor: default;
}
-.pagination li:first-child a {
+.pagination li:first-child a,
+.pagination li:first-child span {
border-left-width: 1px;
.border-radius(3px 0 0 3px);
}
-.pagination li:last-child a {
+.pagination li:last-child a,
+.pagination li:last-child span {
.border-radius(0 3px 3px 0);
}