aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2011-12-27 15:51:36 -0600
committerMark Otto <[email protected]>2011-12-27 15:51:36 -0600
commit3426877c894b858d89e68c72bc300cd4f670c40f (patch)
tree08522284e31ed110f4678cdd289c536716f032c2 /lib
parentfec02f50455c87f0e01fe74b1fb2e3cd032ade09 (diff)
downloadbootstrap-3426877c894b858d89e68c72bc300cd4f670c40f.tar.xz
bootstrap-3426877c894b858d89e68c72bc300cd4f670c40f.zip
add ie7 inline block mixin and add ability to center pagination
Diffstat (limited to 'lib')
-rw-r--r--lib/mixins.less6
-rw-r--r--lib/pagination.less8
2 files changed, 13 insertions, 1 deletions
diff --git a/lib/mixins.less b/lib/mixins.less
index e8b5cdd2f..58df9298a 100644
--- a/lib/mixins.less
+++ b/lib/mixins.less
@@ -25,6 +25,12 @@
margin-right: auto;
}
+// IE7 inline-block
+.ie7-inline-block() {
+ *display: inline; /* IE7 inline-block hack */
+ *zoom: 1;
+}
+
// Sizing shortcuts
.size(@height: 5px, @width: 5px) {
width: @width;
diff --git a/lib/pagination.less b/lib/pagination.less
index d82a0bbd0..f63051168 100644
--- a/lib/pagination.less
+++ b/lib/pagination.less
@@ -5,7 +5,8 @@
height: @baseLineHeight * 2;
margin: @baseLineHeight 0;
ul {
- float: left;
+ display: inline-block;
+ .ie7-inline-block();
margin: 0;
border: 1px solid #ddd;
border: 1px solid rgba(0,0,0,.15);
@@ -37,4 +38,9 @@
.next a {
border: 0;
}
+
+ // Centered
+ &.centered {
+ text-align: center;
+ }
}