aboutsummaryrefslogtreecommitdiff
path: root/less
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-07-31 10:27:52 -0700
committerMark Otto <[email protected]>2013-07-31 10:27:52 -0700
commitf43fa23ae0bacee23c19a65e39b96b3a21b9adf1 (patch)
tree155596182903584da7a78f708dd90ff981cdc62e /less
parent29b36bf962d8fb553516ddc865951a80deb7b347 (diff)
parentd7d0f226f9e31eea349f37d25a26c8674b63a642 (diff)
downloadbootstrap-f43fa23ae0bacee23c19a65e39b96b3a21b9adf1.tar.xz
bootstrap-f43fa23ae0bacee23c19a65e39b96b3a21b9adf1.zip
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
Diffstat (limited to 'less')
-rw-r--r--less/mixins.less6
-rw-r--r--less/pagination.less6
2 files changed, 6 insertions, 6 deletions
diff --git a/less/mixins.less b/less/mixins.less
index 2fb9a8ff4..d359ce70f 100644
--- a/less/mixins.less
+++ b/less/mixins.less
@@ -158,9 +158,9 @@
// Default value is `visible`, but can be changed to `hidden`
// See git pull https://github.com/dannykeane/bootstrap.git backface-visibility for examples
.backface-visibility(@visibility){
- -webkit-backface-visibility: @visibility;
- -moz-backface-visibility: @visibility;
- backface-visibility: @visibility;
+ -webkit-backface-visibility: @visibility;
+ -moz-backface-visibility: @visibility;
+ backface-visibility: @visibility;
}
// Background clipping
diff --git a/less/pagination.less b/less/pagination.less
index 83b72e47e..6720c6898 100644
--- a/less/pagination.less
+++ b/less/pagination.less
@@ -6,7 +6,7 @@
padding-left: 0;
margin: @line-height-computed 0;
border-radius: @border-radius-base;
-
+
> li {
display: inline; // Remove list-style and block-level defaults
> a,
@@ -33,7 +33,7 @@
}
}
}
-
+
> li > a:hover,
> li > a:focus,
> .active > a,
@@ -45,7 +45,7 @@
color: @pagination-active-color;
cursor: default;
}
-
+
> .disabled {
> span,
> a,