diff options
| author | Mark Otto <[email protected]> | 2013-07-31 10:27:52 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-07-31 10:27:52 -0700 |
| commit | f43fa23ae0bacee23c19a65e39b96b3a21b9adf1 (patch) | |
| tree | 155596182903584da7a78f708dd90ff981cdc62e | |
| parent | 29b36bf962d8fb553516ddc865951a80deb7b347 (diff) | |
| parent | d7d0f226f9e31eea349f37d25a26c8674b63a642 (diff) | |
| download | bootstrap-f43fa23ae0bacee23c19a65e39b96b3a21b9adf1.tar.xz bootstrap-f43fa23ae0bacee23c19a65e39b96b3a21b9adf1.zip | |
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
| -rw-r--r-- | js/tests/unit/dropdown.js | 12 | ||||
| -rw-r--r-- | less/mixins.less | 6 | ||||
| -rw-r--r-- | less/pagination.less | 6 |
3 files changed, 12 insertions, 12 deletions
diff --git a/js/tests/unit/dropdown.js b/js/tests/unit/dropdown.js index e45bd0a46..02256965d 100644 --- a/js/tests/unit/dropdown.js +++ b/js/tests/unit/dropdown.js @@ -165,9 +165,9 @@ $(function () { .appendTo('#qunit-fixture') .find('[data-toggle="dropdown"]') .dropdown() - + stop() - + dropdown .parent('.dropdown') .bind('show.bs.dropdown', function () { @@ -177,7 +177,7 @@ $(function () { ok(true, 'hide was called') start() }) - + dropdown.click() $(document.body).click() }) @@ -199,9 +199,9 @@ $(function () { .appendTo('#qunit-fixture') .find('[data-toggle="dropdown"]') .dropdown() - + stop() - + dropdown .parent('.dropdown') .bind('shown.bs.dropdown', function () { @@ -211,7 +211,7 @@ $(function () { ok(true, 'hide was called') start() }) - + dropdown.click() $(document.body).click() }) 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, |