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

rake convert

Browse source
This commit is contained in:
Gleb Mazovetskiy 2014-04-09 20:13:42 +02:00
parent 44d139e896
commit 8510b924ce
8 changed files with 27 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/bootstrap-sass/version.rb
View file

@ -1,4 +1,4 @@
module Bootstrap
VERSION = '3.1.1.0'
BOOTSTRAP_SHA = '0907244256d923807c3a4e55f4ea606b9558d0ca'
BOOTSTRAP_SHA = 'ee2df11e93c88dff946560d81fd5e2d8fbdd61d4'
end

8
vendor/assets/javascripts/bootstrap/carousel.js vendored
View file

@ -59,7 +59,7 @@
if (pos > (this.$items.length - 1) || pos < 0) return
if (this.sliding) return this.$element.one('slid.bs.carousel', function () { that.to(pos) })
if (this.sliding) return this.$element.one('slid.bs.carousel', function () { that.to(pos) }) // yes, "slid". not a typo. past tense of "to slide".
if (activeIndex == pos) return this.pause().cycle()
return this.slide(pos > activeIndex ? 'next' : 'prev', $(this.$items[pos]))
@ -113,7 +113,7 @@
if (this.$indicators.length) {
this.$indicators.find('.active').removeClass('active')
this.$element.one('slid.bs.carousel', function () {
this.$element.one('slid.bs.carousel', function () { // yes, "slid". not a typo. past tense of "to slide".
var $nextIndicator = $(that.$indicators.children()[that.getActiveIndex()])
$nextIndicator && $nextIndicator.addClass('active')
})
@ -129,14 +129,14 @@
$next.removeClass([type, direction].join(' ')).addClass('active')
$active.removeClass(['active', direction].join(' '))
that.sliding = false
setTimeout(function () { that.$element.trigger('slid.bs.carousel') }, 0)
setTimeout(function () { that.$element.trigger('slid.bs.carousel') }, 0) // yes, "slid". not a typo. past tense of "to slide".
})
.emulateTransitionEnd($active.css('transition-duration').slice(0, -1) * 1000)
} else {
$active.removeClass('active')
$next.addClass('active')
this.sliding = false
this.$element.trigger('slid.bs.carousel')
this.$element.trigger('slid.bs.carousel') // yes, "slid". not a typo. past tense of "to slide".
}
isCycling && this.cycle()

13
vendor/assets/javascripts/bootstrap/collapse.js vendored
View file

@ -51,8 +51,7 @@
this.$element
.removeClass('collapse')
.addClass('collapsing')
[dimension](0)
.addClass('collapsing')[dimension](0)
this.transitioning = 1
@ -60,8 +59,7 @@
if (e && e.target != this.$element[0]) return
this.$element
.removeClass('collapsing')
.addClass('collapse in')
[dimension]('auto')
.addClass('collapse in')[dimension]('auto')
this.transitioning = 0
this.$element.trigger('shown.bs.collapse')
}
@ -72,8 +70,7 @@
this.$element
.one($.support.transition.end, $.proxy(complete, this))
.emulateTransitionEnd(350)
[dimension](this.$element[0][scrollSize])
.emulateTransitionEnd(350)[dimension](this.$element[0][scrollSize])
}
Collapse.prototype.hide = function () {
@ -85,9 +82,7 @@
var dimension = this.dimension()
this.$element
[dimension](this.$element[dimension]())
[0].offsetHeight
this.$element[dimension](this.$element[dimension]())[0].offsetHeight
this.$element
.addClass('collapsing')

4
vendor/assets/javascripts/bootstrap/dropdown.js vendored
View file

@ -40,11 +40,11 @@
if (e.isDefaultPrevented()) return
$this.trigger('focus')
$parent
.toggleClass('open')
.trigger('shown.bs.dropdown', relatedTarget)
$this.trigger('focus')
}
return false

3
vendor/assets/javascripts/bootstrap/scrollspy.js vendored
View file

@ -43,7 +43,8 @@
this.targets = $([])
var self = this
var $targets = this.$body
this.$body
.find(this.selector)
.map(function () {
var $el = $(this)

1
vendor/assets/javascripts/bootstrap/tooltip.js vendored
View file

@ -195,7 +195,6 @@
}
Tooltip.prototype.applyPlacement = function (offset, placement) {
var replace
var $tip = this.tip()
var width = $tip[0].offsetWidth
var height = $tip[0].offsetHeight

13
vendor/assets/stylesheets/bootstrap/_carousel.scss vendored
View file

@ -110,20 +110,22 @@
.icon-prev,
.glyphicon-chevron-left {
left: 50%;
margin-left: -10px;
}
.icon-next,
.glyphicon-chevron-right {
right: 50%;
margin-right: -10px;
}
.icon-prev,
.icon-next {
width: 20px;
height: 20px;
margin-top: -10px;
margin-left: -10px;
font-family: serif;
}
.icon-prev {
&:before {
content: '\2039';// SINGLE LEFT-POINTING ANGLE QUOTATION MARK (U+2039)
@ -213,9 +215,16 @@
width: 30px;
height: 30px;
margin-top: -15px;
margin-left: -15px;
font-size: 30px;
}
.glyphicon-chevron-left,
.icon-prev {
margin-left: -15px;
}
.glyphicon-chevron-right,
.icon-next {
margin-right: -15px;
}
}
// Show and left align the captions

5
vendor/assets/stylesheets/bootstrap/_variables.scss vendored
View file

@ -253,8 +253,8 @@ $dropdown-caret-color: #000 !default;
$zindex-navbar: 1000 !default;
$zindex-dropdown: 1000 !default;
$zindex-popover: 1010 !default;
$zindex-tooltip: 1030 !default;
$zindex-popover: 1060 !default; // $fix #13216
$zindex-tooltip: 1070 !default; // $fix #13216
$zindex-navbar-fixed: 1030 !default;
$zindex-modal-background: 1040 !default;
$zindex-modal: 1050 !default;
@ -266,6 +266,7 @@ $zindex-modal: 1050 !default;
// Extra small screen / phone
// Note: Deprecated $screen-xs and $screen-phone as of v3.0.1
// Note: Deprecated $screen-xs-min as of v3.2.0
$screen-xs: 480px !default;
$screen-xs-min: $screen-xs !default;
$screen-phone: $screen-xs-min !default;