kotovalexarian-likes-github/twbs--bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2022-11-09 12:25:43 -05:00
Code Releases Activity

Merge branch 'master' of github.com:twbs/bootstrap

Browse source
This commit is contained in:
Mark Otto 2014-10-27 20:30:02 -07:00
commit 892f6e35b8
5 changed files with 509 additions and 414 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

846
docs/_includes/customizer-variables.html
View file

File diff suppressed because it is too large Load diff

6
docs/_jade/customizer-variables.jade
View file

@ -8,8 +8,10 @@ each section in sections
if subsection.heading if subsection.heading
h3(id=subsection.id)= subsection.heading h3(id=subsection.id)= subsection.heading
div.row div.row
each variable in subsection.variables each variable, index in subsection.variables
div.bs-customizer-input if index > 0 && index % 3 === 0
div.clearfix
div.col-xs-4
label(for="input-" + variable.name)= variable.name label(for="input-" + variable.name)= variable.name
input.form-control( input.form-control(
id="input-" + variable.name id="input-" + variable.name

7
docs/assets/css/src/docs.css
View file

@ -1342,13 +1342,6 @@ h1[id] {
font-weight: normal; font-weight: normal;
} }
.bs-customizer-input {
float: left;
width: 33.333333%;
padding-right: 15px;
padding-left: 15px;
}
/* Downloads */ /* Downloads */
.bs-customize-download .btn-outline { .bs-customize-download .btn-outline {
padding: 20px; padding: 20px;

2
grunt/sauce_browsers.yml
View file

@ -57,7 +57,7 @@
{ {
browserName: "iphone", browserName: "iphone",
platform: "OS X 10.9", platform: "OS X 10.9",
version: "7.1" version: "8.0"
}, },
# iOS Chrome not currently supported by Sauce Labs # iOS Chrome not currently supported by Sauce Labs

62
js/tests/unit/tooltip.js
View file

@ -803,16 +803,16 @@ $(function () {
var $tooltip = $('<a href="#" rel="tooltip" title="Another tooltip"/>') var $tooltip = $('<a href="#" rel="tooltip" title="Another tooltip"/>')
.appendTo('#qunit-fixture') .appendTo('#qunit-fixture')
.bootstrapTooltip({ delay: 15 }) .bootstrapTooltip({ delay: 150 })
setTimeout(function () { setTimeout(function () {
ok(!$('.tooltip').is('.fade.in'), '10ms: tooltip is not faded in') ok(!$('.tooltip').is('.fade.in'), '100ms: tooltip is not faded in')
}, 10) }, 100)
setTimeout(function () { setTimeout(function () {
ok($('.tooltip').is('.fade.in'), '20ms: tooltip is faded in') ok($('.tooltip').is('.fade.in'), '200ms: tooltip is faded in')
start() start()
}, 20) }, 200)
$tooltip.trigger('mouseenter') $tooltip.trigger('mouseenter')
}) })
@ -822,17 +822,17 @@ $(function () {
var $tooltip = $('<a href="#" rel="tooltip" title="Another tooltip"/>') var $tooltip = $('<a href="#" rel="tooltip" title="Another tooltip"/>')
.appendTo('#qunit-fixture') .appendTo('#qunit-fixture')
.bootstrapTooltip({ delay: 15 }) .bootstrapTooltip({ delay: 150 })
setTimeout(function () { setTimeout(function () {
ok(!$('.tooltip').is('.fade.in'), '10ms: tooltip not faded in') ok(!$('.tooltip').is('.fade.in'), '100ms: tooltip not faded in')
$tooltip.trigger('mouseout') $tooltip.trigger('mouseout')
}, 10) }, 100)
setTimeout(function () { setTimeout(function () {
ok(!$('.tooltip').is('.fade.in'), '20ms: tooltip not faded in') ok(!$('.tooltip').is('.fade.in'), '200ms: tooltip not faded in')
start() start()
}, 20) }, 200)
$tooltip.trigger('mouseenter') $tooltip.trigger('mouseenter')
}) })
@ -842,21 +842,21 @@ $(function () {
var $tooltip = $('<a href="#" rel="tooltip" title="Another tooltip"/>') var $tooltip = $('<a href="#" rel="tooltip" title="Another tooltip"/>')
.appendTo('#qunit-fixture') .appendTo('#qunit-fixture')
.bootstrapTooltip({ delay: { show: 0, hide: 15 }}) .bootstrapTooltip({ delay: { show: 0, hide: 150 }})
setTimeout(function () { setTimeout(function () {
ok($('.tooltip').is('.fade.in'), '1ms: tooltip faded in') ok($('.tooltip').is('.fade.in'), '1ms: tooltip faded in')
$tooltip.trigger('mouseout') $tooltip.trigger('mouseout')
setTimeout(function () { setTimeout(function () {
ok($('.tooltip').is('.fade.in'), '10ms: tooltip still faded in') ok($('.tooltip').is('.fade.in'), '100ms: tooltip still faded in')
$tooltip.trigger('mouseenter') $tooltip.trigger('mouseenter')
}, 10) }, 100)
setTimeout(function () { setTimeout(function () {
ok($('.tooltip').is('.fade.in'), '20ms: tooltip still faded in') ok($('.tooltip').is('.fade.in'), '200ms: tooltip still faded in')
start() start()
}, 20) }, 200)
}, 0) }, 0)
$tooltip.trigger('mouseenter') $tooltip.trigger('mouseenter')
@ -867,17 +867,17 @@ $(function () {
var $tooltip = $('<a href="#" rel="tooltip" title="Another tooltip"/>') var $tooltip = $('<a href="#" rel="tooltip" title="Another tooltip"/>')
.appendTo('#qunit-fixture') .appendTo('#qunit-fixture')
.bootstrapTooltip({ delay: 15 }) .bootstrapTooltip({ delay: 150 })
setTimeout(function () { setTimeout(function () {
ok(!$('.tooltip').is('.fade.in'), '10ms: tooltip not faded in') ok(!$('.tooltip').is('.fade.in'), '100ms: tooltip not faded in')
$tooltip.trigger('mouseout') $tooltip.trigger('mouseout')
}, 10) }, 100)
setTimeout(function () { setTimeout(function () {
ok(!$('.tooltip').is('.fade.in'), '20ms: tooltip not faded in') ok(!$('.tooltip').is('.fade.in'), '200ms: tooltip not faded in')
start() start()
}, 20) }, 200)
$tooltip.trigger('mouseenter') $tooltip.trigger('mouseenter')
}) })
@ -887,27 +887,27 @@ $(function () {
var $tooltip = $('<a href="#" rel="tooltip" title="Another tooltip"/>') var $tooltip = $('<a href="#" rel="tooltip" title="Another tooltip"/>')
.appendTo('#qunit-fixture') .appendTo('#qunit-fixture')
.bootstrapTooltip({ delay: { show: 15, hide: 0 }}) .bootstrapTooltip({ delay: { show: 150, hide: 0 }})
setTimeout(function () { setTimeout(function () {
ok(!$('.tooltip').is('.fade.in'), '10ms: tooltip not faded in') ok(!$('.tooltip').is('.fade.in'), '100ms: tooltip not faded in')
$tooltip.trigger('mouseout') $tooltip.trigger('mouseout')
}, 10) }, 100)
setTimeout(function () { setTimeout(function () {
ok(!$('.tooltip').is('.fade.in'), '25ms: tooltip not faded in') ok(!$('.tooltip').is('.fade.in'), '250ms: tooltip not faded in')
start() start()
}, 25) }, 250)
$tooltip.trigger('mouseenter') $tooltip.trigger('mouseenter')
}) })
test('should wait 20ms before hiding the tooltip', function () { test('should wait 200ms before hiding the tooltip', function () {
stop() stop()
var $tooltip = $('<a href="#" rel="tooltip" title="Another tooltip"/>') var $tooltip = $('<a href="#" rel="tooltip" title="Another tooltip"/>')
.appendTo('#qunit-fixture') .appendTo('#qunit-fixture')
.bootstrapTooltip({ delay: { show: 0, hide: 15 }}) .bootstrapTooltip({ delay: { show: 0, hide: 150 }})
setTimeout(function () { setTimeout(function () {
ok($tooltip.data('bs.tooltip').$tip.is('.fade.in'), '1ms: tooltip faded in') ok($tooltip.data('bs.tooltip').$tip.is('.fade.in'), '1ms: tooltip faded in')
@ -915,13 +915,13 @@ $(function () {
$tooltip.trigger('mouseout') $tooltip.trigger('mouseout')
setTimeout(function () { setTimeout(function () {
ok($tooltip.data('bs.tooltip').$tip.is('.fade.in'), '10ms: tooltip still faded in') ok($tooltip.data('bs.tooltip').$tip.is('.fade.in'), '100ms: tooltip still faded in')
}, 10) }, 100)
setTimeout(function () { setTimeout(function () {
ok(!$tooltip.data('bs.tooltip').$tip.is('.in'), '20ms: tooltip removed') ok(!$tooltip.data('bs.tooltip').$tip.is('.in'), '200ms: tooltip removed')
start() start()
}, 20) }, 200)
}, 0) }, 0)