bootstrap-generators 2.1.1 → 2.2.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (84) hide show
  1. data/README.md +48 -3
  2. data/lib/bootstrap/generators/version.rb +1 -1
  3. data/lib/generators/bootstrap/install/templates/assets/stylesheets/bootstrap-variables.css.scss +25 -2
  4. data/lib/generators/bootstrap/install/templates/assets/stylesheets/bootstrap-variables.less +23 -1
  5. data/lib/generators/bootstrap/install/templates/assets/stylesheets/fluid.css.scss +1 -1
  6. data/lib/generators/bootstrap/install/templates/assets/stylesheets/hero.css.scss +1 -1
  7. data/vendor/assets/javascripts/bootstrap-affix.js +4 -2
  8. data/vendor/assets/javascripts/bootstrap-alert.js +2 -4
  9. data/vendor/assets/javascripts/bootstrap-button.js +5 -7
  10. data/vendor/assets/javascripts/bootstrap-carousel.js +12 -12
  11. data/vendor/assets/javascripts/bootstrap-collapse.js +9 -11
  12. data/vendor/assets/javascripts/bootstrap-dropdown.js +9 -11
  13. data/vendor/assets/javascripts/bootstrap-modal.js +20 -25
  14. data/vendor/assets/javascripts/bootstrap-popover.js +1 -1
  15. data/vendor/assets/javascripts/bootstrap-scrollspy.js +1 -1
  16. data/vendor/assets/javascripts/bootstrap-tab.js +5 -7
  17. data/vendor/assets/javascripts/bootstrap-tooltip.js +12 -11
  18. data/vendor/assets/javascripts/bootstrap-transition.js +5 -5
  19. data/vendor/assets/javascripts/bootstrap-typeahead.js +19 -9
  20. data/vendor/twitter/bootstrap/less/accordion.less +1 -1
  21. data/vendor/twitter/bootstrap/less/alerts.less +1 -1
  22. data/vendor/twitter/bootstrap/less/bootstrap.less +2 -1
  23. data/vendor/twitter/bootstrap/less/breadcrumbs.less +1 -1
  24. data/vendor/twitter/bootstrap/less/button-groups.less +5 -8
  25. data/vendor/twitter/bootstrap/less/buttons.less +17 -16
  26. data/vendor/twitter/bootstrap/less/code.less +1 -1
  27. data/vendor/twitter/bootstrap/less/dropdowns.less +32 -5
  28. data/vendor/twitter/bootstrap/less/forms.less +47 -14
  29. data/vendor/twitter/bootstrap/less/hero-unit.less +6 -5
  30. data/vendor/twitter/bootstrap/less/labels-badges.less +4 -2
  31. data/vendor/twitter/bootstrap/less/media.less +55 -0
  32. data/vendor/twitter/bootstrap/less/mixins.less +15 -10
  33. data/vendor/twitter/bootstrap/less/modals.less +7 -11
  34. data/vendor/twitter/bootstrap/less/navbar.less +6 -6
  35. data/vendor/twitter/bootstrap/less/navs.less +3 -2
  36. data/vendor/twitter/bootstrap/less/pager.less +10 -9
  37. data/vendor/twitter/bootstrap/less/pagination.less +69 -12
  38. data/vendor/twitter/bootstrap/less/popovers.less +2 -2
  39. data/vendor/twitter/bootstrap/less/progress-bars.less +2 -2
  40. data/vendor/twitter/bootstrap/less/reset.less +5 -4
  41. data/vendor/twitter/bootstrap/less/responsive-767px-max.less +20 -1
  42. data/vendor/twitter/bootstrap/less/responsive-navbar.less +12 -4
  43. data/vendor/twitter/bootstrap/less/responsive.less +1 -1
  44. data/vendor/twitter/bootstrap/less/sprites.less +3 -3
  45. data/vendor/twitter/bootstrap/less/tables.less +20 -29
  46. data/vendor/twitter/bootstrap/less/thumbnails.less +1 -1
  47. data/vendor/twitter/bootstrap/less/tooltip.less +1 -1
  48. data/vendor/twitter/bootstrap/less/type.less +30 -24
  49. data/vendor/twitter/bootstrap/less/variables.less +23 -1
  50. data/vendor/twitter/bootstrap/less/wells.less +3 -3
  51. data/vendor/twitter/bootstrap/sass/_accordion.scss +1 -1
  52. data/vendor/twitter/bootstrap/sass/_alerts.scss +1 -1
  53. data/vendor/twitter/bootstrap/sass/_breadcrumbs.scss +1 -1
  54. data/vendor/twitter/bootstrap/sass/_button-groups.scss +5 -8
  55. data/vendor/twitter/bootstrap/sass/_buttons.scss +18 -17
  56. data/vendor/twitter/bootstrap/sass/_code.scss +1 -1
  57. data/vendor/twitter/bootstrap/sass/_component-animations.scss +2 -2
  58. data/vendor/twitter/bootstrap/sass/_dropdowns.scss +32 -5
  59. data/vendor/twitter/bootstrap/sass/_forms.scss +46 -14
  60. data/vendor/twitter/bootstrap/sass/_hero-unit.scss +6 -5
  61. data/vendor/twitter/bootstrap/sass/_labels-badges.scss +4 -2
  62. data/vendor/twitter/bootstrap/sass/_media.scss +55 -0
  63. data/vendor/twitter/bootstrap/sass/_mixins.scss +12 -7
  64. data/vendor/twitter/bootstrap/sass/_modals.scss +8 -11
  65. data/vendor/twitter/bootstrap/sass/_navbar.scss +8 -10
  66. data/vendor/twitter/bootstrap/sass/_navs.scss +5 -4
  67. data/vendor/twitter/bootstrap/sass/_pager.scss +10 -9
  68. data/vendor/twitter/bootstrap/sass/_pagination.scss +69 -12
  69. data/vendor/twitter/bootstrap/sass/_popovers.scss +2 -2
  70. data/vendor/twitter/bootstrap/sass/_progress-bars.scss +2 -2
  71. data/vendor/twitter/bootstrap/sass/_reset.scss +6 -4
  72. data/vendor/twitter/bootstrap/sass/_responsive-767px-max.scss +20 -1
  73. data/vendor/twitter/bootstrap/sass/_responsive-navbar.scss +12 -4
  74. data/vendor/twitter/bootstrap/sass/_scaffolding.scss +1 -3
  75. data/vendor/twitter/bootstrap/sass/_sprites.scss +3 -3
  76. data/vendor/twitter/bootstrap/sass/_tables.scss +12 -8
  77. data/vendor/twitter/bootstrap/sass/_thumbnails.scss +1 -1
  78. data/vendor/twitter/bootstrap/sass/_tooltip.scss +1 -1
  79. data/vendor/twitter/bootstrap/sass/_type.scss +30 -24
  80. data/vendor/twitter/bootstrap/sass/_variables.scss +25 -2
  81. data/vendor/twitter/bootstrap/sass/_wells.scss +3 -3
  82. data/vendor/twitter/bootstrap/sass/bootstrap.scss +2 -1
  83. data/vendor/twitter/bootstrap/sass/responsive.scss +1 -1
  84. metadata +12 -10
