bootstrap-sass 2.0.4.2 → 2.1.0.0

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.


This version of bootstrap-sass might be problematic. Click here for more details.

Files changed (57) hide show
  1. data/README.md +3 -6
  2. data/vendor/assets/images/glyphicons-halflings.png +0 -0
  3. data/vendor/assets/javascripts/bootstrap-affix.js +104 -0
  4. data/vendor/assets/javascripts/bootstrap-alert.js +1 -1
  5. data/vendor/assets/javascripts/bootstrap-button.js +1 -1
  6. data/vendor/assets/javascripts/bootstrap-carousel.js +12 -5
  7. data/vendor/assets/javascripts/bootstrap-collapse.js +4 -3
  8. data/vendor/assets/javascripts/bootstrap-dropdown.js +66 -16
  9. data/vendor/assets/javascripts/bootstrap-modal.js +95 -74
  10. data/vendor/assets/javascripts/bootstrap-popover.js +9 -4
  11. data/vendor/assets/javascripts/bootstrap-scrollspy.js +9 -9
  12. data/vendor/assets/javascripts/bootstrap-tab.js +2 -2
  13. data/vendor/assets/javascripts/bootstrap-tooltip.js +15 -15
  14. data/vendor/assets/javascripts/bootstrap-transition.js +2 -3
  15. data/vendor/assets/javascripts/bootstrap-typeahead.js +51 -36
  16. data/vendor/assets/javascripts/bootstrap.js +1 -0
  17. data/vendor/assets/stylesheets/_bootstrap-responsive.scss +15 -8
  18. data/vendor/assets/stylesheets/_bootstrap.scss +2 -2
  19. data/vendor/assets/stylesheets/bootstrap/_accordion.scss +3 -2
  20. data/vendor/assets/stylesheets/bootstrap/_alerts.scss +19 -10
  21. data/vendor/assets/stylesheets/bootstrap/_breadcrumbs.scss +11 -11
  22. data/vendor/assets/stylesheets/bootstrap/_button-groups.scss +94 -28
  23. data/vendor/assets/stylesheets/bootstrap/_buttons.scss +94 -54
  24. data/vendor/assets/stylesheets/bootstrap/_carousel.scss +22 -7
  25. data/vendor/assets/stylesheets/bootstrap/_close.scss +5 -3
  26. data/vendor/assets/stylesheets/bootstrap/_code.scss +8 -6
  27. data/vendor/assets/stylesheets/bootstrap/_component-animations.scss +7 -4
  28. data/vendor/assets/stylesheets/bootstrap/_dropdowns.scss +90 -17
  29. data/vendor/assets/stylesheets/bootstrap/_forms.scss +243 -90
  30. data/vendor/assets/stylesheets/bootstrap/_grid.scss +17 -2
  31. data/vendor/assets/stylesheets/bootstrap/_hero-unit.scss +4 -2
  32. data/vendor/assets/stylesheets/bootstrap/_labels-badges.scss +25 -5
  33. data/vendor/assets/stylesheets/bootstrap/_layouts.scss +1 -2
  34. data/vendor/assets/stylesheets/bootstrap/_mixins.scss +143 -134
  35. data/vendor/assets/stylesheets/bootstrap/_modals.scss +13 -6
  36. data/vendor/assets/stylesheets/bootstrap/_navbar.scss +263 -141
  37. data/vendor/assets/stylesheets/bootstrap/_navs.scss +75 -31
  38. data/vendor/assets/stylesheets/bootstrap/_pager.scss +7 -5
  39. data/vendor/assets/stylesheets/bootstrap/_pagination.scss +22 -11
  40. data/vendor/assets/stylesheets/bootstrap/_popovers.scss +101 -33
  41. data/vendor/assets/stylesheets/bootstrap/_progress-bars.scss +23 -19
  42. data/vendor/assets/stylesheets/bootstrap/_reset.scss +35 -11
  43. data/vendor/assets/stylesheets/bootstrap/_responsive-1200px-min.scss +9 -7
  44. data/vendor/assets/stylesheets/bootstrap/_responsive-767px-max.scss +103 -72
  45. data/vendor/assets/stylesheets/bootstrap/_responsive-768px-979px.scss +8 -5
  46. data/vendor/assets/stylesheets/bootstrap/_responsive-navbar.scss +26 -9
  47. data/vendor/assets/stylesheets/bootstrap/_responsive-utilities.scss +17 -15
  48. data/vendor/assets/stylesheets/bootstrap/_scaffolding.scss +26 -4
  49. data/vendor/assets/stylesheets/bootstrap/_sprites.scss +19 -9
  50. data/vendor/assets/stylesheets/bootstrap/_tables.scss +94 -23
  51. data/vendor/assets/stylesheets/bootstrap/_thumbnails.scss +10 -7
  52. data/vendor/assets/stylesheets/bootstrap/_tooltip.scss +47 -12
  53. data/vendor/assets/stylesheets/bootstrap/_type.scss +71 -89
  54. data/vendor/assets/stylesheets/bootstrap/_utilities.scss +9 -2
  55. data/vendor/assets/stylesheets/bootstrap/_variables.scss +108 -68
  56. data/vendor/assets/stylesheets/bootstrap/_wells.scss +8 -6
  57. metadata +3 -2
