twitter-bootstrap-rails 3.2.2 → 4.0.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 twitter-bootstrap-rails might be problematic. Click here for more details.

Files changed (117) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +105 -130
  3. data/app/assets/fonts/glyphicons-halflings-regular.eot +0 -0
  4. data/app/assets/fonts/glyphicons-halflings-regular.svg +273 -214
  5. data/app/assets/fonts/glyphicons-halflings-regular.ttf +0 -0
  6. data/app/assets/fonts/glyphicons-halflings-regular.woff +0 -0
  7. data/app/assets/fonts/glyphicons-halflings-regular.woff2 +0 -0
  8. data/app/assets/javascripts/twitter/bootstrap/affix.js +46 -26
  9. data/app/assets/javascripts/twitter/bootstrap/alert.js +7 -5
  10. data/app/assets/javascripts/twitter/bootstrap/button.js +27 -17
  11. data/app/assets/javascripts/twitter/bootstrap/carousel.js +35 -21
  12. data/app/assets/javascripts/twitter/bootstrap/collapse.js +68 -27
  13. data/app/assets/javascripts/twitter/bootstrap/dropdown.js +55 -41
  14. data/app/assets/javascripts/twitter/bootstrap/modal.js +88 -31
  15. data/app/assets/javascripts/twitter/bootstrap/popover.js +5 -10
  16. data/app/assets/javascripts/twitter/bootstrap/scrollspy.js +28 -26
  17. data/app/assets/javascripts/twitter/bootstrap/tab.js +45 -18
  18. data/app/assets/javascripts/twitter/bootstrap/tooltip.js +111 -54
  19. data/app/assets/javascripts/twitter/bootstrap/transition.js +2 -2
  20. data/app/helpers/glyph_helper.rb +6 -3
  21. data/lib/generators/bootstrap/install/templates/bootstrap_and_overrides.css +3 -4
  22. data/lib/generators/bootstrap/install/templates/bootstrap_and_overrides.less +7 -18
  23. data/lib/generators/bootstrap/themed/templates/index.html.erb +2 -0
  24. data/lib/generators/bootstrap/themed/templates/index.html.haml +1 -0
  25. data/lib/generators/bootstrap/themed/templates/index.html.slim +2 -0
  26. data/lib/twitter/bootstrap/rails/version.rb +1 -1
  27. data/vendor/toolkit/twitter/bootstrap/alerts.less +5 -0
  28. data/vendor/toolkit/twitter/bootstrap/badges.less +14 -3
  29. data/vendor/toolkit/twitter/bootstrap/bootstrap.less +6 -0
  30. data/vendor/toolkit/twitter/bootstrap/breadcrumbs.less +0 -0
  31. data/vendor/toolkit/twitter/bootstrap/button-groups.less +13 -14
  32. data/vendor/toolkit/twitter/bootstrap/buttons.less +14 -7
  33. data/vendor/toolkit/twitter/bootstrap/carousel.less +34 -7
  34. data/vendor/toolkit/twitter/bootstrap/close.less +1 -0
  35. data/vendor/toolkit/twitter/bootstrap/code.less +0 -0
  36. data/vendor/toolkit/twitter/bootstrap/component-animations.less +3 -1
  37. data/vendor/toolkit/twitter/bootstrap/dropdowns.less +9 -8
  38. data/vendor/toolkit/twitter/bootstrap/forms.less +110 -41
  39. data/vendor/toolkit/twitter/bootstrap/glyphicons.less +80 -9
  40. data/vendor/toolkit/twitter/bootstrap/grid.less +0 -0
  41. data/vendor/toolkit/twitter/bootstrap/input-groups.less +8 -3
  42. data/vendor/toolkit/twitter/bootstrap/jumbotron.less +10 -4
  43. data/vendor/toolkit/twitter/bootstrap/labels.less +0 -0
  44. data/vendor/toolkit/twitter/bootstrap/list-group.less +11 -13
  45. data/vendor/toolkit/twitter/bootstrap/media.less +40 -30
  46. data/vendor/toolkit/twitter/bootstrap/mixins.less +1 -0
  47. data/vendor/toolkit/twitter/bootstrap/mixins/alerts.less +0 -0
  48. data/vendor/toolkit/twitter/bootstrap/mixins/background-variant.less +2 -1
  49. data/vendor/toolkit/twitter/bootstrap/mixins/border-radius.less +0 -0
  50. data/vendor/toolkit/twitter/bootstrap/mixins/buttons.less +19 -6
  51. data/vendor/toolkit/twitter/bootstrap/mixins/center-block.less +0 -0
  52. data/vendor/toolkit/twitter/bootstrap/mixins/clearfix.less +0 -0
  53. data/vendor/toolkit/twitter/bootstrap/mixins/forms.less +0 -0
  54. data/vendor/toolkit/twitter/bootstrap/mixins/gradients.less +0 -0
  55. data/vendor/toolkit/twitter/bootstrap/mixins/grid-framework.less +4 -4
  56. data/vendor/toolkit/twitter/bootstrap/mixins/grid.less +4 -4
  57. data/vendor/toolkit/twitter/bootstrap/mixins/hide-text.less +2 -2
  58. data/vendor/toolkit/twitter/bootstrap/mixins/image.less +0 -0
  59. data/vendor/toolkit/twitter/bootstrap/mixins/labels.less +1 -1
  60. data/vendor/toolkit/twitter/bootstrap/mixins/list-group.less +2 -1
  61. data/vendor/toolkit/twitter/bootstrap/mixins/nav-divider.less +0 -0
  62. data/vendor/toolkit/twitter/bootstrap/mixins/nav-vertical-align.less +0 -0
  63. data/vendor/toolkit/twitter/bootstrap/mixins/opacity.less +0 -0
  64. data/vendor/toolkit/twitter/bootstrap/mixins/pagination.less +2 -1
  65. data/vendor/toolkit/twitter/bootstrap/mixins/panels.less +0 -0
  66. data/vendor/toolkit/twitter/bootstrap/mixins/progress-bar.less +0 -0
  67. data/vendor/toolkit/twitter/bootstrap/mixins/reset-filter.less +0 -0
  68. data/vendor/toolkit/twitter/bootstrap/mixins/reset-text.less +18 -0
  69. data/vendor/toolkit/twitter/bootstrap/mixins/resize.less +0 -0
  70. data/vendor/toolkit/twitter/bootstrap/mixins/responsive-visibility.less +1 -1
  71. data/vendor/toolkit/twitter/bootstrap/mixins/size.less +0 -0
  72. data/vendor/toolkit/twitter/bootstrap/mixins/tab-focus.less +0 -0
  73. data/vendor/toolkit/twitter/bootstrap/mixins/table-row.less +0 -0
  74. data/vendor/toolkit/twitter/bootstrap/mixins/text-emphasis.less +2 -1
  75. data/vendor/toolkit/twitter/bootstrap/mixins/text-overflow.less +0 -0
  76. data/vendor/toolkit/twitter/bootstrap/mixins/vendor-prefixes.less +8 -5
  77. data/vendor/toolkit/twitter/bootstrap/modals.less +3 -3
  78. data/vendor/toolkit/twitter/bootstrap/navbar.less +6 -1
  79. data/vendor/toolkit/twitter/bootstrap/navs.less +1 -1
  80. data/vendor/toolkit/twitter/bootstrap/normalize.less +12 -13
  81. data/vendor/toolkit/twitter/bootstrap/pager.less +1 -2
  82. data/vendor/toolkit/twitter/bootstrap/pagination.less +5 -4
  83. data/vendor/toolkit/twitter/bootstrap/panels.less +27 -4
  84. data/vendor/toolkit/twitter/bootstrap/popovers.less +5 -7
  85. data/vendor/toolkit/twitter/bootstrap/print.less +96 -96
  86. data/vendor/toolkit/twitter/bootstrap/progress-bars.less +1 -14
  87. data/vendor/toolkit/twitter/bootstrap/responsive-embed.less +10 -9
  88. data/vendor/toolkit/twitter/bootstrap/responsive-utilities.less +0 -0
  89. data/vendor/toolkit/twitter/bootstrap/scaffolding.less +12 -1
  90. data/vendor/toolkit/twitter/bootstrap/tables.less +6 -5
  91. data/vendor/toolkit/twitter/bootstrap/theme.less +47 -16
  92. data/vendor/toolkit/twitter/bootstrap/thumbnails.less +1 -1
  93. data/vendor/toolkit/twitter/bootstrap/tooltip.less +13 -7
  94. data/vendor/toolkit/twitter/bootstrap/type.less +2 -8
  95. data/vendor/toolkit/twitter/bootstrap/utilities.less +0 -1
  96. data/vendor/toolkit/twitter/bootstrap/variables.less +36 -14
  97. data/vendor/toolkit/twitter/bootstrap/wells.less +0 -0
  98. metadata +45 -56
  99. data/app/assets/fonts/fontawesome-webfont.eot +0 -0
  100. data/app/assets/fonts/fontawesome-webfont.svg +0 -640
  101. data/app/assets/fonts/fontawesome-webfont.ttf +0 -0
  102. data/app/assets/fonts/fontawesome-webfont.woff +0 -0
  103. data/app/assets/stylesheets/twitter-bootstrap-static/fontawesome.css.erb +0 -2026
  104. data/vendor/static-source/fontawesome.less +0 -8
  105. data/vendor/toolkit/fontawesome/bordered-pulled.less +0 -16
  106. data/vendor/toolkit/fontawesome/core.less +0 -11
  107. data/vendor/toolkit/fontawesome/fixed-width.less +0 -6
  108. data/vendor/toolkit/fontawesome/font-awesome.less +0 -17
  109. data/vendor/toolkit/fontawesome/icons.less +0 -552
  110. data/vendor/toolkit/fontawesome/larger.less +0 -13
  111. data/vendor/toolkit/fontawesome/list.less +0 -19
  112. data/vendor/toolkit/fontawesome/mixins.less +0 -25
  113. data/vendor/toolkit/fontawesome/path.less +0 -14
  114. data/vendor/toolkit/fontawesome/rotated-flipped.less +0 -20
  115. data/vendor/toolkit/fontawesome/spinning.less +0 -29
  116. data/vendor/toolkit/fontawesome/stacked.less +0 -20
  117. data/vendor/toolkit/fontawesome/variables.less +0 -561
