Skip to content

Commit bf96b0b

Browse files
committed
rake convert
1 parent 0158151 commit bf96b0b

File tree

6 files changed

+7
-6
lines changed

6 files changed

+7
-6
lines changed

assets/javascripts/bootstrap.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*!
22
* Bootstrap v3.3.4 (http://getbootstrap.com)
33
* Copyright 2011-2015 Twitter, Inc.
4-
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
4+
* Licensed under the MIT license
55
*/
66

77
if (typeof jQuery === 'undefined') {

assets/javascripts/bootstrap.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

assets/javascripts/bootstrap/dropdown.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@
110110
}
111111

112112
var desc = ' li:not(.disabled):visible a'
113-
var $items = $parent.find('[role="menu"]' + desc + ', [role="listbox"]' + desc)
113+
var $items = $parent.find('.dropdown-menu' + desc)
114114

115115
if (!$items.length) return
116116

assets/stylesheets/bootstrap/_dropdowns.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,8 @@
185185
// Reverse the caret
186186
.caret {
187187
border-top: 0;
188-
border-bottom: $caret-width-base solid;
188+
border-bottom: $caret-width-base dashed;
189+
border-bottom: $caret-width-base solid \9; // IE8
189190
content: "";
190191
}
191192
// Different positioning for bottom up menu

assets/stylesheets/bootstrap/mixins/_hide-text.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// CSS image replacement
22
//
3-
// Heads up! v3 launched with with only `.hide-text()`, but per our pattern for
3+
// Heads up! v3 launched with only `.hide-text()`, but per our pattern for
44
// mixins being reused as classes with the same name, this doesn't hold up. As
55
// of v3.0.1 we have added `.text-hide()` and deprecated `.hide-text()`.
66
//

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 = '3487898a6af8c1d5b12f7b040d30e71b19e34923'
3+
BOOTSTRAP_SHA = 'e11f7ffa797f8422f016576cb7c2f5bb6f66aa51'
44
end

0 commit comments

Comments
 (0)