@@ -1,5 +1,5 @@
1
1
  /* =========================================================
2
- * bootstrap-modal.js v2.1.1
2
+ * bootstrap-modal.js v2.2.1
3
3
  * http://twitter.github.com/bootstrap/javascript.html#modals
4
4
  * =========================================================
5
5
  * Copyright 2012 Twitter, Inc.
@@ -49,8 +49,6 @@
49
49
 
50
50
  if (this.isShown || e.isDefaultPrevented()) return
51
51
 
52
- $('body').addClass('modal-open')
53
-
54
52
  this.isShown = true
55
53
 
56
54
  this.escape()
@@ -72,13 +70,12 @@
72
70
  that.$element
73
71
  .addClass('in')
74
72
  .attr('aria-hidden', false)
75
- .focus()
76
73
 
77
74
  that.enforceFocus()
78
75
 
79
76
  transition ?
80
- that.$element.one($.support.transition.end, function () { that.$element.trigger('shown') }) :
81
- that.$element.trigger('shown')
77
+ that.$element.one($.support.transition.end, function () { that.$element.focus().trigger('shown') }) :
78
+ that.$element.focus().trigger('shown')
82
79
 
83
80
  })
84
81
  }
@@ -96,8 +93,6 @@
96
93
 
97
94
  this.isShown = false
98
95
 
99
- $('body').removeClass('modal-open')
100
-
101
96
  this.escape()
102
97
 
103
98
  $(document).off('focusin.modal')
@@ -167,9 +162,11 @@
167
162
  this.$backdrop = $('<div class="modal-backdrop ' + animate + '" />')
168
163
  .appendTo(document.body)
169
164
 
170
- if (this.options.backdrop != 'static') {
171
- this.$backdrop.click($.proxy(this.hide, this))
172
- }
165
+ this.$backdrop.click(
166
+ this.options.backdrop == 'static' ?
167
+ $.proxy(this.$element[0].focus, this.$element[0])
168
+ : $.proxy(this.hide, this)
169
+ )
173
170
 
174
171
  if (doAnimate) this.$backdrop[0].offsetWidth // force reflow
175
172
 
@@ -219,21 +216,19 @@
219
216
  /* MODAL DATA-API
220
217
  * ============== */
