bootstrap-sass 2.1.1.0 → 2.2.1.0

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.

Potentially problematic release.


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

Files changed (61) hide show
  1. data/README.md +7 -5
  2. data/lib/bootstrap-sass/compass_functions.rb +9 -5
  3. data/vendor/assets/javascripts/bootstrap-affix.js +4 -2
  4. data/vendor/assets/javascripts/bootstrap-alert.js +2 -4
  5. data/vendor/assets/javascripts/bootstrap-button.js +5 -7
  6. data/vendor/assets/javascripts/bootstrap-carousel.js +12 -12
  7. data/vendor/assets/javascripts/bootstrap-collapse.js +9 -11
  8. data/vendor/assets/javascripts/bootstrap-dropdown.js +9 -11
  9. data/vendor/assets/javascripts/bootstrap-modal.js +20 -25
  10. data/vendor/assets/javascripts/bootstrap-popover.js +1 -1
  11. data/vendor/assets/javascripts/bootstrap-scrollspy.js +1 -1
  12. data/vendor/assets/javascripts/bootstrap-tab.js +5 -7
  13. data/vendor/assets/javascripts/bootstrap-tooltip.js +12 -11
  14. data/vendor/assets/javascripts/bootstrap-transition.js +5 -5
  15. data/vendor/assets/javascripts/bootstrap-typeahead.js +19 -9
  16. data/vendor/assets/stylesheets/bootstrap-responsive.scss +1 -0
  17. data/vendor/assets/stylesheets/bootstrap.scss +1 -0
  18. data/vendor/assets/stylesheets/bootstrap/_accordion.scss +2 -2
  19. data/vendor/assets/stylesheets/bootstrap/_alerts.scss +2 -2
  20. data/vendor/assets/stylesheets/bootstrap/_breadcrumbs.scss +1 -1
  21. data/vendor/assets/stylesheets/bootstrap/_button-groups.scss +5 -8
  22. data/vendor/assets/stylesheets/bootstrap/_buttons.scss +18 -17
  23. data/vendor/assets/stylesheets/bootstrap/_carousel.scss +4 -4
  24. data/vendor/assets/stylesheets/bootstrap/_close.scss +3 -3
  25. data/vendor/assets/stylesheets/bootstrap/_code.scss +3 -3
  26. data/vendor/assets/stylesheets/bootstrap/_component-animations.scss +1 -1
  27. data/vendor/assets/stylesheets/bootstrap/_dropdowns.scss +34 -7
  28. data/vendor/assets/stylesheets/bootstrap/_forms.scss +50 -18
  29. data/vendor/assets/stylesheets/bootstrap/_grid.scss +2 -1
  30. data/vendor/assets/stylesheets/bootstrap/_hero-unit.scss +7 -6
  31. data/vendor/assets/stylesheets/bootstrap/_labels-badges.scss +15 -14
  32. data/vendor/assets/stylesheets/bootstrap/_layouts.scss +1 -1
  33. data/vendor/assets/stylesheets/bootstrap/_media.scss +55 -0
  34. data/vendor/assets/stylesheets/bootstrap/_mixins.scss +99 -62
  35. data/vendor/assets/stylesheets/bootstrap/_modals.scss +12 -15
  36. data/vendor/assets/stylesheets/bootstrap/_navbar.scss +11 -11
  37. data/vendor/assets/stylesheets/bootstrap/_navs.scss +5 -4
  38. data/vendor/assets/stylesheets/bootstrap/_pager.scss +11 -10
  39. data/vendor/assets/stylesheets/bootstrap/_pagination.scss +70 -13
  40. data/vendor/assets/stylesheets/bootstrap/_popovers.scss +4 -4
  41. data/vendor/assets/stylesheets/bootstrap/_progress-bars.scss +5 -5
  42. data/vendor/assets/stylesheets/bootstrap/_reset.scss +8 -6
  43. data/vendor/assets/stylesheets/bootstrap/_responsive-1200px-min.scss +1 -1
  44. data/vendor/assets/stylesheets/bootstrap/_responsive-767px-max.scss +20 -1
  45. data/vendor/assets/stylesheets/bootstrap/_responsive-768px-979px.scss +1 -1
  46. data/vendor/assets/stylesheets/bootstrap/_responsive-navbar.scss +13 -5
  47. data/vendor/assets/stylesheets/bootstrap/_responsive-utilities.scss +16 -1
  48. data/vendor/assets/stylesheets/bootstrap/_scaffolding.scss +1 -1
  49. data/vendor/assets/stylesheets/bootstrap/_sprites.scss +5 -5
  50. data/vendor/assets/stylesheets/bootstrap/_tables.scss +11 -11
  51. data/vendor/assets/stylesheets/bootstrap/_thumbnails.scss +4 -4
  52. data/vendor/assets/stylesheets/bootstrap/_tooltip.scss +3 -3
  53. data/vendor/assets/stylesheets/bootstrap/_type.scss +32 -26
  54. data/vendor/assets/stylesheets/bootstrap/_utilities.scss +16 -1
  55. data/vendor/assets/stylesheets/bootstrap/_variables.scss +28 -6
  56. data/vendor/assets/stylesheets/bootstrap/_wells.scss +5 -5
  57. data/vendor/assets/stylesheets/bootstrap/bootstrap.scss +63 -0
  58. data/vendor/assets/stylesheets/bootstrap/responsive.scss +48 -0
  59. metadata +25 -6
  60. data/vendor/assets/stylesheets/_bootstrap-responsive.scss +0 -42
  61. data/vendor/assets/stylesheets/_bootstrap.scss +0 -62