@@ -10,12 +10,14 @@
10
10
  height: 0;
11
11
  margin-left: 2px;
12
12
  vertical-align: middle;
13
- border-top: @caret-width-base solid;
13
+ border-top: @caret-width-base dashed;
14
+ border-top: @caret-width-base solid ~"\9"; // IE8
14
15
  border-right: @caret-width-base solid transparent;
15
16
  border-left: @caret-width-base solid transparent;
16
17
  }
17
18
 
18
19
  // The dropdown wrapper (div)
20
+ .dropup,
19
21
  .dropdown {
20
22
  position: relative;
21
23
  }
@@ -103,16 +105,15 @@
103
105
  &:focus {
104
106
  color: @dropdown-link-disabled-color;
105
107
  }
106
- }
107
- // Nuke hover/focus effects
108
- .dropdown-menu > .disabled > a {
108
+
109
+ // Nuke hover/focus effects
109
110
  &:hover,
110
111
  &:focus {
111
112
  text-decoration: none;
112
113
  background-color: transparent;
113
114
  background-image: none; // Remove CSS gradient
114
115
  .reset-filter();
115
- cursor: not-allowed;
116
+ cursor: @cursor-disabled;
116
117
  }
117
118
  }
118
119
 
@@ -184,14 +185,15 @@
184
185
  // Reverse the caret