@@ -1,5 +1,5 @@
1
1
  /* ===========================================================
2
- * bootstrap-popover.js v2.0.4
2
+ * bootstrap-popover.js v2.1.0
3
3
  * http://twitter.github.com/bootstrap/javascript.html#popovers
4
4
  * ===========================================================
5
5
  * Copyright 2012 Twitter, Inc.
@@ -26,7 +26,7 @@
26
26
  /* POPOVER PUBLIC CLASS DEFINITION
27
27
  * =============================== */
28
28
 
29
- var Popover = function ( element, options ) {
29
+ var Popover = function (element, options) {
30
30
  this.init('popover', element, options)
31
31
  }
32
32
 
@@ -43,8 +43,8 @@
43
43
  , title = this.getTitle()
44
44
  , content = this.getContent()
45
45
 
46
- $tip.find('.popover-title')[this.isHTML(title) ? 'html' : 'text'](title)
47
- $tip.find('.popover-content > *')[this.isHTML(content) ? 'html' : 'text'](content)
46
+ $tip.find('.popover-title')[this.options.html ? 'html' : 'text'](title)
47
+ $tip.find('.popover-content > *')[this.options.html ? 'html' : 'text'](content)
48
48
 
49
49
  $tip.removeClass('fade top bottom left right in')
50
50
  }
@@ -71,6 +71,10 @@
71
71
  return this.$tip
72
72
  }
73
73
 
74
+ , destroy: function () {
75
+ this.hide().$element.off('.' + this.type).removeData(this.type)
76
+ }
77
+
74
78
  })
75
79
 
76
80
 
@@ -91,6 +95,7 @@
91
95
 
92
96
  $.fn.popover.defaults = $.extend({} , $.fn.tooltip.defaults, {
93
97
  placement: 'right'
98
+ , trigger: 'click'
94
99
  , content: ''
95
100
  , template: '<div class="popover"><div class="arrow"></div><div class="popover-inner"><h3 class="popover-title"></h3><div class="popover-content"><p></p></div></div></div>'
96
101
  })
@@ -1,5 +1,5 @@
1
1
  /* =============================================================
2
- * bootstrap-scrollspy.js v2.0.4
2
+ * bootstrap-scrollspy.js v2.1.0
3
3
  * http://twitter.github.com/bootstrap/javascript.html#scrollspy
4
4
  * =============================================================
5
5
  * Copyright 2012 Twitter, Inc.
@@ -23,15 +23,15 @@
23
23
  "use strict"; // jshint ;_;
24
24
 
25
25
 
26
- /* SCROLLSPY CLASS DEFINITION
27
- * ========================== */
26
+ /* SCROLLSPY CLASS DEFINITION
27
+ * ========================== */
28
28
 