@@ -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);
@@ -0,0 +1 @@
1
+ @import "bootstrap/responsive";
@@ -0,0 +1 @@
1
+ @import "bootstrap/bootstrap";
@@ -12,7 +12,7 @@
12
12
  .accordion-group {
13
13
  margin-bottom: 2px;
14
14
  border: 1px solid #e5e5e5;
15
- @include border-radius(4px);
15
+ @include border-radius($baseBorderRadius);
16
16
  }
17
17
  .accordion-heading {
18
18
  border-bottom: 0;
@@ -31,4 +31,4 @@
31
31
  .accordion-inner {
32
32
  padding: 9px 15px;
33
33
  border-top: 1px solid #e5e5e5;
34
- }
34
+ }
@@ -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
- @include border-radius(4px);
15
+ @include border-radius($baseBorderRadius);
16
16
  color: $warningText;
17
17
  }
18
18
  .alert h4 {
@@ -62,4 +62,4 @@
62
62
  }
63
63
  .alert-block p + p {
64
64
  margin-top: 5px;
65
- }
65
+ }
@@ -8,7 +8,7 @@
8
8
  margin: 0 0 $baseLineHeight;
9
9
  list-style: none;
10
10
  background-color: #f5f5f5;
11
- @include border-radius(4px);
11
+ @include border-radius($baseBorderRadius);
12
12
  li {
13
13
  display: inline-block;
14
14
  @include 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
+ @include 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
- @include 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
- @include 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
+ @include 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
- @include box-shadow(#{inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05)});
148
+ @include 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
  @include 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
- @include border-radius(4px);
25
+ @include border-radius($baseBorderRadius);
26
26
  @include ie7-restore-left-whitespace(); // Give IE7 some love
27
- @include box-shadow(#{inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05)});
27
+ @include 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%) \9;
52
52
  background-image: none;
53
53
  outline: 0;
54
- @include box-shadow(#{inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05)});
54
+ @include 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
@@ -60,7 +60,7 @@
60
60
  cursor: default;
61
61
  background-color: darken($white, 10%);
62
62
  background-image: none;
63
- @include opacity(0.65);
63
+ @include opacity(65);
64
64
  @include box-shadow(none);
65
65
  }
66
66
 
@@ -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
- @include border-radius(5px);
76
+ padding: $paddingLarge;
77
+ font-size: $fontSizeLarge;
78
+ @include 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
+ @include 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
+ @include border-radius($borderRadiusSmall);
100
101
  }
101
102
 
102
103
 
@@ -82,14 +82,14 @@
82
82
  background: $grayDarker;
83
83
  border: 3px solid $white;
84
84
  @include border-radius(23px);
85
- @include opacity(0.5);
85
+ @include opacity(50);
86
86
 
87
87
  // we can't have this transition here
88
88
  // because webkit cancels the carousel
89
89
  // animation if you trip this while
90
90
  // in the middle of another animation
91
91
  // ;_;
92
- // @include transition(opacity .2s linear);
92
+ // .transition(opacity .2s linear);
93
93
 
94
94
  // Reposition the right one
95
95
  &.right {
@@ -101,7 +101,7 @@
101
101
  &:hover {
102
102
  color: $white;
103
103
  text-decoration: none;
104
- @include opacity(0.9);
104
+ @include opacity(90);
105
105
  }
106
106
  }
107
107
 
@@ -128,4 +128,4 @@
128
128
  }
