mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-01 19:30:31 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip

Browse Source
This commit is contained in:
Mark Otto
2013-07-31 10:27:52 -07:00
parent 29b36bf962 d7d0f226f9
commit f43fa23ae0
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
js/tests/unit/dropdown.js
View File

@@ -165,9 +165,9 @@ $(function () {
.appendTo('#qunit-fixture') .appendTo('#qunit-fixture')
.find('[data-toggle="dropdown"]') .find('[data-toggle="dropdown"]')
.dropdown() .dropdown()
stop() stop()
dropdown dropdown
.parent('.dropdown') .parent('.dropdown')
.bind('show.bs.dropdown', function () { .bind('show.bs.dropdown', function () {
@@ -177,7 +177,7 @@ $(function () {
ok(true, 'hide was called') ok(true, 'hide was called')
start() start()
}) })
dropdown.click() dropdown.click()
$(document.body).click() $(document.body).click()
}) })
@@ -199,9 +199,9 @@ $(function () {
.appendTo('#qunit-fixture') .appendTo('#qunit-fixture')
.find('[data-toggle="dropdown"]') .find('[data-toggle="dropdown"]')
.dropdown() .dropdown()
stop() stop()
dropdown dropdown
.parent('.dropdown') .parent('.dropdown')
.bind('shown.bs.dropdown', function () { .bind('shown.bs.dropdown', function () {
@@ -211,7 +211,7 @@ $(function () {
ok(true, 'hide was called') ok(true, 'hide was called')
start() start()
}) })
dropdown.click() dropdown.click()
$(document.body).click() $(document.body).click()
}) })

6
less/mixins.less
View File

@@ -158,9 +158,9 @@
// Default value is `visible`, but can be changed to `hidden` // Default value is `visible`, but can be changed to `hidden`
// See git pull https://github.com/dannykeane/bootstrap.git backface-visibility for examples // See git pull https://github.com/dannykeane/bootstrap.git backface-visibility for examples
.backface-visibility(@visibility){ .backface-visibility(@visibility){
-webkit-backface-visibility: @visibility; -webkit-backface-visibility: @visibility;
-moz-backface-visibility: @visibility; -moz-backface-visibility: @visibility;
backface-visibility: @visibility; backface-visibility: @visibility;
} }
// Background clipping // Background clipping

6
less/pagination.less
View File

@@ -6,7 +6,7 @@
padding-left: 0; padding-left: 0;
margin: @line-height-computed 0; margin: @line-height-computed 0;
border-radius: @border-radius-base; border-radius: @border-radius-base;
> li { > li {
display: inline; // Remove list-style and block-level defaults display: inline; // Remove list-style and block-level defaults
> a, > a,
@@ -33,7 +33,7 @@
} }
} }
} }
> li > a:hover, > li > a:hover,
> li > a:focus, > li > a:focus,
> .active > a, > .active > a,
@@ -45,7 +45,7 @@
color: @pagination-active-color; color: @pagination-active-color;
cursor: default; cursor: default;
} }
> .disabled { > .disabled {
> span, > span,
> a, > a,