Skip to content

Commit b01ab49

Browse files
glebmglebm
committed
rake convert
1 parent 2579e33 commit b01ab49

File tree

6 files changed

+28
-26
lines changed

6 files changed

+28
-26
lines changed

‎assets/javascripts/bootstrap.js

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1437,13 +1437,12 @@ if (typeof jQuery === 'undefined') {
14371437

14381438
if (autoPlace) {
14391439
var orgPlacement = placement
1440-
var $container = this.options.container ? $(this.options.container) : this.$element.parent()
1441-
var containerDim = this.getPosition($container)
1440+
var viewportDim = this.getPosition(this.$viewport)
14421441

1443-
placement = placement == 'bottom' && pos.bottom + actualHeight > containerDim.bottom ? 'top' :
1444-
placement == 'top' && pos.top - actualHeight < containerDim.top ? 'bottom' :
1445-
placement == 'right' && pos.right + actualWidth > containerDim.width ? 'left' :
1446-
placement == 'left' && pos.left - actualWidth < containerDim.left ? 'right' :
1442+
placement = placement == 'bottom' && pos.bottom + actualHeight > viewportDim.bottom ? 'top' :
1443+
placement == 'top' && pos.top - actualHeight < viewportDim.top ? 'bottom' :
1444+
placement == 'right' && pos.right + actualWidth > viewportDim.width ? 'left' :
1445+
placement == 'left' && pos.left - actualWidth < viewportDim.left ? 'right' :
14471446
placement
14481447

14491448
$tip

‎assets/javascripts/bootstrap.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎assets/javascripts/bootstrap/tooltip.js

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -193,13 +193,12 @@
193193

194194
if (autoPlace) {
195195
var orgPlacement = placement
196-
var $container = this.options.container ? $(this.options.container) : this.$element.parent()
197-
var containerDim = this.getPosition($container)
196+
var viewportDim = this.getPosition(this.$viewport)
198197

199-
placement = placement == 'bottom' && pos.bottom + actualHeight > containerDim.bottom ? 'top' :
200-
placement == 'top' && pos.top - actualHeight < containerDim.top ? 'bottom' :
201-
placement == 'right' && pos.right + actualWidth > containerDim.width ? 'left' :
202-
placement == 'left' && pos.left - actualWidth < containerDim.left ? 'right' :
198+
placement = placement == 'bottom' && pos.bottom + actualHeight > viewportDim.bottom ? 'top' :
199+
placement == 'top' && pos.top - actualHeight < viewportDim.top ? 'bottom' :
200+
placement == 'right' && pos.right + actualWidth > viewportDim.width ? 'left' :
201+
placement == 'left' && pos.left - actualWidth < viewportDim.left ? 'right' :
203202
placement
204203

205204
$tip

‎assets/stylesheets/bootstrap/_glyphicons.scss

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,17 @@
77
//
88
// <a href="#"><span class="glyphicon glyphicon-star"></span> Star</a>
99

10-
// Import the fonts
11-
@font-face {
12-
font-family: 'Glyphicons Halflings';
13-
src: url(if($bootstrap-sass-asset-helper, twbs-font-path('#{$icon-font-path}#{$icon-font-name}.eot'), '#{$icon-font-path}#{$icon-font-name}.eot'));
14-
src: url(if($bootstrap-sass-asset-helper, twbs-font-path('#{$icon-font-path}#{$icon-font-name}.eot?#iefix'), '#{$icon-font-path}#{$icon-font-name}.eot?#iefix')) format('embedded-opentype'),
15-
url(if($bootstrap-sass-asset-helper, twbs-font-path('#{$icon-font-path}#{$icon-font-name}.woff2'), '#{$icon-font-path}#{$icon-font-name}.woff2')) format('woff2'),
16-
url(if($bootstrap-sass-asset-helper, twbs-font-path('#{$icon-font-path}#{$icon-font-name}.woff'), '#{$icon-font-path}#{$icon-font-name}.woff')) format('woff'),
17-
url(if($bootstrap-sass-asset-helper, twbs-font-path('#{$icon-font-path}#{$icon-font-name}.ttf'), '#{$icon-font-path}#{$icon-font-name}.ttf')) format('truetype'),
18-
url(if($bootstrap-sass-asset-helper, twbs-font-path('#{$icon-font-path}#{$icon-font-name}.svg##{$icon-font-svg-id}'), '#{$icon-font-path}#{$icon-font-name}.svg##{$icon-font-svg-id}')) format('svg');
10+
@at-root {
11+
// Import the fonts
12+
@font-face {
13+
font-family: 'Glyphicons Halflings';
14+
src: url(if($bootstrap-sass-asset-helper, twbs-font-path('#{$icon-font-path}#{$icon-font-name}.eot'), '#{$icon-font-path}#{$icon-font-name}.eot'));
15+
src: url(if($bootstrap-sass-asset-helper, twbs-font-path('#{$icon-font-path}#{$icon-font-name}.eot?#iefix'), '#{$icon-font-path}#{$icon-font-name}.eot?#iefix')) format('embedded-opentype'),
16+
url(if($bootstrap-sass-asset-helper, twbs-font-path('#{$icon-font-path}#{$icon-font-name}.woff2'), '#{$icon-font-path}#{$icon-font-name}.woff2')) format('woff2'),
17+
url(if($bootstrap-sass-asset-helper, twbs-font-path('#{$icon-font-path}#{$icon-font-name}.woff'), '#{$icon-font-path}#{$icon-font-name}.woff')) format('woff'),
18+
url(if($bootstrap-sass-asset-helper, twbs-font-path('#{$icon-font-path}#{$icon-font-name}.ttf'), '#{$icon-font-path}#{$icon-font-name}.ttf')) format('truetype'),
19+
url(if($bootstrap-sass-asset-helper, twbs-font-path('#{$icon-font-path}#{$icon-font-name}.svg##{$icon-font-svg-id}'), '#{$icon-font-path}#{$icon-font-name}.svg##{$icon-font-svg-id}')) format('svg');
20+
}
1921
}
2022

2123
// Catchall baseclass

‎assets/stylesheets/bootstrap/_responsive-utilities.scss

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,10 @@
1818
// Source: http://timkadlec.com/2013/01/windows-phone-8-and-device-width/
1919
// Source: http://timkadlec.com/2012/10/ie10-snap-mode-and-responsive-design/
2020

21-
@-ms-viewport {
22-
width: device-width;
21+
@at-root {
22+
@-ms-viewport {
23+
width: device-width;
24+
}
2325
}
2426

2527

‎lib/bootstrap-sass/version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
module Bootstrap
22
VERSION = '3.3.4.1'
3-
BOOTSTRAP_SHA = 'cdb37dce3a85c07790e73b7e2c809860db6b0cad'
3+
BOOTSTRAP_SHA = 'd87b7a037bbfa74fb75b6ab845803437991ec598'
44
end

0 commit comments

Comments
 (0)