129
129
  .carousel-caption p {
130
130
  margin-bottom: 0;
131
- }
131
+ }
@@ -10,12 +10,12 @@
10
10
  line-height: $baseLineHeight;
11
11
  color: $black;
12
12
  text-shadow: 0 1px 0 rgba(255,255,255,1);
13
- @include opacity(0.2);
13
+ @include opacity(20);
14
14
  &:hover {
15
15
  color: $black;
16
16
  text-decoration: none;
17
17
  cursor: pointer;
18
- @include opacity(0.4);
18
+ @include opacity(40);
19
19
  }
20
20
  }
21
21
 
@@ -28,4 +28,4 @@ button.close {
28
28
  background: transparent;
29
29
  border: 0;
30
30
  -webkit-appearance: none;
31
- }
31
+ }
@@ -7,7 +7,7 @@
7
7
  code,
8
8
  pre {
9
9
  padding: 0 3px 2px;
10
- @include font-family-monospace();
10
+ @include font-family-monospace;
11
11
  font-size: $baseFontSize - 2;
12
12
  color: $grayDark;
13
13
  @include border-radius(3px);
@@ -35,7 +35,7 @@ pre {
35
35
  background-color: #f5f5f5;
36
36
  border: 1px solid #ccc; // fallback for IE7-8
37
37
  border: 1px solid rgba(0,0,0,.15);
38
- @include border-radius(4px);
38
+ @include border-radius($baseBorderRadius);
39
39
 
40
40
  // Make prettyprint styles more spaced out for readability
41
41
  &.prettyprint {
@@ -55,4 +55,4 @@ pre {
55
55
  .pre-scrollable {
56
56
  max-height: 340px;
57
57
  overflow-y: scroll;
58
- }
58
+ }
@@ -19,4 +19,4 @@
19
19
  &.in {
20
20
  height: auto;
21
21
  }
22
- }
22
+ }
@@ -55,7 +55,7 @@
55
55
  *border-right-width: 2px;
56
56
  *border-bottom-width: 2px;
57
57
  @include border-radius(6px);
58
- @include box-shadow(#{0 5px 10px rgba(0,0,0,.2)});
58
+ @include box-shadow(0 5px 10px rgba(0,0,0,.2));
59
59
  -webkit-background-clip: padding-box;
60
60
  -moz-background-clip: padding;
61
61
  background-clip: padding-box;
@@ -72,7 +72,7 @@
72
72
  }
73
73
 
74
74
  // Links within the dropdown menu
75
- a {
75
+ li > a {
76
76
  display: block;
77
77
  padding: 3px 20px;
78
78
  clear: both;
@@ -90,7 +90,6 @@
90
90
  .dropdown-submenu:hover > a {
91
91
  text-decoration: none;
92
92
  color: $dropdownLinkColorHover;
93
- background-color: $dropdownLinkBackgroundHover;
94
93
  @include gradient-vertical($dropdownLinkBackgroundHover, darken($dropdownLinkBackgroundHover, 5%));
95
94
  }
96
95
 
@@ -98,10 +97,9 @@
98
97
  // ------------
99
98
  .dropdown-menu .active > a,
100
99
  .dropdown-menu .active > a:hover {
101
- color: $dropdownLinkColorHover;
100
+ color: $dropdownLinkColorActive;
102
101
  text-decoration: none;
103
102
  outline: 0;
104
- background-color: $dropdownLinkBackgroundActive;
105
103
  @include gradient-vertical($dropdownLinkBackgroundActive, darken($dropdownLinkBackgroundActive, 5%));
106
104
  }
107
105
 
@@ -116,6 +114,7 @@
116
114
  .dropdown-menu .disabled > a:hover {
117
115
  text-decoration: none;
118
116
  background-color: transparent;
117
+ background-image: none; // Remove CSS gradient
119
118
  cursor: default;
120
119
  }
121
120
 
@@ -163,6 +162,7 @@
163
162
  .dropdown-submenu {
164
163
  position: relative;
165
164
  }
165
+ // Default dropdowns
166
166
  .dropdown-submenu > .dropdown-menu {
167
167
  top: 0;
168
168
  left: 100%;
@@ -172,10 +172,22 @@
172
172
  -moz-border-radius: 0 6px 6px 6px;
173
173
  border-radius: 0 6px 6px 6px;
174
174
  }
175
- .dropdown-submenu:hover .dropdown-menu {
175
+ .dropdown-submenu:hover > .dropdown-menu {
176
176
  display: block;
177
177
  }
178
178
 
179
+ // Dropups
180
+ .dropup .dropdown-submenu > .dropdown-menu {
181
+ top: auto;
182
+ bottom: 0;
183
+ margin-top: 0;
184
+ margin-bottom: -2px;
185
+ -webkit-border-radius: 5px 5px 5px 0;
186
+ -moz-border-radius: 5px 5px 5px 0;
187
+ border-radius: 5px 5px 5px 0;
188
+ }
189
+
190
+ // Caret to indicate there is a submenu
179
191
  .dropdown-submenu > a:after {
180
192
  display: block;
181
193
  content: " ";
@@ -193,6 +205,21 @@
193
205
  border-left-color: $dropdownLinkColorHover;
194
206
  }
195
207
 
208
+ // Left aligned submenus
209
+ .dropdown-submenu.pull-left {
210
+ // Undo the float
211
+ // Yes, this is awkward since .pull-left adds a float, but it sticks to our conventions elsewhere.
212
+ float: none;
213
+
214
+ // Positioning the submenu
215
+ > .dropdown-menu {
216
+ left: -100%;
217
+ margin-left: 10px;
218
+ -webkit-border-radius: 6px 0 6px 6px;
219
+ -moz-border-radius: 6px 0 6px 6px;
220
+ border-radius: 6px 0 6px 6px;
221
+ }
222
+ }
196
223
 
197
224
  // Tweak nav headers
198
225
  // -----------------
@@ -206,5 +233,5 @@
206
233
  // ---------
207
234
  .typeahead {
208
235
  margin-top: 2px; // give it some space to breathe
209
- @include border-radius(4px);
236
+ @include border-radius($baseBorderRadius);
210
237
  }
@@ -42,7 +42,7 @@ input,
42
42
  button,
43
43
  select,
44
44
  textarea {
45
- @include font-shorthand($baseFontSize,normal,$baseLineHeight); // Set size, weight, line-height here
45
+ @include font-shorthand($baseFontSize, normal, $baseLineHeight); // Set size, weight, line-height here
46
46
  }
47
47
  input,
48
48
  button,
@@ -81,11 +81,12 @@ input[type="color"],
81
81
  display: inline-block;
82
82
  height: $baseLineHeight;
83
83
  padding: 4px 6px;
84
- margin-bottom: 9px;
84
+ margin-bottom: $baseLineHeight / 2;;
85
85
  font-size: $baseFontSize;
86
86
  line-height: $baseLineHeight;
87
87
  color: $gray;
88
88
  @include border-radius($inputBorderRadius);
89
+ vertical-align: middle;
89
90
  }
90
91
 
91
92
  // Reset appearance properties for textual inputs and textarea
@@ -118,15 +119,15 @@ input[type="color"],
118
119
  .uneditable-input {
119
120
  background-color: $inputBackground;
120
121
  border: 1px solid $inputBorder;
121
- @include box-shadow(#{inset 0 1px 1px rgba(0,0,0,.075)});
122
- @include transition(#{border linear .2s, box-shadow linear .2s});
122
+ @include box-shadow(inset 0 1px 1px rgba(0,0,0,.075));
123
+ @include transition(border linear .2s, box-shadow linear .2s);
123
124
 
124
125
  // Focus state
125
126
  &:focus {
126
127
  border-color: rgba(82,168,236,.8);
127
128
  outline: 0;
128
129
  outline: thin dotted \9; /* IE6-9 */
129
- @include box-shadow(#{inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6)});
130
+ @include box-shadow(inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6));
130
131
  }
131
132
  }
132
133
 
@@ -154,9 +155,9 @@ input[type="checkbox"] {
154
155
  // Set the height of select and file controls to match text inputs
155
156
  select,
156
157
  input[type="file"] {
157
- height: 30px; /* In IE7, the height of the select element cannot be changed by height, only font-size */
158
+ height: $inputHeight; /* In IE7, the height of the select element cannot be changed by height, only font-size */
158
159
  *margin-top: 4px; /* For IE7, add top margin to align select with labels */
159
- line-height: 30px;
160
+ line-height: $inputHeight;
160
161
  }
161
162
 
162
163
  // Make select elements obey height by applying a border
@@ -190,7 +191,7 @@ input[type="checkbox"]:focus {
190
191
  color: $grayLight;
191
192
  background-color: darken($inputBackground, 1%);
192
193
  border-color: $inputBorder;
193
- @include box-shadow(#{inset 0 1px 2px rgba(0,0,0,.025)});
194
+ @include box-shadow(inset 0 1px 2px rgba(0,0,0,.025));
194
195
  cursor: not-allowed;
195
196
  }
196
197
 
@@ -223,13 +224,13 @@ textarea {
223
224
  // Indent the labels to position radios/checkboxes as hanging
224
225
  .radio,
225
226
  .checkbox {
226
- min-height: 18px; // clear the floating input if there is no label text
227
- padding-left: 18px;
227
+ min-height: $baseLineHeight; // clear the floating input if there is no label text
228
+ padding-left: 20px;
228
229
  }
229
230
  .radio input[type="radio"],
230
231
  .checkbox input[type="checkbox"] {
231
232
  float: left;
232
- margin-left: -18px;
233
+ margin-left: -20px;
233
234
  }
234
235
 
235
236
  // Move the options list down to align with labels
@@ -304,8 +305,17 @@ textarea[class*="span"],
304
305
  .controls-row {
305
306
  @include clearfix(); // Clear the float from controls
306
307
  }
307
- .controls-row [class*="span"] {
308
- float: left; // Float to collapse white-space for proper grid alignment
308
+
309
+ // Float to collapse white-space for proper grid alignment
310
+ .controls-row [class*="span"],
311
+ // Redeclare the fluid grid collapse since we undo the float for inputs
312
+ .row-fluid .controls-row [class*="span"] {
313
+ float: left;
314
+ }
315
+ // Explicity set top padding on all checkboxes/radios, not just first-child
316
+ .controls-row .checkbox[class*="span"],
317
+ .controls-row .radio[class*="span"] {
318
+ padding-top: 5px;
309
319
  }
310
320
 
311
321
 
@@ -350,7 +360,7 @@ input[type="checkbox"][readonly] {
350
360
  .control-group.success {
351
361
  @include formFieldState($successText, $successText, $successBackground);
352
362
  }
353
- // Success
363
+ // Info
354
364
  .control-group.info {
355
365
  @include formFieldState($infoText, $infoText, $infoBackground);
356
366
  }
@@ -364,7 +374,7 @@ select:focus:required:invalid {
364
374
  border-color: #ee5f5b;
365
375
  &:focus {
366
376
  border-color: darken(#ee5f5b, 10%);
367
- @include box-shadow(#{0 0 6px lighten(#ee5f5b, 20%)});
377
+ @include box-shadow(0 0 6px lighten(#ee5f5b, 20%));
368
378
  }
369
379
  }
370
380
 
@@ -413,16 +423,23 @@ select:focus:required:invalid {
413
423
  .input-append,
414
424
  .input-prepend {
415
425
  margin-bottom: 5px;
416
- font-size: 0;
426
+ font-size: 0; // white space collapse hack
417
427
  white-space: nowrap; // Prevent span and input from separating
418
428
 
429
+ // Reset the white space collapse hack
430
+ input,
431
+ select,
432
+ .uneditable-input,
433
+ .dropdown-menu {
434
+ font-size: $baseFontSize;
435
+ }
436
+
419
437
  input,
420
438
  select,
421
439
  .uneditable-input {
422
440
  position: relative; // placed here by default so that on :focus we can place the input above the .add-on for full border and box-shadow goodness
423
441
  margin-bottom: 0; // prevent bottom margin from screwing up alignment in stacked forms
424
442
  *margin-left: 0;
425
- font-size: $baseFontSize;
426
443
  vertical-align: top;
427
444
  @include border-radius(0 $inputBorderRadius $inputBorderRadius 0);
428
445
  // Make input on top when focused so blue border and shadow always show
@@ -454,6 +471,7 @@ select:focus:required:invalid {
454
471
  border-color: $green;
455
472
  }
456
473
  }
474
+
457
475
  .input-prepend {
458
476
  .add-on,
459
477
  .btn {
@@ -461,17 +479,23 @@ select:focus:required:invalid {
461
479
  }
462
480
  .add-on:first-child,
463
481
  .btn:first-child {
482
+ // FYI, `.btn:first-child` accounts for a button group that's prepended
464
483
  @include border-radius($inputBorderRadius 0 0 $inputBorderRadius);
465
484
  }
466
485
  }
486
+
467
487
  .input-append {
468
488
  input,
469
489
  select,
470
490
  .uneditable-input {
471
491
  @include border-radius($inputBorderRadius 0 0 $inputBorderRadius);
492
+ + .btn-group .btn {
493
+ @include border-radius(0 $inputBorderRadius $inputBorderRadius 0);
494
+ }
472
495
  }
473
496
  .add-on,
474
- .btn {
497
+ .btn,
498
+ .btn-group {
475
499
  margin-left: -1px;
476
500
  }
477
501
  .add-on:last-child,
@@ -479,12 +503,16 @@ select:focus:required:invalid {
479
503
  @include border-radius(0 $inputBorderRadius $inputBorderRadius 0);
480
504
  }
481
505
  }
506
+
482
507
  // Remove all border-radius for inputs with both prepend and append
483
508
  .input-prepend.input-append {
484
509
  input,
485
510
  select,
486
511
  .uneditable-input {
487
512
  @include border-radius(0);
513
+ + .btn-group .btn {
514
+ @include border-radius(0 $inputBorderRadius $inputBorderRadius 0);
515
+ }
488
516
  }
489
517
  .add-on:first-child,
490
518
  .btn:first-child {
@@ -496,10 +524,14 @@ select:focus:required:invalid {
496
524
  margin-left: -1px;
497
525
  @include border-radius(0 $inputBorderRadius $inputBorderRadius 0);
498
526
  }
527
+ .btn-group:first-child {
528
+ margin-left: 0;
529
+ }
499
530
  }
500
531
 
501
532
 
502
533
 
534
+
503
535
  // SEARCH FORM
504
536
  // -----------
505
537