29
- function ScrollSpy( element, options) {
29
+ function ScrollSpy(element, options) {
30
30
  var process = $.proxy(this.process, this)
31
31
  , $element = $(element).is('body') ? $(window) : $(element)
32
32
  , href
33
33
  this.options = $.extend({}, $.fn.scrollspy.defaults, options)
34
- this.$scrollElement = $element.on('scroll.scroll.data-api', process)
34
+ this.$scrollElement = $element.on('scroll.scroll-spy.data-api', process)
35
35
  this.selector = (this.options.target
36
36
  || ((href = $(element).attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7
37
37
  || '') + ' .nav li > a'
@@ -58,7 +58,7 @@
58
58
  , href = $el.data('target') || $el.attr('href')
59
59
  , $href = /^#\w/.test(href) && $(href)
60
60
  return ( $href
61
- && href.length
61
+ && $href.length
62
62
  && [[ $href.position().top, href ]] ) || null
63
63
  })
64
64
  .sort(function (a, b) { return a[0] - b[0] })
@@ -108,7 +108,7 @@
108
108
  .parent('li')
109
109
  .addClass('active')
110
110
 
111
- if (active.parent('.dropdown-menu')) {
111
+ if (active.parent('.dropdown-menu').length) {
112
112
  active = active.closest('li.dropdown').addClass('active')
113
113
  }
114
114
 
@@ -121,7 +121,7 @@
121
121
  /* SCROLLSPY PLUGIN DEFINITION
122
122
  * =========================== */
123
123
 
124
- $.fn.scrollspy = function ( option ) {
124
+ $.fn.scrollspy = function (option) {
125
125
  return this.each(function () {
126
126
  var $this = $(this)
127
127
  , data = $this.data('scrollspy')
@@ -141,7 +141,7 @@
141
141
  /* SCROLLSPY DATA-API
142
142
  * ================== */
143
143
 
144
- $(function () {
144
+ $(window).on('load', function () {
145
145
  $('[data-spy="scroll"]').each(function () {
146
146
  var $spy = $(this)
147
147
  $spy.scrollspy($spy.data())
@@ -1,5 +1,5 @@
1
1
  /* ========================================================
2
- * bootstrap-tab.js v2.0.4
2
+ * bootstrap-tab.js v2.1.0
3
3
  * http://twitter.github.com/bootstrap/javascript.html#tabs
4
4
  * ========================================================
5
5
  * Copyright 2012 Twitter, Inc.
@@ -26,7 +26,7 @@
26
26
  /* TAB CLASS DEFINITION
27
27
  * ==================== */
28
28
 
29
- var Tab = function ( element ) {
29
+ var Tab = function (element) {
30
30
  this.element = $(element)
31
31
  }
32
32
 
@@ -1,5 +1,5 @@
1
1
  /* ===========================================================
2
- * bootstrap-tooltip.js v2.0.4
2
+ * bootstrap-tooltip.js v2.1.0
3
3
  * http://twitter.github.com/bootstrap/javascript.html#tooltips
4
4
  * Inspired by the original jQuery.tipsy by Jason Frame
5
5
  * ===========================================================
@@ -44,11 +44,13 @@
44
44
  this.options = this.getOptions(options)
45
45
  this.enabled = true
46
46
 
47
- if (this.options.trigger != 'manual') {
48
- eventIn = this.options.trigger == 'hover' ? 'mouseenter' : 'focus'
47
+ if (this.options.trigger == 'click') {
48
+ this.$element.on('click.' + this.type, this.options.selector, $.proxy(this.toggle, this))
49
+ } else if (this.options.trigger != 'manual') {
50
+ eventIn = this.options.trigger == 'hover' ? 'mouseenter' : 'focus'
49
51
  eventOut = this.options.trigger == 'hover' ? 'mouseleave' : 'blur'
50
- this.$element.on(eventIn, this.options.selector, $.proxy(this.enter, this))
51
- this.$element.on(eventOut, this.options.selector, $.proxy(this.leave, this))
52
+ this.$element.on(eventIn + '.' + this.type, this.options.selector, $.proxy(this.enter, this))
53
+ this.$element.on(eventOut + '.' + this.type, this.options.selector, $.proxy(this.leave, this))
52
54
  }
53
55
 
54
56
  this.options.selector ?
@@ -148,20 +150,11 @@
148
150
  }
149
151
  }
150
152
 
151
- , isHTML: function(text) {
152
- // html string detection logic adapted from jQuery
153
- return typeof text != 'string'
154
- || ( text.charAt(0) === "<"
155
- && text.charAt( text.length - 1 ) === ">"
156
- && text.length >= 3
157
- ) || /^(?:[^<]*<[\w\W]+>[^>]*$)/.exec(text)
158
- }
159
-
160
153
  , setContent: function () {
161
154
  var $tip = this.tip()
162
155
  , title = this.getTitle()
163
156
 
164
- $tip.find('.tooltip-inner')[this.isHTML(title) ? 'html' : 'text'](title)
157
+ $tip.find('.tooltip-inner')[this.options.html ? 'html' : 'text'](title)
165
158
  $tip.removeClass('fade in top bottom left right')
166
159
  }
167
160
 
@@ -185,6 +178,8 @@
185
178
  $.support.transition && this.$tip.hasClass('fade') ?
186
179
  removeWithAnimation() :
187
180
  $tip.remove()
181
+
182
+ return this
188
183
  }
189
184
 
190
185
  , fixTitle: function () {
@@ -244,6 +239,10 @@
244
239
  this[this.tip().hasClass('in') ? 'hide' : 'show']()
245
240
  }
246
241
 
242
+ , destroy: function () {
243
+ this.hide().$element.off('.' + this.type).removeData(this.type)
244
+ }
245
+
247
246
  }
248
247
 
249
248
 
@@ -270,6 +269,7 @@
270
269
  , trigger: 'hover'
271
270
  , title: ''
272
271
  , delay: 0
272
+ , html: true
273
273
  }
274
274
 
275
275
  }(window.jQuery);
@@ -1,5 +1,5 @@
1
1
  /* ===================================================
2
- * bootstrap-transition.js v2.0.4
2
+ * bootstrap-transition.js v2.1.0
3
3
  * http://twitter.github.com/bootstrap/javascript.html#transitions
4
4
  * ===================================================
5
5
  * Copyright 2012 Twitter, Inc.
@@ -36,8 +36,7 @@
36
36
  , transEndEventNames = {
37
37
  'WebkitTransition' : 'webkitTransitionEnd'
38
38
  , 'MozTransition' : 'transitionend'
39
- , 'OTransition' : 'otransitionend'
40
- , 'msTransition' : 'MSTransitionEnd'
39
+ , 'OTransition' : 'oTransitionEnd otransitionend'
41
40
  , 'transition' : 'transitionend'
42
41
  }
43
42
  , name
@@ -1,5 +1,5 @@
1
1
  /* =============================================================
2
- * bootstrap-typeahead.js v2.0.4
2
+ * bootstrap-typeahead.js v2.1.0
3
3
  * http://twitter.github.com/bootstrap/javascript.html#typeahead
4
4
  * =============================================================
5
5
  * Copyright 2012 Twitter, Inc.
@@ -77,17 +77,23 @@
77
77
  }
78
78
 
79
79
  , lookup: function (event) {
80
- var that = this
81
- , items
82
- , q
80
+ var items
83
81
 
84
82
  this.query = this.$element.val()
85
83
 
86
- if (!this.query) {
84
+ if (!this.query || this.query.length < this.options.minLength) {
87
85
  return this.shown ? this.hide() : this
88
86
  }
89
87
 
90
- items = $.grep(this.source, function (item) {
88
+ items = $.isFunction(this.source) ? this.source(this.query, $.proxy(this.process, this)) : this.source
89
+
90
+ return items ? this.process(items) : this
91
+ }
92
+
93
+ , process: function (items) {
94
+ var that = this
95
+
96
+ items = $.grep(items, function (item) {
91
97
  return that.matcher(item)
92
98
  })
93
99
 
@@ -168,8 +174,8 @@
168
174
  .on('keypress', $.proxy(this.keypress, this))
169
175
  .on('keyup', $.proxy(this.keyup, this))
170
176
 
171
- if ($.browser.webkit || $.browser.msie || $.browser.mozilla) {
172
- this.$element.on('keydown', $.proxy(this.keypress, this))
177
+ if ($.browser.webkit || $.browser.msie) {
178
+ this.$element.on('keydown', $.proxy(this.keydown, this))
173
179
  }
174
180
 
175
181
  this.$menu
@@ -177,6 +183,40 @@
177
183
  .on('mouseenter', 'li', $.proxy(this.mouseenter, this))
178
184
  }
179
185
 
186
+ , move: function (e) {
187
+ if (!this.shown) return
188
+
189
+ switch(e.keyCode) {
190
+ case 9: // tab
191
+ case 13: // enter
192
+ case 27: // escape
193
+ e.preventDefault()
194
+ break
195
+
196
+ case 38: // up arrow
197
+ e.preventDefault()
198
+ this.prev()
199
+ break
200
+
201
+ case 40: // down arrow
202
+ e.preventDefault()
203
+ this.next()
204
+ break
205
+ }
206
+
207
+ e.stopPropagation()
208
+ }
209
+
210
+ , keydown: function (e) {
211
+ this.suppressKeyPressRepeat = !~$.inArray(e.keyCode, [40,38,9,13,27])
212
+ this.move(e)
213
+ }
214
+
215
+ , keypress: function (e) {
216
+ if (this.suppressKeyPressRepeat) return
217
+ this.move(e)
218
+ }
219
+
180
220
  , keyup: function (e) {
181
221
  switch(e.keyCode) {
182
222
  case 40: // down arrow
@@ -202,32 +242,6 @@
202
242
  e.preventDefault()
203
243
  }
204
244
 
205
- , keypress: function (e) {
206
- if (!this.shown) return
207
-
208
- switch(e.keyCode) {
209
- case 9: // tab
210
- case 13: // enter
211
- case 27: // escape
212
- e.preventDefault()
213
- break
214
-
215
- case 38: // up arrow
216
- if (e.type != 'keydown') break
217
- e.preventDefault()
218
- this.prev()
219
- break
220
-
221
- case 40: // down arrow
222
- if (e.type != 'keydown') break
223
- e.preventDefault()
224
- this.next()
225
- break
226
- }
227
-
228
- e.stopPropagation()
229
- }
230
-
231
245
  , blur: function (e) {
232
246
  var that = this
233
247
  setTimeout(function () { that.hide() }, 150)
@@ -265,12 +279,13 @@
265
279
  , items: 8
266
280
  , menu: '<ul class="typeahead dropdown-menu"></ul>'
267
281
  , item: '<li><a href="#"></a></li>'
282
+ , minLength: 1
268
283
  }
269
284
 
270
285
  $.fn.typeahead.Constructor = Typeahead
271
286
 
272
287
 
273
- /* TYPEAHEAD DATA-API
288
+ /* TYPEAHEAD DATA-API
274
289
  * ================== */
275
290
 
276
291
  $(function () {
@@ -282,4 +297,4 @@
282
297
  })
283
298
  })
284
299
 
285
- }(window.jQuery);
300
+ }(window.jQuery);
@@ -1,4 +1,5 @@
1
1
  //= require bootstrap-transition
2
+ //= require bootstrap-affix
2
3
  //= require bootstrap-alert
3
4
  //= require bootstrap-button
4
5
  //= require bootstrap-carousel
@@ -1,7 +1,12 @@
1
- // Responsive.css.scss
2
- // For phone and tablet devices
3
- // -------------------------------------------------------------
4
-
1
+ //
2
+ // Bootstrap Responsive v2.1.0
3
+ //
4
+ // Copyright 2012 Twitter, Inc
5
+ // Licensed under the Apache License v2.0
6
+ // http://www.apache.org/licenses/LICENSE-2.0
7
+ //
8
+ // Designed and built with all the love in the world @twitter by @mdo and @fat.
9
+ // Converted to Sass by @thomasmcdonald_, and distributed as bootstrap-sass
5
10
 
6
11
  // REPEAT VARIABLES & MIXINS
7
12
  // -------------------------
@@ -10,22 +15,24 @@
10
15
  @import "bootstrap/variables"; // Modify this for custom colors, font-sizes, etc
11
16
  @import "bootstrap/mixins";
12
17
 
18
+
13
19
  // RESPONSIVE CLASSES
14
20
  // ------------------
15
21
 
16
22
  @import "bootstrap/responsive-utilities";
17
23
 
24
+
18
25
  // MEDIA QUERIES
19
26
  // ------------------
20
27
 
21
- // Phones to portrait tablets and narrow desktops
22
- @import "bootstrap/responsive-767px-max";
28
+ // Large desktops
29
+ @import "bootstrap/responsive-1200px-min";
23
30
 
24
31
  // Tablets to regular desktops
25
32
  @import "bootstrap/responsive-768px-979px";
26
33
 
27
- // Large desktops
28
- @import "bootstrap/responsive-1200px-min";
34
+ // Phones to portrait tablets and narrow desktops
35
+ @import "bootstrap/responsive-767px-max";
29
36
 
30
37
 
31
38
  // RESPONSIVE NAVBAR
@@ -1,5 +1,5 @@
1
1
  //
2
- // Bootstrap v2.0.3
2
+ // Bootstrap v2.1.0
3
3
  //
4
4
  // Copyright 2012 Twitter, Inc
5
5
  // Licensed under the Apache License v2.0
@@ -36,7 +36,7 @@
36
36
  // Components: Buttons & Alerts
37
37
  @import "bootstrap/buttons";
38
38
  @import "bootstrap/button-groups";
39
- @import "bootstrap/alerts"; // Note: alerts share common CSS with buttons and thus have styles in buttons.less
39
+ @import "bootstrap/alerts"; // Note: alerts share common CSS with buttons and thus have styles in _buttons.scss
40
40
 
41
41
  // Components: Nav
42
42
  @import "bootstrap/navs";
@@ -1,5 +1,6 @@
1
- // ACCORDION
2
- // ---------
1
+ //
2
+ // Accordion
3
+ // --------------------------------------------------
3
4
 
4
5
 
5
6
  // Parent container
@@ -1,7 +1,11 @@
1
- // ALERT STYLES
2
- // ------------
1
+ //
2
+ // Alerts
3
+ // --------------------------------------------------
4
+
5
+
6
+ // Base styles
7
+ // -------------------------
3
8
 
4
- // Base alert styles
5
9
  .alert {
6
10
  padding: 8px 35px 8px 14px;
7
11
  margin-bottom: $baseLineHeight;
@@ -11,8 +15,8 @@
11
15
  @include border-radius(4px);
12
16
  color: $warningText;
13
17
  }
14
- .alert-heading {
15
- color: inherit;
18
+ .alert h4 {
19
+ margin: 0;
16
20
  }
17
21
 
18
22
  // Adjust close link position
@@ -20,18 +24,20 @@
20
24
  position: relative;
21
25
  top: -2px;
22
26
  right: -21px;
23
- line-height: 18px;
27
+ line-height: $baseLineHeight;
24
28
  }
25
29
 
30
+
26
31
  // Alternate styles
27
- // ----------------
32
+ // -------------------------
28
33
 
29
34
  .alert-success {
30
35
  background-color: $successBackground;
31
36
  border-color: $successBorder;
32
37
  color: $successText;
33
38
  }
34
- .alert-danger, .alert-error {
39
+ .alert-danger,
40
+ .alert-error {
35
41
  background-color: $errorBackground;
36
42
  border-color: $errorBorder;
37
43
  color: $errorText;
@@ -42,13 +48,16 @@
42
48
  color: $infoText;
43
49
  }
44
50
 
51
+
45
52
  // Block alerts
46
- // ------------------------
53
+ // -------------------------
54
+
47
55
  .alert-block {
48
56
  padding-top: 14px;
49
57
  padding-bottom: 14px;
50
58
  }
51
- .alert-block > p, .alert-block > ul {
59
+ .alert-block > p,
60
+ .alert-block > ul {
52
61
  margin-bottom: 0;
53
62
  }
54
63
  .alert-block p + p {