221
218
 
222
- $(function () {
223
- $('body').on('click.modal.data-api', '[data-toggle="modal"]', function ( e ) {
224
- var $this = $(this)
225
- , href = $this.attr('href')
226
- , $target = $($this.attr('data-target') || (href && href.replace(/.*(?=#[^\s]+$)/, ''))) //strip for ie7
227
- , option = $target.data('modal') ? 'toggle' : $.extend({ remote: !/#/.test(href) && href }, $target.data(), $this.data())
219
+ $(document).on('click.modal.data-api', '[data-toggle="modal"]', function (e) {
220
+ var $this = $(this)
221
+ , href = $this.attr('href')
222
+ , $target = $($this.attr('data-target') || (href && href.replace(/.*(?=#[^\s]+$)/, ''))) //strip for ie7
223
+ , option = $target.data('modal') ? 'toggle' : $.extend({ remote:!/#/.test(href) && href }, $target.data(), $this.data())
228
224
 
229
- e.preventDefault()
225
+ e.preventDefault()
230
226
 
231
- $target
232
- .modal(option)
233
- .one('hide', function () {
234
- $this.focus()
235
- })
236
- })
227
+ $target
228
+ .modal(option)
229
+ .one('hide', function () {
230
+ $this.focus()
231
+ })
237
232
  })
238
233
 
239
- }(window.jQuery);
234
+ }(window.jQuery);
@@ -1,5 +1,5 @@
1
1
  /* ===========================================================
2
- * bootstrap-popover.js v2.1.1
2
+ * bootstrap-popover.js v2.2.1
3
3
  * http://twitter.github.com/bootstrap/javascript.html#popovers
4
4
  * ===========================================================
5
5
  * Copyright 2012 Twitter, Inc.
@@ -1,5 +1,5 @@
1
1
  /* =============================================================
2
- * bootstrap-scrollspy.js v2.1.1
2
+ * bootstrap-scrollspy.js v2.2.1
3
3
  * http://twitter.github.com/bootstrap/javascript.html#scrollspy
4
4
  * =============================================================
5
5
  * Copyright 2012 Twitter, Inc.
@@ -1,5 +1,5 @@
1
1
  /* ========================================================
2
- * bootstrap-tab.js v2.1.1
2
+ * bootstrap-tab.js v2.2.1
3
3
  * http://twitter.github.com/bootstrap/javascript.html#tabs
4
4
  * ========================================================
5
5
  * Copyright 2012 Twitter, Inc.
@@ -49,7 +49,7 @@
49
49
 
50
50
  if ( $this.parent('li').hasClass('active') ) return
51
51
 
52
- previous = $ul.find('.active a').last()[0]
52
+ previous = $ul.find('.active:last a')[0]
53
53
 
54
54
  e = $.Event('show', {
55
55
  relatedTarget: previous
@@ -125,11 +125,9 @@
125
125
  /* TAB DATA-API
126
126
  * ============ */
127
127
 
128
- $(function () {
129
- $('body').on('click.tab.data-api', '[data-toggle="tab"], [data-toggle="pill"]', function (e) {
130
- e.preventDefault()
131
- $(this).tab('show')
132
- })
128
+ $(document).on('click.tab.data-api', '[data-toggle="tab"], [data-toggle="pill"]', function (e) {
129
+ e.preventDefault()
130
+ $(this).tab('show')
133
131
  })
134
132
 
135
133
  }(window.jQuery);
@@ -1,5 +1,5 @@
1
1
  /* ===========================================================
2
- * bootstrap-tooltip.js v2.1.1
2
+ * bootstrap-tooltip.js v2.2.1
3
3
  * http://twitter.github.com/bootstrap/javascript.html#tooltips
4
4
  * Inspired by the original jQuery.tipsy by Jason Frame
5
5
  * ===========================================================
@@ -119,9 +119,9 @@
119
119
  inside = /in/.test(placement)
120
120
 
121
121
  $tip
122
- .remove()
122
+ .detach()
123
123
  .css({ top: 0, left: 0, display: 'block' })
124
- .appendTo(inside ? this.$element : document.body)
124
+ .insertAfter(this.$element)
125
125
 
126
126
  pos = this.getPosition(inside)
127
127
 
@@ -144,7 +144,7 @@
144
144
  }
145
145
 
146
146
  $tip
147
- .css(tp)
147
+ .offset(tp)
148
148
  .addClass(placement)
149
149
  .addClass('in')
150
150
  }
@@ -166,18 +166,18 @@
166
166
 
167
167
  function removeWithAnimation() {
168
168
  var timeout = setTimeout(function () {
169
- $tip.off($.support.transition.end).remove()
169
+ $tip.off($.support.transition.end).detach()
170
170
  }, 500)
171
171
 
172
172
  $tip.one($.support.transition.end, function () {
173
173
  clearTimeout(timeout)
174
- $tip.remove()
174
+ $tip.detach()
175
175
  })
176
176
  }
177
177
 
178
178
  $.support.transition && this.$tip.hasClass('fade') ?
179
179
  removeWithAnimation() :
180
- $tip.remove()
180
+ $tip.detach()
181
181
 
182
182
  return this
183
183
  }
@@ -235,8 +235,9 @@
235
235
  this.enabled = !this.enabled
236
236
  }
237
237
 
238
- , toggle: function () {
239
- this[this.tip().hasClass('in') ? 'hide' : 'show']()
238
+ , toggle: function (e) {
239
+ var self = $(e.currentTarget)[this.type](this._options).data(this.type)
240
+ self[self.tip().hasClass('in') ? 'hide' : 'show']()
240
241
  }
241
242
 
242
243
  , destroy: function () {
@@ -269,7 +270,7 @@
269
270
  , trigger: 'hover'
270
271
  , title: ''
271
272
  , delay: 0
272
- , html: true
273
+ , html: false
273
274
  }
274
275
 
275
- }(window.jQuery);
276
+ }(window.jQuery);
@@ -1,5 +1,5 @@
1
1
  /* ===================================================
2
- * bootstrap-transition.js v2.1.1
2
+ * bootstrap-transition.js v2.2.1
3
3
  * http://twitter.github.com/bootstrap/javascript.html#transitions
4
4
  * ===================================================
5
5
  * Copyright 2012 Twitter, Inc.
@@ -20,13 +20,13 @@
20
20
 
21
21
  !function ($) {
22
22
 
23
- $(function () {
23
+ "use strict"; // jshint ;_;
24
24
 
25
- "use strict"; // jshint ;_;
26
25
 
26
+ /* CSS TRANSITION SUPPORT (http://www.modernizr.com/)
27
+ * ======================================================= */
27
28
 
28
- /* CSS TRANSITION SUPPORT (http://www.modernizr.com/)
29
- * ======================================================= */
29
+ $(function () {
30
30
 
31
31
  $.support.transition = (function () {
32
32
 
@@ -1,5 +1,5 @@
1
1
  /* =============================================================
2
- * bootstrap-typeahead.js v2.1.1
2
+ * bootstrap-typeahead.js v2.2.1
3
3
  * http://twitter.github.com/bootstrap/javascript.html#typeahead
4
4
  * =============================================================
5
5
  * Copyright 2012 Twitter, Inc.
@@ -174,7 +174,7 @@
174
174
  .on('keypress', $.proxy(this.keypress, this))
175
175
  .on('keyup', $.proxy(this.keyup, this))
176
176
 
177
- if ($.browser.chrome || $.browser.webkit || $.browser.msie) {
177
+ if (this.eventSupported('keydown')) {
178
178
  this.$element.on('keydown', $.proxy(this.keydown, this))
179
179
  }
180
180
 
@@ -183,6 +183,15 @@
183
183
  .on('mouseenter', 'li', $.proxy(this.mouseenter, this))
184
184
  }
185
185
 
186
+ , eventSupported: function(eventName) {
187
+ var isSupported = eventName in this.$element
188
+ if (!isSupported) {
189
+ this.$element.setAttribute(eventName, 'return;')
190
+ isSupported = typeof this.$element[eventName] === 'function'
191
+ }
192
+ return isSupported
193
+ }
194
+
186
195
  , move: function (e) {
187
196
  if (!this.shown) return
188
197
 
@@ -221,6 +230,9 @@
221
230
  switch(e.keyCode) {
222
231
  case 40: // down arrow
223
232
  case 38: // up arrow
233
+ case 16: // shift
234
+ case 17: // ctrl
235
+ case 18: // alt
224
236
  break
225
237
 
226
238
  case 9: // tab
@@ -288,13 +300,11 @@
288
300
  /* TYPEAHEAD DATA-API
289
301
  * ================== */
290
302
 
291
- $(function () {
292
- $('body').on('focus.typeahead.data-api', '[data-provide="typeahead"]', function (e) {
293
- var $this = $(this)
294
- if ($this.data('typeahead')) return
295
- e.preventDefault()
296
- $this.typeahead($this.data())
297
- })
303
+ $(document).on('focus.typeahead.data-api', '[data-provide="typeahead"]', function (e) {
304
+ var $this = $(this)
305
+ if ($this.data('typeahead')) return
306
+ e.preventDefault()
307
+ $this.typeahead($this.data())
298
308
  })
299
309
 
300
310
  }(window.jQuery);
@@ -12,7 +12,7 @@
12
12
  .accordion-group {
13
13
  margin-bottom: 2px;
14
14
  border: 1px solid #e5e5e5;
15
- .border-radius(4px);
15
+ .border-radius(@baseBorderRadius);
16
16
  }
17
17
  .accordion-heading {
18
18
  border-bottom: 0;
@@ -12,7 +12,7 @@
12
12
  text-shadow: 0 1px 0 rgba(255,255,255,.5);
13
13
  background-color: @warningBackground;
14
14
  border: 1px solid @warningBorder;
15
- .border-radius(4px);
15
+ .border-radius(@baseBorderRadius);
16
16
  color: @warningText;
17
17
  }
18
18
  .alert h4 {
@@ -1,5 +1,5 @@
1
1
  /*!
2
- * Bootstrap v2.1.1
2
+ * Bootstrap v2.2.1
3
3
  *
4
4
  * Copyright 2012 Twitter, Inc
5
5
  * Licensed under the Apache License v2.0
@@ -52,6 +52,7 @@
52
52
 
53
53
  // Components: Misc
54
54
  @import "thumbnails.less";
55
+ @import "media.less";
55
56
  @import "labels-badges.less";
56
57
  @import "progress-bars.less";
57
58
  @import "accordion.less";
@@ -8,7 +8,7 @@
8
8
  margin: 0 0 @baseLineHeight;
9
9
  list-style: none;
10
10
  background-color: #f5f5f5;
11
- .border-radius(4px);
11
+ .border-radius(@baseBorderRadius);
12
12
  li {
13
13
  display: inline-block;
14
14
  .ie7-inline-block();
@@ -6,6 +6,8 @@
6
6
  // Make the div behave like a button
7
7
  .btn-group {
8
8
  position: relative;
9
+ display: inline-block;
10
+ .ie7-inline-block();
9
11
  font-size: 0; // remove as part 1 of font-size inline-block hack
10
12
  vertical-align: middle; // match .btn alignment given font-size hack above
11
13
  white-space: nowrap; // prevent buttons from wrapping when in tight spaces (e.g., the table on the tests page)
@@ -22,10 +24,6 @@
22
24
  font-size: 0; // Hack to remove whitespace that results from using inline-block
23
25
  margin-top: @baseLineHeight / 2;
24
26
  margin-bottom: @baseLineHeight / 2;
25
- .btn-group {
26
- display: inline-block;
27
- .ie7-inline-block();
28
- }
29
27
  .btn + .btn,
30
28
  .btn-group + .btn,
31
29
  .btn + .btn-group {
@@ -120,7 +118,7 @@
120
118
  .btn-group > .btn + .dropdown-toggle {
121
119
  padding-left: 8px;
122
120
  padding-right: 8px;
123
- .box-shadow(inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05));
121
+ .box-shadow(~"inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05)");
124
122
  *padding-top: 5px;
125
123
  *padding-bottom: 5px;
126
124
  }
@@ -147,7 +145,7 @@
147
145
  // Remove the gradient and set the same inset shadow as the :active state
148
146
  .dropdown-toggle {
149
147
  background-image: none;
150
- .box-shadow(inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05));
148
+ .box-shadow(~"inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05)");
151
149
  }
152
150
 
153
151
  // Keep the hover's background when dropdown is open
@@ -193,8 +191,7 @@
193
191
  }
194
192
  // Upside down carets for .dropup
195
193
  .dropup .btn-large .caret {
196
- border-bottom: 5px solid @black;
197
- border-top: 0;
194
+ border-bottom-width: 5px;
198
195
  }
199
196
 
200
197
 
@@ -10,7 +10,7 @@
10
10
  .btn {
11
11
  display: inline-block;
12
12
  .ie7-inline-block();
13
- padding: 4px 14px;
13
+ padding: 4px 12px;
14
14
  margin-bottom: 0; // For input.btn
15
15
  font-size: @baseFontSize;
16
16
  line-height: @baseLineHeight;
@@ -22,9 +22,9 @@
22
22
  border: 1px solid @btnBorder;
23
23
  *border: 0; // Remove the border to prevent IE7's black border on input:focus
24
24
  border-bottom-color: darken(@btnBorder, 10%);
25
- .border-radius(4px);
25
+ .border-radius(@baseBorderRadius);
26
26
  .ie7-restore-left-whitespace(); // Give IE7 some love
27
- .box-shadow(inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05));
27
+ .box-shadow(~"inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05)");
28
28
 
29
29
  // Hover state
30
30
  &:hover {
@@ -51,7 +51,7 @@
51
51
  background-color: darken(@white, 15%) e("\9");
52
52
  background-image: none;
53
53
  outline: 0;
54
- .box-shadow(inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05));
54
+ .box-shadow(~"inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05)");
55
55
  }
56
56
 
57
57
  // Disabled state
@@ -73,30 +73,31 @@
73
73
 
74
74
  // Large
75
75
  .btn-large {
76
- padding: 9px 14px;
77
- font-size: @baseFontSize + 2px;
78
- line-height: normal;
79
- .border-radius(5px);
76
+ padding: @paddingLarge;
77
+ font-size: @fontSizeLarge;
78
+ .border-radius(@borderRadiusLarge);
80
79
  }
81
- .btn-large [class^="icon-"] {
80
+ .btn-large [class^="icon-"],
81
+ .btn-large [class*=" icon-"] {
82
82
  margin-top: 2px;
83
83
  }
84
84
 
85
85
  // Small
86
86
  .btn-small {
87
- padding: 3px 9px;
88
- font-size: @baseFontSize - 2px;
89
- line-height: @baseLineHeight - 2px;
87
+ padding: @paddingSmall;
88
+ font-size: @fontSizeSmall;
89
+ .border-radius(@borderRadiusSmall);
90
90
  }
91
- .btn-small [class^="icon-"] {
91
+ .btn-small [class^="icon-"],
92
+ .btn-small [class*=" icon-"] {
92
93
  margin-top: 0;
93
94
  }
94
95
 
95
96
  // Mini
96
97
  .btn-mini {
97
- padding: 2px 6px;
98
- font-size: @baseFontSize - 3px;
99
- line-height: @baseLineHeight - 3px;
98
+ padding: @paddingMini;
99
+ font-size: @fontSizeMini;
100
+ .border-radius(@borderRadiusSmall);
100
101
  }
101
102
 
102
103