twbs_less_rails 2.16.1 → 2.17.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Appraisals +3 -10
- data/CHANGELOG.md +4 -0
- data/LICENSE +1 -1
- data/app/assets/fonts/glyphicons-halflings-regular.eot +0 -0
- data/app/assets/fonts/glyphicons-halflings-regular.svg +273 -214
- data/app/assets/fonts/glyphicons-halflings-regular.ttf +0 -0
- data/app/assets/fonts/glyphicons-halflings-regular.woff +0 -0
- data/app/assets/fonts/glyphicons-halflings-regular.woff2 +0 -0
- data/gemfiles/rails_3.2.gemfile +1 -2
- data/gemfiles/rails_4.0.gemfile +1 -3
- data/gemfiles/rails_4.1.gemfile +1 -3
- data/gemfiles/rails_4.2.gemfile +0 -2
- data/lib/twbs_less_rails/version.rb +1 -1
- data/test/integration/twbs_less_rails_integration_test.rb +1 -0
- data/twbs_less_rails.gemspec +1 -0
- data/vendor/assets/javascripts/twbs/bootstrap/affix.js +4 -4
- data/vendor/assets/javascripts/twbs/bootstrap/alert.js +3 -3
- data/vendor/assets/javascripts/twbs/bootstrap/button.js +3 -3
- data/vendor/assets/javascripts/twbs/bootstrap/carousel.js +7 -10
- data/vendor/assets/javascripts/twbs/bootstrap/collapse.js +4 -4
- data/vendor/assets/javascripts/twbs/bootstrap/dropdown.js +3 -3
- data/vendor/assets/javascripts/twbs/bootstrap/modal.js +3 -3
- data/vendor/assets/javascripts/twbs/bootstrap/popover.js +7 -13
- data/vendor/assets/javascripts/twbs/bootstrap/scrollspy.js +3 -3
- data/vendor/assets/javascripts/twbs/bootstrap/tab.js +3 -3
- data/vendor/assets/javascripts/twbs/bootstrap/tooltip.js +10 -16
- data/vendor/assets/javascripts/twbs/bootstrap/transition.js +2 -2
- data/vendor/assets/stylesheets/twbs/bootstrap/alerts.less +5 -0
- data/vendor/assets/stylesheets/twbs/bootstrap/badges.less +4 -0
- data/vendor/assets/stylesheets/twbs/bootstrap/button-groups.less +2 -2
- data/vendor/assets/stylesheets/twbs/bootstrap/buttons.less +1 -1
- data/vendor/assets/stylesheets/twbs/bootstrap/carousel.less +8 -6
- data/vendor/assets/stylesheets/twbs/bootstrap/close.less +1 -0
- data/vendor/assets/stylesheets/twbs/bootstrap/dropdowns.less +2 -1
- data/vendor/assets/stylesheets/twbs/bootstrap/forms.less +41 -21
- data/vendor/assets/stylesheets/twbs/bootstrap/glyphicons.less +67 -0
- data/vendor/assets/stylesheets/twbs/bootstrap/jumbotron.less +1 -0
- data/vendor/assets/stylesheets/twbs/bootstrap/media.less +14 -0
- data/vendor/assets/stylesheets/twbs/bootstrap/mixins/vendor-prefixes.less +1 -1
- data/vendor/assets/stylesheets/twbs/bootstrap/navbar.less +1 -0
- data/vendor/assets/stylesheets/twbs/bootstrap/panels.less +5 -1
- data/vendor/assets/stylesheets/twbs/bootstrap/popovers.less +1 -1
- data/vendor/assets/stylesheets/twbs/bootstrap/tables.less +3 -3
- data/vendor/assets/stylesheets/twbs/bootstrap/theme.less +3 -2
- data/vendor/assets/stylesheets/twbs/bootstrap/tooltip.less +1 -1
- data/vendor/assets/stylesheets/twbs/bootstrap/variables.less +3 -2
- metadata +18 -3
Binary file
|
Binary file
|
Binary file
|
data/gemfiles/rails_3.2.gemfile
CHANGED
data/gemfiles/rails_4.0.gemfile
CHANGED
data/gemfiles/rails_4.1.gemfile
CHANGED
data/gemfiles/rails_4.2.gemfile
CHANGED
@@ -34,5 +34,6 @@ describe "twbs less rails integration" do
|
|
34
34
|
visit '/assets/glyphicons-halflings-regular.svg'
|
35
35
|
visit '/assets/glyphicons-halflings-regular.ttf'
|
36
36
|
visit '/assets/glyphicons-halflings-regular.woff'
|
37
|
+
visit '/assets/glyphicons-halflings-regular.woff2'
|
37
38
|
end
|
38
39
|
end
|
data/twbs_less_rails.gemspec
CHANGED
@@ -1,8 +1,8 @@
|
|
1
1
|
/* ========================================================================
|
2
|
-
* Bootstrap: affix.js v3.3.
|
2
|
+
* Bootstrap: affix.js v3.3.2
|
3
3
|
* http://getbootstrap.com/javascript/#affix
|
4
4
|
* ========================================================================
|
5
|
-
* Copyright 2011-
|
5
|
+
* Copyright 2011-2015 Twitter, Inc.
|
6
6
|
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
|
7
7
|
* ======================================================================== */
|
8
8
|
|
@@ -28,7 +28,7 @@
|
|
28
28
|
this.checkPosition()
|
29
29
|
}
|
30
30
|
|
31
|
-
Affix.VERSION = '3.3.
|
31
|
+
Affix.VERSION = '3.3.2'
|
32
32
|
|
33
33
|
Affix.RESET = 'affix affix-top affix-bottom'
|
34
34
|
|
@@ -53,7 +53,7 @@
|
|
53
53
|
var colliderTop = initializing ? scrollTop : position.top
|
54
54
|
var colliderHeight = initializing ? targetHeight : height
|
55
55
|
|
56
|
-
if (offsetTop != null &&
|
56
|
+
if (offsetTop != null && scrollTop <= offsetTop) return 'top'
|
57
57
|
if (offsetBottom != null && (colliderTop + colliderHeight >= scrollHeight - offsetBottom)) return 'bottom'
|
58
58
|
|
59
59
|
return false
|
@@ -1,8 +1,8 @@
|
|
1
1
|
/* ========================================================================
|
2
|
-
* Bootstrap: alert.js v3.3.
|
2
|
+
* Bootstrap: alert.js v3.3.2
|
3
3
|
* http://getbootstrap.com/javascript/#alerts
|
4
4
|
* ========================================================================
|
5
|
-
* Copyright 2011-
|
5
|
+
* Copyright 2011-2015 Twitter, Inc.
|
6
6
|
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
|
7
7
|
* ======================================================================== */
|
8
8
|
|
@@ -18,7 +18,7 @@
|
|
18
18
|
$(el).on('click', dismiss, this.close)
|
19
19
|
}
|
20
20
|
|
21
|
-
Alert.VERSION = '3.3.
|
21
|
+
Alert.VERSION = '3.3.2'
|
22
22
|
|
23
23
|
Alert.TRANSITION_DURATION = 150
|
24
24
|
|
@@ -1,8 +1,8 @@
|
|
1
1
|
/* ========================================================================
|
2
|
-
* Bootstrap: button.js v3.3.
|
2
|
+
* Bootstrap: button.js v3.3.2
|
3
3
|
* http://getbootstrap.com/javascript/#buttons
|
4
4
|
* ========================================================================
|
5
|
-
* Copyright 2011-
|
5
|
+
* Copyright 2011-2015 Twitter, Inc.
|
6
6
|
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
|
7
7
|
* ======================================================================== */
|
8
8
|
|
@@ -19,7 +19,7 @@
|
|
19
19
|
this.isLoading = false
|
20
20
|
}
|
21
21
|
|
22
|
-
Button.VERSION = '3.3.
|
22
|
+
Button.VERSION = '3.3.2'
|
23
23
|
|
24
24
|
Button.DEFAULTS = {
|
25
25
|
loadingText: 'loading...'
|
@@ -1,8 +1,8 @@
|
|
1
1
|
/* ========================================================================
|
2
|
-
* Bootstrap: carousel.js v3.3.
|
2
|
+
* Bootstrap: carousel.js v3.3.2
|
3
3
|
* http://getbootstrap.com/javascript/#carousel
|
4
4
|
* ========================================================================
|
5
|
-
* Copyright 2011-
|
5
|
+
* Copyright 2011-2015 Twitter, Inc.
|
6
6
|
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
|
7
7
|
* ======================================================================== */
|
8
8
|
|
@@ -30,7 +30,7 @@
|
|
30
30
|
.on('mouseleave.bs.carousel', $.proxy(this.cycle, this))
|
31
31
|
}
|
32
32
|
|
33
|
-
Carousel.VERSION = '3.3.
|
33
|
+
Carousel.VERSION = '3.3.2'
|
34
34
|
|
35
35
|
Carousel.TRANSITION_DURATION = 600
|
36
36
|
|
@@ -70,8 +70,11 @@
|
|
70
70
|
}
|
71
71
|
|
72
72
|
Carousel.prototype.getItemForDirection = function (direction, active) {
|
73
|
-
var delta = direction == 'prev' ? -1 : 1
|
74
73
|
var activeIndex = this.getItemIndex(active)
|
74
|
+
var willWrap = (direction == 'prev' && activeIndex === 0)
|
75
|
+
|| (direction == 'next' && activeIndex == (this.$items.length - 1))
|
76
|
+
if (willWrap && !this.options.wrap) return active
|
77
|
+
var delta = direction == 'prev' ? -1 : 1
|
75
78
|
var itemIndex = (activeIndex + delta) % this.$items.length
|
76
79
|
return this.$items.eq(itemIndex)
|
77
80
|
}
|
@@ -116,14 +119,8 @@
|
|
116
119
|
var $next = next || this.getItemForDirection(type, $active)
|
117
120
|
var isCycling = this.interval
|
118
121
|
var direction = type == 'next' ? 'left' : 'right'
|
119
|
-
var fallback = type == 'next' ? 'first' : 'last'
|
120
122
|
var that = this
|
121
123
|
|
122
|
-
if (!$next.length) {
|
123
|
-
if (!this.options.wrap) return
|
124
|
-
$next = this.$element.find('.item')[fallback]()
|
125
|
-
}
|
126
|
-
|
127
124
|
if ($next.hasClass('active')) return (this.sliding = false)
|
128
125
|
|
129
126
|
var relatedTarget = $next[0]
|
@@ -1,8 +1,8 @@
|
|
1
1
|
/* ========================================================================
|
2
|
-
* Bootstrap: collapse.js v3.3.
|
2
|
+
* Bootstrap: collapse.js v3.3.2
|
3
3
|
* http://getbootstrap.com/javascript/#collapse
|
4
4
|
* ========================================================================
|
5
|
-
* Copyright 2011-
|
5
|
+
* Copyright 2011-2015 Twitter, Inc.
|
6
6
|
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
|
7
7
|
* ======================================================================== */
|
8
8
|
|
@@ -28,7 +28,7 @@
|
|
28
28
|
if (this.options.toggle) this.toggle()
|
29
29
|
}
|
30
30
|
|
31
|
-
Collapse.VERSION = '3.3.
|
31
|
+
Collapse.VERSION = '3.3.2'
|
32
32
|
|
33
33
|
Collapse.TRANSITION_DURATION = 350
|
34
34
|
|
@@ -46,7 +46,7 @@
|
|
46
46
|
if (this.transitioning || this.$element.hasClass('in')) return
|
47
47
|
|
48
48
|
var activesData
|
49
|
-
var actives = this.$parent && this.$parent.
|
49
|
+
var actives = this.$parent && this.$parent.children('.panel').children('.in, .collapsing')
|
50
50
|
|
51
51
|
if (actives && actives.length) {
|
52
52
|
activesData = actives.data('bs.collapse')
|
@@ -1,8 +1,8 @@
|
|
1
1
|
/* ========================================================================
|
2
|
-
* Bootstrap: dropdown.js v3.3.
|
2
|
+
* Bootstrap: dropdown.js v3.3.2
|
3
3
|
* http://getbootstrap.com/javascript/#dropdowns
|
4
4
|
* ========================================================================
|
5
|
-
* Copyright 2011-
|
5
|
+
* Copyright 2011-2015 Twitter, Inc.
|
6
6
|
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
|
7
7
|
* ======================================================================== */
|
8
8
|
|
@@ -19,7 +19,7 @@
|
|
19
19
|
$(element).on('click.bs.dropdown', this.toggle)
|
20
20
|
}
|
21
21
|
|
22
|
-
Dropdown.VERSION = '3.3.
|
22
|
+
Dropdown.VERSION = '3.3.2'
|
23
23
|
|
24
24
|
Dropdown.prototype.toggle = function (e) {
|
25
25
|
var $this = $(this)
|
@@ -1,8 +1,8 @@
|
|
1
1
|
/* ========================================================================
|
2
|
-
* Bootstrap: modal.js v3.3.
|
2
|
+
* Bootstrap: modal.js v3.3.2
|
3
3
|
* http://getbootstrap.com/javascript/#modals
|
4
4
|
* ========================================================================
|
5
|
-
* Copyright 2011-
|
5
|
+
* Copyright 2011-2015 Twitter, Inc.
|
6
6
|
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
|
7
7
|
* ======================================================================== */
|
8
8
|
|
@@ -30,7 +30,7 @@
|
|
30
30
|
}
|
31
31
|
}
|
32
32
|
|
33
|
-
Modal.VERSION = '3.3.
|
33
|
+
Modal.VERSION = '3.3.2'
|
34
34
|
|
35
35
|
Modal.TRANSITION_DURATION = 300
|
36
36
|
Modal.BACKDROP_TRANSITION_DURATION = 150
|
@@ -1,8 +1,8 @@
|
|
1
1
|
/* ========================================================================
|
2
|
-
* Bootstrap: popover.js v3.3.
|
2
|
+
* Bootstrap: popover.js v3.3.2
|
3
3
|
* http://getbootstrap.com/javascript/#popovers
|
4
4
|
* ========================================================================
|
5
|
-
* Copyright 2011-
|
5
|
+
* Copyright 2011-2015 Twitter, Inc.
|
6
6
|
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
|
7
7
|
* ======================================================================== */
|
8
8
|
|
@@ -19,7 +19,7 @@
|
|
19
19
|
|
20
20
|
if (!$.fn.tooltip) throw new Error('Popover requires tooltip.js')
|
21
21
|
|
22
|
-
Popover.VERSION = '3.3.
|
22
|
+
Popover.VERSION = '3.3.2'
|
23
23
|
|
24
24
|
Popover.DEFAULTS = $.extend({}, $.fn.tooltip.Constructor.DEFAULTS, {
|
25
25
|
placement: 'right',
|
@@ -86,18 +86,12 @@
|
|
86
86
|
|
87
87
|
function Plugin(option) {
|
88
88
|
return this.each(function () {
|
89
|
-
var $this
|
90
|
-
var data
|
91
|
-
var options
|
92
|
-
var selector = options && options.selector
|
89
|
+
var $this = $(this)
|
90
|
+
var data = $this.data('bs.popover')
|
91
|
+
var options = typeof option == 'object' && option
|
93
92
|
|
94
93
|
if (!data && option == 'destroy') return
|
95
|
-
if (
|
96
|
-
if (!data) $this.data('bs.popover', (data = {}))
|
97
|
-
if (!data[selector]) data[selector] = new Popover(this, options)
|
98
|
-
} else {
|
99
|
-
if (!data) $this.data('bs.popover', (data = new Popover(this, options)))
|
100
|
-
}
|
94
|
+
if (!data) $this.data('bs.popover', (data = new Popover(this, options)))
|
101
95
|
if (typeof option == 'string') data[option]()
|
102
96
|
})
|
103
97
|
}
|
@@ -1,8 +1,8 @@
|
|
1
1
|
/* ========================================================================
|
2
|
-
* Bootstrap: scrollspy.js v3.3.
|
2
|
+
* Bootstrap: scrollspy.js v3.3.2
|
3
3
|
* http://getbootstrap.com/javascript/#scrollspy
|
4
4
|
* ========================================================================
|
5
|
-
* Copyright 2011-
|
5
|
+
* Copyright 2011-2015 Twitter, Inc.
|
6
6
|
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
|
7
7
|
* ======================================================================== */
|
8
8
|
|
@@ -30,7 +30,7 @@
|
|
30
30
|
this.process()
|
31
31
|
}
|
32
32
|
|
33
|
-
ScrollSpy.VERSION = '3.3.
|
33
|
+
ScrollSpy.VERSION = '3.3.2'
|
34
34
|
|
35
35
|
ScrollSpy.DEFAULTS = {
|
36
36
|
offset: 10
|
@@ -1,8 +1,8 @@
|
|
1
1
|
/* ========================================================================
|
2
|
-
* Bootstrap: tab.js v3.3.
|
2
|
+
* Bootstrap: tab.js v3.3.2
|
3
3
|
* http://getbootstrap.com/javascript/#tabs
|
4
4
|
* ========================================================================
|
5
|
-
* Copyright 2011-
|
5
|
+
* Copyright 2011-2015 Twitter, Inc.
|
6
6
|
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
|
7
7
|
* ======================================================================== */
|
8
8
|
|
@@ -17,7 +17,7 @@
|
|
17
17
|
this.element = $(element)
|
18
18
|
}
|
19
19
|
|
20
|
-
Tab.VERSION = '3.3.
|
20
|
+
Tab.VERSION = '3.3.2'
|
21
21
|
|
22
22
|
Tab.TRANSITION_DURATION = 150
|
23
23
|
|
@@ -1,9 +1,9 @@
|
|
1
1
|
/* ========================================================================
|
2
|
-
* Bootstrap: tooltip.js v3.3.
|
2
|
+
* Bootstrap: tooltip.js v3.3.2
|
3
3
|
* http://getbootstrap.com/javascript/#tooltip
|
4
4
|
* Inspired by the original jQuery.tipsy by Jason Frame
|
5
5
|
* ========================================================================
|
6
|
-
* Copyright 2011-
|
6
|
+
* Copyright 2011-2015 Twitter, Inc.
|
7
7
|
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
|
8
8
|
* ======================================================================== */
|
9
9
|
|
@@ -25,7 +25,7 @@
|
|
25
25
|
this.init('tooltip', element, options)
|
26
26
|
}
|
27
27
|
|
28
|
-
Tooltip.VERSION = '3.3.
|
28
|
+
Tooltip.VERSION = '3.3.2'
|
29
29
|
|
30
30
|
Tooltip.TRANSITION_DURATION = 150
|
31
31
|
|
@@ -346,10 +346,10 @@
|
|
346
346
|
}
|
347
347
|
|
348
348
|
Tooltip.prototype.getCalculatedOffset = function (placement, pos, actualWidth, actualHeight) {
|
349
|
-
return placement == 'bottom' ? { top: pos.top + pos.height, left: pos.left + pos.width / 2 - actualWidth / 2
|
350
|
-
placement == 'top' ? { top: pos.top - actualHeight, left: pos.left + pos.width / 2 - actualWidth / 2
|
349
|
+
return placement == 'bottom' ? { top: pos.top + pos.height, left: pos.left + pos.width / 2 - actualWidth / 2 } :
|
350
|
+
placement == 'top' ? { top: pos.top - actualHeight, left: pos.left + pos.width / 2 - actualWidth / 2 } :
|
351
351
|
placement == 'left' ? { top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left - actualWidth } :
|
352
|
-
/* placement == 'right' */ { top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width
|
352
|
+
/* placement == 'right' */ { top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width }
|
353
353
|
|
354
354
|
}
|
355
355
|
|
@@ -445,18 +445,12 @@
|
|
445
445
|
|
446
446
|
function Plugin(option) {
|
447
447
|
return this.each(function () {
|
448
|
-
var $this
|
449
|
-
var data
|
450
|
-
var options
|
451
|
-
var selector = options && options.selector
|
448
|
+
var $this = $(this)
|
449
|
+
var data = $this.data('bs.tooltip')
|
450
|
+
var options = typeof option == 'object' && option
|
452
451
|
|
453
452
|
if (!data && option == 'destroy') return
|
454
|
-
if (
|
455
|
-
if (!data) $this.data('bs.tooltip', (data = {}))
|
456
|
-
if (!data[selector]) data[selector] = new Tooltip(this, options)
|
457
|
-
} else {
|
458
|
-
if (!data) $this.data('bs.tooltip', (data = new Tooltip(this, options)))
|
459
|
-
}
|
453
|
+
if (!data) $this.data('bs.tooltip', (data = new Tooltip(this, options)))
|
460
454
|
if (typeof option == 'string') data[option]()
|
461
455
|
})
|
462
456
|
}
|
@@ -1,8 +1,8 @@
|
|
1
1
|
/* ========================================================================
|
2
|
-
* Bootstrap: transition.js v3.3.
|
2
|
+
* Bootstrap: transition.js v3.3.2
|
3
3
|
* http://getbootstrap.com/javascript/#transitions
|
4
4
|
* ========================================================================
|
5
|
-
* Copyright 2011-
|
5
|
+
* Copyright 2011-2015 Twitter, Inc.
|
6
6
|
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
|
7
7
|
* ======================================================================== */
|
8
8
|
|
@@ -18,6 +18,7 @@
|
|
18
18
|
// Specified for the h4 to prevent conflicts of changing @headings-color
|
19
19
|
color: inherit;
|
20
20
|
}
|
21
|
+
|
21
22
|
// Provide class for links that match alerts
|
22
23
|
.alert-link {
|
23
24
|
font-weight: @alert-link-font-weight;
|
@@ -28,6 +29,7 @@
|
|
28
29
|
> ul {
|
29
30
|
margin-bottom: 0;
|
30
31
|
}
|
32
|
+
|
31
33
|
> p + p {
|
32
34
|
margin-top: 5px;
|
33
35
|
}
|
@@ -57,12 +59,15 @@
|
|
57
59
|
.alert-success {
|
58
60
|
.alert-variant(@alert-success-bg; @alert-success-border; @alert-success-text);
|
59
61
|
}
|
62
|
+
|
60
63
|
.alert-info {
|
61
64
|
.alert-variant(@alert-info-bg; @alert-info-border; @alert-info-text);
|
62
65
|
}
|
66
|
+
|
63
67
|
.alert-warning {
|
64
68
|
.alert-variant(@alert-warning-bg; @alert-warning-border; @alert-warning-text);
|
65
69
|
}
|
70
|
+
|
66
71
|
.alert-danger {
|
67
72
|
.alert-variant(@alert-danger-bg; @alert-danger-border; @alert-danger-text);
|
68
73
|
}
|
@@ -28,6 +28,7 @@
|
|
28
28
|
position: relative;
|
29
29
|
top: -1px;
|
30
30
|
}
|
31
|
+
|
31
32
|
.btn-xs & {
|
32
33
|
top: 0;
|
33
34
|
padding: 1px 5px;
|
@@ -49,12 +50,15 @@
|
|
49
50
|
color: @badge-active-color;
|
50
51
|
background-color: @badge-active-bg;
|
51
52
|
}
|
53
|
+
|
52
54
|
.list-group-item > & {
|
53
55
|
float: right;
|
54
56
|
}
|
57
|
+
|
55
58
|
.list-group-item > & + & {
|
56
59
|
margin-right: 5px;
|
57
60
|
}
|
61
|
+
|
58
62
|
.nav-pills > li > a > & {
|
59
63
|
margin-left: 3px;
|
60
64
|
}
|