Skip to content

Commit c06cce9

Browse files
fatfat
committed
2.0.2
1 parent 387bb4e commit c06cce9

37 files changed

+3094
-1187
lines changed

‎assets/bootstrap.zip

2.14 KB
Binary file not shown.

‎assets/css/bootstrap-responsive.css

Lines changed: 318 additions & 213 deletions
Large diffs are not rendered by default.

‎assets/css/bootstrap.css

Lines changed: 871 additions & 377 deletions
Large diffs are not rendered by default.

‎assets/css/docs.css

Lines changed: 80 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ hr.soften {
6363
.jumbotron h1 {
6464
margin-bottom: 9px;
6565
font-size: 81px;
66+
font-weight: bold;
6667
letter-spacing: -1px;
6768
line-height: 1;
6869
}
@@ -79,6 +80,9 @@ hr.soften {
7980
-moz-border-radius: 6px;
8081
border-radius: 6px;
8182
}
83+
.jumbotron .btn-large small {
84+
font-size: 14px;
85+
}
8286

8387
/* Masthead (docs home) */
8488
.masthead {
@@ -208,14 +212,20 @@ hr.soften {
208212

209213
/* Quick links
210214
-------------------------------------------------- */
215+
.bs-links {
216+
margin: 36px 0;
217+
}
211218
.quick-links {
212219
min-height: 30px;
220+
margin: 0;
213221
padding: 5px 20px;
214-
margin: 36px 0;
215222
list-style: none;
216223
text-align: center;
217224
overflow: hidden;
218225
}
226+
.quick-links:first-child {
227+
min-height: 0;
228+
}
219229
.quick-links li {
220230
display: inline;
221231
margin: 0 5px;
@@ -427,17 +437,17 @@ hr.soften {
427437
.download-btn {
428438
margin: 36px 0 108px;
429439
}
430-
.download p,
431-
.download h4 {
440+
#download p,
441+
#download h4 {
432442
max-width: 50%;
433443
margin: 0 auto;
434444
color: #999;
435445
text-align: center;
436446
}
437-
.download h4 {
447+
#download h4 {
438448
margin-bottom: 0;
439449
}
440-
.download p {
450+
#download p {
441451
margin-bottom: 18px;
442452
}
443453
.download-btn .btn {
@@ -482,8 +492,7 @@ hr.soften {
482492
/* Misc
483493
-------------------------------------------------- */
484494

485-
486-
.browser-support {
495+
img {
487496
max-width: 100%;
488497
}
489498

@@ -558,6 +567,70 @@ form.well {
558567
background-color: #fff;
559568
}
560569

570+
/* Responsive table
571+
------------------------- */
572+
.responsive-utilities th small {
573+
display: block;
574+
font-weight: normal;
575+
color: #999;
576+
}
577+
.responsive-utilities tbody th {
578+
font-weight: normal;
579+
}
580+
.responsive-utilities td {
581+
text-align: center;
582+
}
583+
.responsive-utilities td.is-visible {
584+
color: #468847;
585+
background-color: #dff0d8 !important;
586+
}
587+
.responsive-utilities td.is-hidden {
588+
color: #ccc;
589+
background-color: #f9f9f9 !important;
590+
}
591+
592+
/* Responsive tests
593+
------------------------- */
594+
.responsive-utilities-test {
595+
margin-top: 5px;
596+
margin-left: 0;
597+
list-style: none;
598+
overflow: hidden; /* clear floats */
599+
}
600+
.responsive-utilities-test li {
601+
position: relative;
602+
float: left;
603+
width: 25%;
604+
height: 43px;
605+
font-size: 14px;
606+
font-weight: bold;
607+
line-height: 43px;
608+
color: #999;
609+
text-align: center;
610+
border: 1px solid #ddd;
611+
-webkit-border-radius: 4px;
612+
-moz-border-radius: 4px;
613+
border-radius: 4px;
614+
}
615+
.responsive-utilities-test li + li {
616+
margin-left: 10px;
617+
}
618+
.responsive-utilities-test span {
619+
position: absolute;
620+
top: -1px;
621+
left: -1px;
622+
right: -1px;
623+
bottom: -1px;
624+
-webkit-border-radius: 4px;
625+
-moz-border-radius: 4px;
626+
border-radius: 4px;
627+
}
628+
.responsive-utilities-test span {
629+
color: #468847;
630+
background-color: #dff0d8;
631+
border: 1px solid #d6e9c6;
632+
}
633+
561634

562635
/* Responsive Docs
563636
-------------------------------------------------- */

‎assets/ico/apple-touch-icon-114-precomposed.png

5.9 KB
Loading

‎assets/ico/apple-touch-icon-57-precomposed.png

2.21 KB
Loading

‎assets/ico/apple-touch-icon-72-precomposed.png

3.09 KB
Loading

‎assets/ico/favicon.ico

0 Bytes
Binary file not shown.

‎assets/img/example-sites/fleetio.png

-2.05 KB
Loading

‎assets/img/example-sites/kippt.png

-2.05 KB
Loading

‎assets/img/example-sites/soundready.png

52.7 KB
Loading

‎assets/js/bootstrap-carousel.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@
2929
this.$element = $(element)
3030
this.options = $.extend({}, $.fn.carousel.defaults, options)
3131
this.options.slide && this.slide(this.options.slide)
32+
this.options.pause == 'hover' && this.$element
33+
.on('mouseenter', $.proxy(this.pause, this))
34+
.on('mouseleave', $.proxy(this.cycle, this))
3235
}
3336

3437
Carousel.prototype = {
@@ -83,14 +86,14 @@
8386
, fallback = type == 'next' ? 'first' : 'last'
8487
, that = this
8588

86-
if (!$next.length) return
87-
8889
this.sliding = true
8990

9091
isCycling && this.pause()
9192

9293
$next = $next.length ? $next : this.$element.find('.item')[fallback]()
9394

95+
if ($next.hasClass('active')) return
96+
9497
if (!$.support.transition && this.$element.hasClass('slide')) {
9598
this.$element.trigger('slide')
9699
$active.removeClass('active')
@@ -136,6 +139,7 @@
136139

137140
$.fn.carousel.defaults = {
138141
interval: 5000
142+
, pause: 'hover'
139143
}
140144

141145
$.fn.carousel.Constructor = Carousel

‎assets/js/bootstrap-collapse.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,9 @@
7474
[dimension](size || 'auto')
7575
[0].offsetWidth
7676

77-
this.$element.addClass('collapse')
77+
this.$element[size ? 'addClass' : 'removeClass']('collapse')
78+
79+
return this
7880
}
7981

8082
, transition: function ( method, startEvent, completeEvent ) {

‎assets/js/bootstrap-tooltip.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@
206206
title = $e.attr('data-original-title')
207207
|| (typeof o.title == 'function' ? o.title.call($e[0]) : o.title)
208208

209-
title = title.toString().replace(/(^\s*|\s*$)/, "")
209+
title = (title || '').toString().replace(/(^\s*|\s*$)/, "")
210210

211211
return title
212212
}

‎assets/js/bootstrap-typeahead.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
, select: function () {
4141
var val = this.$menu.find('.active').attr('data-value')
4242
this.$element.val(val)
43+
this.$element.change();
4344
return this.hide()
4445
}
4546

@@ -165,9 +166,6 @@
165166
}
166167

167168
, keyup: function (e) {
168-
e.stopPropagation()
169-
e.preventDefault()
170-
171169
switch(e.keyCode) {
172170
case 40: // down arrow
173171
case 38: // up arrow
@@ -180,17 +178,19 @@
180178
break
181179

182180
case 27: // escape
181+
if (!this.shown) return
183182
this.hide()
184183
break
185184

186185
default:
187186
this.lookup()
188187
}
189188

189+
e.stopPropagation()
190+
e.preventDefault()
190191
}
191192

192193
, keypress: function (e) {
193-
e.stopPropagation()
194194
if (!this.shown) return
195195

196196
switch(e.keyCode) {
@@ -210,12 +210,12 @@
210210
this.next()
211211
break
212212
}
213+
214+
e.stopPropagation()
213215
}
214216

215217
, blur: function (e) {
216218
var that = this
217-
e.stopPropagation()
218-
e.preventDefault()
219219
setTimeout(function () { that.hide() }, 150)
220220
}
221221

0 commit comments

Comments
 (0)