185
186
  .caret {
186
187
  border-top: 0;
187
- border-bottom: @caret-width-base solid;
188
+ border-bottom: @caret-width-base dashed;
189
+ border-bottom: @caret-width-base solid ~"\9"; // IE8
188
190
  content: "";
189
191
  }
190
192
  // Different positioning for bottom up menu
191
193
  .dropdown-menu {
192
194
  top: auto;
193
195
  bottom: 100%;
194
- margin-bottom: 1px;
196
+ margin-bottom: 2px;
195
197
  }
196
198
  }
197
199
 
@@ -212,4 +214,3 @@
212
214
  }
213
215
  }
214
216
  }
215
-
@@ -56,7 +56,6 @@ input[type="checkbox"] {
56
56
  line-height: normal;
57
57
  }
58
58
 
59
- // Set the height of file controls to match text inputs
60
59
  input[type="file"] {
61
60
  display: block;
62
61
  }
@@ -123,7 +122,7 @@ output {
123
122
  background-color: @input-bg;
124
123
  background-image: none; // Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214
125
124
  border: 1px solid @input-border;
126
- border-radius: @input-border-radius;
125
+ border-radius: @input-border-radius; // Note: This has no effect on <select>s in some browsers, due to the limited stylability of <select>s in CSS.
127
126
  .box-shadow(inset 0 1px 1px rgba(0,0,0,.075));
128
127
  .transition(~"border-color ease-in-out .15s, box-shadow ease-in-out .15s");
129
128
 
@@ -133,6 +132,12 @@ output {
133
132
  // Placeholder
134
133
  .placeholder();
135
134
 
135
+ // Unstyle the caret on `<select>`s in IE10+.
136
+ &::-ms-expand {
137
+ border: 0;
138
+ background-color: transparent;
139
+ }
140
+
136
141
  // Disabled and read-only inputs
137
142
  //
138
143
  // HTML5 says that controls under a fieldset > legend:first-child won't be
@@ -141,9 +146,13 @@ output {
141
146
  &[disabled],
142
147
  &[readonly],
143
148
  fieldset[disabled] & {
144
- cursor: not-allowed;
145
149
  background-color: @input-bg-disabled;
146
- opacity: 1; // iOS fix for unreadable disabled content
150
+ opacity: 1; // iOS fix for unreadable disabled content; see https://github.com/twbs/bootstrap/issues/11655
151
+ }
152
+
153
+ &[disabled],
154
+ fieldset[disabled] & {
155
+ cursor: @cursor-disabled;
147
156
  }
148
157
 
149
158
  // Reset height for `textarea`s
@@ -168,26 +177,30 @@ input[type="search"] {
168
177
  // Special styles for iOS temporal inputs
169
178
  //
170
179
  // In Mobile Safari, setting `display: block` on temporal inputs causes the
171
- // text within the input to become vertically misaligned.
172
- // As a workaround, we set a pixel line-height that matches the
173
- // given height of the input. Since this fucks up everything else, we have to
174
- // appropriately reset it for Internet Explorer and the size variations.
175
-
176
- input[type="date"],
177
- input[type="time"],
178
- input[type="datetime-local"],
179
- input[type="month"] {
180
- line-height: @input-height-base;
181
- // IE8+ misaligns the text within date inputs, so we reset
182
- line-height: @line-height-base ~"\0";
180
+ // text within the input to become vertically misaligned. As a workaround, we
181
+ // set a pixel line-height that matches the given height of the input, but only
182
+ // for Safari. See https://bugs.webkit.org/show_bug.cgi?id=139848
183
+ //
184
+ // Note that as of 8.3, iOS doesn't support `datetime` or `week`.
185
+
186
+ @media screen and (-webkit-min-device-pixel-ratio: 0) {
187
+ input[type="date"],
188
+ input[type="time"],
189
+ input[type="datetime-local"],
190
+ input[type="month"] {
191
+ &.form-control {
192
+ line-height: @input-height-base;
193
+ }
183
194
 
184
- &.input-sm {
185
- line-height: @input-height-small;
186
- line-height: @line-height-small ~"\0";
187
- }
188
- &.input-lg {
189
- line-height: @input-height-large;
190
- line-height: @line-height-large ~"\0";
195
+ &.input-sm,
196
+ .input-group-sm & {
197
+ line-height: @input-height-small;
198
+ }
199
+
200
+ &.input-lg,
201
+ .input-group-lg & {
202
+ line-height: @input-height-large;
203
+ }
191
204
  }
192
205
  }
193
206
 
@@ -198,7 +211,7 @@ input[type="month"] {
198
211
  // horizontal forms, use the predefined grid classes.
199
212
 
200
213
  .form-group {
201
- margin-bottom: 15px;
214
+ margin-bottom: @form-group-margin-bottom;
202
215
  }
203
216
 
204
217
 
@@ -238,6 +251,7 @@ input[type="month"] {
238
251
  // Radios and checkboxes on same line
239
252
  .radio-inline,
240
253
  .checkbox-inline {
254
+ position: relative;
241
255
  display: inline-block;
242
256
  padding-left: 20px;
243
257
  margin-bottom: 0;
@@ -260,7 +274,7 @@ input[type="checkbox"] {
260
274
  &[disabled],
261
275
  &.disabled,
262
276
  fieldset[disabled] & {
263
- cursor: not-allowed;
277
+ cursor: @cursor-disabled;
264
278
  }
265
279
  }
266
280
  // These classes are used directly on <label>s
@@ -268,7 +282,7 @@ input[type="checkbox"] {
268
282
  .checkbox-inline {
269
283
  &.disabled,
270
284
  fieldset[disabled] & {
271
- cursor: not-allowed;
285
+ cursor: @cursor-disabled;
272
286
  }
273
287
  }
274
288
  // These classes are used on elements with <label> descendants
@@ -277,7 +291,7 @@ input[type="checkbox"] {
277
291
  &.disabled,
278
292
  fieldset[disabled] & {
279
293
  label {
280
- cursor: not-allowed;
294
+ cursor: @cursor-disabled;
281
295
  }
282
296
  }
283
297
  }
@@ -294,6 +308,7 @@ input[type="checkbox"] {
294
308
  padding-bottom: (@padding-base-vertical + 1);
295
309
  // Remove default margin from `p`
296
310
  margin-bottom: 0;
311
+ min-height: (@line-height-computed + @font-size-base);
297
312
 
298
313
  &.input-lg,
299
314
  &.input-sm {
@@ -307,15 +322,64 @@ input[type="checkbox"] {
307
322
  //
308
323
  // Build on `.form-control` with modifier classes to decrease or increase the
309
324
  // height and font-size of form controls.
325
+ //
326
+ // The `.form-group-* form-control` variations are sadly duplicated to avoid the
327
+ // issue documented in https://github.com/twbs/bootstrap/issues/15074.
310
328
 
311
- .input-sm,
312
- .form-group-sm .form-control {
313
- .input-size(@input-height-small; @padding-small-vertical; @padding-small-horizontal; @font-size-small; @line-height-small; @border-radius-small);
329
+ .input-sm {
330
+ .input-size(@input-height-small; @padding-small-vertical; @padding-small-horizontal; @font-size-small; @line-height-small; @input-border-radius-small);
331
+ }
332
+ .form-group-sm {
333
+ .form-control {
334
+ height: @input-height-small;
335
+ padding: @padding-small-vertical @padding-small-horizontal;
336
+ font-size: @font-size-small;
337
+ line-height: @line-height-small;
338
+ border-radius: @input-border-radius-small;
339
+ }
340
+ select.form-control {
341
+ height: @input-height-small;
342
+ line-height: @input-height-small;
343
+ }
344
+ textarea.form-control,
345
+ select[multiple].form-control {
346
+ height: auto;
347
+ }
348
+ .form-control-static {
349
+ height: @input-height-small;
350
+ min-height: (@line-height-computed + @font-size-small);
351
+ padding: (@padding-small-vertical + 1) @padding-small-horizontal;
352
+ font-size: @font-size-small;
353
+ line-height: @line-height-small;
354
+ }
314
355
  }
315
356
 
316
- .input-lg,
317
- .form-group-lg .form-control {
318
- .input-size(@input-height-large; @padding-large-vertical; @padding-large-horizontal; @font-size-large; @line-height-large; @border-radius-large);
357
+ .input-lg {
358
+ .input-size(@input-height-large; @padding-large-vertical; @padding-large-horizontal; @font-size-large; @line-height-large; @input-border-radius-large);
359
+ }
360
+ .form-group-lg {
361
+ .form-control {
362
+ height: @input-height-large;
363
+ padding: @padding-large-vertical @padding-large-horizontal;
364
+ font-size: @font-size-large;
365
+ line-height: @line-height-large;
366
+ border-radius: @input-border-radius-large;
367
+ }
368
+ select.form-control {
369
+ height: @input-height-large;
370
+ line-height: @input-height-large;
371
+ }
372
+ textarea.form-control,
373
+ select[multiple].form-control {
374
+ height: auto;
375
+ }
376
+ .form-control-static {
377
+ height: @input-height-large;
378
+ min-height: (@line-height-computed + @font-size-large);
379
+ padding: (@padding-large-vertical + 1) @padding-large-horizontal;
380
+ font-size: @font-size-large;
381
+ line-height: @line-height-large;
382
+ }
319
383
  }
320
384
 
321
385
 
@@ -345,12 +409,16 @@ input[type="checkbox"] {
345
409
  text-align: center;
346
410
  pointer-events: none;
347
411
  }
348
- .input-lg + .form-control-feedback {
412
+ .input-lg + .form-control-feedback,
413
+ .input-group-lg + .form-control-feedback,
414
+ .form-group-lg .form-control + .form-control-feedback {
349
415
  width: @input-height-large;
350
416
  height: @input-height-large;
351
417
  line-height: @input-height-large;
352
418
  }
353
- .input-sm + .form-control-feedback {
419
+ .input-sm + .form-control-feedback,
420
+ .input-group-sm + .form-control-feedback,
421
+ .form-group-sm .form-control + .form-control-feedback {
354
422
  width: @input-height-small;
355
423
  height: @input-height-small;
356
424
  line-height: @input-height-small;
@@ -371,10 +439,10 @@ input[type="checkbox"] {
371
439
  .has-feedback label {
372
440
 
373
441
  & ~ .form-control-feedback {
374
- top: (@line-height-computed + 5); // Height of the `label` and its margin
442
+ top: (@line-height-computed + 5); // Height of the `label` and its margin
375
443
  }
376
444
  &.sr-only ~ .form-control-feedback {
377
- top: 0;
445
+ top: 0;
378
446
  }
379
447
  }
380
448
 
@@ -448,8 +516,7 @@ input[type="checkbox"] {
448
516
  }
449
517
 
450
518
  // Remove default margin on radios/checkboxes that were used for stacking, and
451
- // then undo the floating of radios and checkboxes to match (which also avoids
452
- // a bug in WebKit: https://github.com/twbs/bootstrap/issues/1969).
519
+ // then undo the floating of radios and checkboxes to match.
453
520
  .radio,
454
521
  .checkbox {
455
522
  display: inline-block;
@@ -520,7 +587,7 @@ input[type="checkbox"] {
520
587
  // Reposition the icon because it's now within a grid column and columns have
521
588
  // `position: relative;` on them. Also accounts for the grid gutter padding.
522
589
  .has-feedback .form-control-feedback {
523
- right: (@grid-gutter-width / 2);
590
+ right: floor((@grid-gutter-width / 2));
524
591
  }
525
592
 
526
593
  // Form group sizes
@@ -530,7 +597,8 @@ input[type="checkbox"] {
530
597
  .form-group-lg {
531
598
  @media (min-width: @screen-sm-min) {
532
599
  .control-label {
533
- padding-top: ((@padding-large-vertical * @line-height-large) + 1);
600
+ padding-top: (@padding-large-vertical + 1);
601
+ font-size: @font-size-large;
534
602
  }
535
603
  }
536
604
  }
@@ -538,6 +606,7 @@ input[type="checkbox"] {
538
606
  @media (min-width: @screen-sm-min) {
539
607
  .control-label {
540
608
  padding-top: (@padding-small-vertical + 1);
609
+ font-size: @font-size-small;
541
610
  }
542
611
  }
543
612
  }
@@ -8,14 +8,14 @@
8
8
  // <a href="#"><span class="glyphicon glyphicon-star"></span> Star</a>
9
9
 
10
10
  // Import the fonts
11
-
12
11
  @font-face {
13
12
  font-family: 'Glyphicons Halflings';
14
- src: @glyphiconsEotPath;
15
- src: @glyphiconsEotPath_iefix format('embedded-opentype'),
16
- @glyphiconsWoffPath format('woff'),
17
- @glyphiconsTtfPath format('truetype'),
18
- @glyphiconsSvgPath format('svg');
13
+ src: url('@{icon-font-path}@{icon-font-name}.eot');
14
+ src: url('@{icon-font-path}@{icon-font-name}.eot?#iefix') format('embedded-opentype'),
15
+ url('@{icon-font-path}@{icon-font-name}.woff2') format('woff2'),
16
+ url('@{icon-font-path}@{icon-font-name}.woff') format('woff'),
17
+ url('@{icon-font-path}@{icon-font-name}.ttf') format('truetype'),
18
+ url('@{icon-font-path}@{icon-font-name}.svg#@{icon-font-svg-id}') format('svg');
19
19
  }
20
20
 
21
21
  // Catchall baseclass
@@ -32,9 +32,10 @@
32
32
  }
33
33
 
34
34
  // Individual icons
35
- .glyphicon-asterisk { &:before { content: "\2a"; } }
36
- .glyphicon-plus { &:before { content: "\2b"; } }
37
- .glyphicon-euro { &:before { content: "\20ac"; } }
35
+ .glyphicon-asterisk { &:before { content: "\002a"; } }
36
+ .glyphicon-plus { &:before { content: "\002b"; } }
37
+ .glyphicon-euro,
38
+ .glyphicon-eur { &:before { content: "\20ac"; } }
38
39
  .glyphicon-minus { &:before { content: "\2212"; } }
39
40
  .glyphicon-cloud { &:before { content: "\2601"; } }
40
41
  .glyphicon-envelope { &:before { content: "\2709"; } }
@@ -232,3 +233,73 @@
232
233
  .glyphicon-cloud-upload { &:before { content: "\e198"; } }
233
234
  .glyphicon-tree-conifer { &:before { content: "\e199"; } }
234
235
  .glyphicon-tree-deciduous { &:before { content: "\e200"; } }
236
+ .glyphicon-cd { &:before { content: "\e201"; } }
237
+ .glyphicon-save-file { &:before { content: "\e202"; } }
238
+ .glyphicon-open-file { &:before { content: "\e203"; } }
239
+ .glyphicon-level-up { &:before { content: "\e204"; } }
240
+ .glyphicon-copy { &:before { content: "\e205"; } }
241
+ .glyphicon-paste { &:before { content: "\e206"; } }
242
+ // The following 2 Glyphicons are omitted for the time being because
243
+ // they currently use Unicode codepoints that are outside the
244
+ // Basic Multilingual Plane (BMP). Older buggy versions of WebKit can't handle
245
+ // non-BMP codepoints in CSS string escapes, and thus can't display these two icons.
246
+ // Notably, the bug affects some older versions of the Android Browser.
247
+ // More info: https://github.com/twbs/bootstrap/issues/10106
248
+ // .glyphicon-door { &:before { content: "\1f6aa"; } }
249
+ // .glyphicon-key { &:before { content: "\1f511"; } }
250
+ .glyphicon-alert { &:before { content: "\e209"; } }
251
+ .glyphicon-equalizer { &:before { content: "\e210"; } }
252
+ .glyphicon-king { &:before { content: "\e211"; } }
253
+ .glyphicon-queen { &:before { content: "\e212"; } }
254
+ .glyphicon-pawn { &:before { content: "\e213"; } }
255
+ .glyphicon-bishop { &:before { content: "\e214"; } }
256
+ .glyphicon-knight { &:before { content: "\e215"; } }
257
+ .glyphicon-baby-formula { &:before { content: "\e216"; } }
258
+ .glyphicon-tent { &:before { content: "\26fa"; } }
259
+ .glyphicon-blackboard { &:before { content: "\e218"; } }
260
+ .glyphicon-bed { &:before { content: "\e219"; } }
261
+ .glyphicon-apple { &:before { content: "\f8ff"; } }
262
+ .glyphicon-erase { &:before { content: "\e221"; } }
263
+ .glyphicon-hourglass { &:before { content: "\231b"; } }
264
+ .glyphicon-lamp { &:before { content: "\e223"; } }
265
+ .glyphicon-duplicate { &:before { content: "\e224"; } }
266
+ .glyphicon-piggy-bank { &:before { content: "\e225"; } }
267
+ .glyphicon-scissors { &:before { content: "\e226"; } }
268
+ .glyphicon-bitcoin { &:before { content: "\e227"; } }
269
+ .glyphicon-btc { &:before { content: "\e227"; } }
270
+ .glyphicon-xbt { &:before { content: "\e227"; } }
271
+ .glyphicon-yen { &:before { content: "\00a5"; } }
272
+ .glyphicon-jpy { &:before { content: "\00a5"; } }
273
+ .glyphicon-ruble { &:before { content: "\20bd"; } }
274
+ .glyphicon-rub { &:before { content: "\20bd"; } }
275
+ .glyphicon-scale { &:before { content: "\e230"; } }
276
+ .glyphicon-ice-lolly { &:before { content: "\e231"; } }
277
+ .glyphicon-ice-lolly-tasted { &:before { content: "\e232"; } }
278
+ .glyphicon-education { &:before { content: "\e233"; } }
279
+ .glyphicon-option-horizontal { &:before { content: "\e234"; } }
280
+ .glyphicon-option-vertical { &:before { content: "\e235"; } }
281
+ .glyphicon-menu-hamburger { &:before { content: "\e236"; } }
282
+ .glyphicon-modal-window { &:before { content: "\e237"; } }
283
+ .glyphicon-oil { &:before { content: "\e238"; } }
284
+ .glyphicon-grain { &:before { content: "\e239"; } }
285
+ .glyphicon-sunglasses { &:before { content: "\e240"; } }
286
+ .glyphicon-text-size { &:before { content: "\e241"; } }
287
+ .glyphicon-text-color { &:before { content: "\e242"; } }
288
+ .glyphicon-text-background { &:before { content: "\e243"; } }
289
+ .glyphicon-object-align-top { &:before { content: "\e244"; } }
290
+ .glyphicon-object-align-bottom { &:before { content: "\e245"; } }
291
+ .glyphicon-object-align-horizontal{ &:before { content: "\e246"; } }
292
+ .glyphicon-object-align-left { &:before { content: "\e247"; } }
293
+ .glyphicon-object-align-vertical { &:before { content: "\e248"; } }
294
+ .glyphicon-object-align-right { &:before { content: "\e249"; } }
295
+ .glyphicon-triangle-right { &:before { content: "\e250"; } }
296
+ .glyphicon-triangle-left { &:before { content: "\e251"; } }
297
+ .glyphicon-triangle-bottom { &:before { content: "\e252"; } }
298
+ .glyphicon-triangle-top { &:before { content: "\e253"; } }
299
+ .glyphicon-console { &:before { content: "\e254"; } }
300
+ .glyphicon-superscript { &:before { content: "\e255"; } }
301
+ .glyphicon-subscript { &:before { content: "\e256"; } }
302
+ .glyphicon-menu-left { &:before { content: "\e257"; } }
303
+ .glyphicon-menu-right { &:before { content: "\e258"; } }
304
+ .glyphicon-menu-down { &:before { content: "\e259"; } }
305
+ .glyphicon-menu-up { &:before { content: "\e260"; } }
@@ -29,6 +29,10 @@
29
29
 
30
30
  width: 100%;
31
31
  margin-bottom: 0;
32
+
33
+ &:focus {
34
+ z-index: 3;
35
+ }
32
36
  }
33
37
  }
34
38
 
@@ -79,18 +83,18 @@
79
83
  text-align: center;
80
84
  background-color: @input-group-addon-bg;
81
85
  border: 1px solid @input-group-addon-border-color;
82
- border-radius: @border-radius-base;
86
+ border-radius: @input-border-radius;
83
87
 
84
88
  // Sizing
85
89
  &.input-sm {
86
90
  padding: @padding-small-vertical @padding-small-horizontal;
87
91
  font-size: @font-size-small;
88
- border-radius: @border-radius-small;
92
+ border-radius: @input-border-radius-small;
89
93
  }
90
94
  &.input-lg {
91
95
  padding: @padding-large-vertical @padding-large-horizontal;
92
96
  font-size: @font-size-large;
93
- border-radius: @border-radius-large;
97
+ border-radius: @input-border-radius-large;
94
98
  }
95
99
 
96
100
  // Nuke default margins from checkboxes and radios to vertically center within.
@@ -160,6 +164,7 @@
160
164
  &:last-child {
161
165
  > .btn,
162
166
  > .btn-group {
167
+ z-index: 2;
163
168
  margin-left: -1px;
164
169
  }
165
170
  }