bootstrap_farsi 3.2.0.1 → 3.3.6

Sign up to get free protection for your applications and to get access to all the features.
Files changed (70) hide show
  1. checksums.yaml +4 -4
  2. data/.gitignore +1 -0
  3. data/README.md +1 -1
  4. data/app/assets/javascripts/twitter/bootstrap.js +5 -4
  5. data/app/assets/javascripts/twitter/bootstrap/affix.js +46 -26
  6. data/app/assets/javascripts/twitter/bootstrap/alert.js +7 -5
  7. data/app/assets/javascripts/twitter/bootstrap/button.js +27 -17
  8. data/app/assets/javascripts/twitter/bootstrap/carousel.js +35 -21
  9. data/app/assets/javascripts/twitter/bootstrap/collapse.js +68 -27
  10. data/app/assets/javascripts/twitter/bootstrap/dropdown.js +55 -41
  11. data/app/assets/javascripts/twitter/bootstrap/modal.js +88 -31
  12. data/app/assets/javascripts/twitter/bootstrap/popover.js +5 -10
  13. data/app/assets/javascripts/twitter/bootstrap/scrollspy.js +28 -26
  14. data/app/assets/javascripts/twitter/bootstrap/tab.js +45 -18
  15. data/app/assets/javascripts/twitter/bootstrap/tooltip.js +111 -54
  16. data/app/assets/javascripts/twitter/bootstrap/transition.js +2 -2
  17. data/app/frameworks/twitter/bootstrap/alerts.less +5 -0
  18. data/app/frameworks/twitter/bootstrap/badges.less +14 -3
  19. data/app/frameworks/twitter/bootstrap/bootstrap.less +7 -1
  20. data/app/frameworks/twitter/bootstrap/button-groups.less +21 -17
  21. data/app/frameworks/twitter/bootstrap/buttons.less +19 -10
  22. data/app/frameworks/twitter/bootstrap/carousel.less +40 -11
  23. data/app/frameworks/twitter/bootstrap/close.less +1 -0
  24. data/app/frameworks/twitter/bootstrap/code.less +1 -0
  25. data/app/frameworks/twitter/bootstrap/component-animations.less +3 -1
  26. data/app/frameworks/twitter/bootstrap/dropdowns.less +9 -8
  27. data/app/frameworks/twitter/bootstrap/forms.less +123 -50
  28. data/app/frameworks/twitter/bootstrap/glyphicons.less +75 -3
  29. data/app/frameworks/twitter/bootstrap/input-groups.less +8 -3
  30. data/app/frameworks/twitter/bootstrap/jumbotron.less +10 -4
  31. data/app/frameworks/twitter/bootstrap/list-group.less +10 -11
  32. data/app/frameworks/twitter/bootstrap/media.less +40 -30
  33. data/app/frameworks/twitter/bootstrap/mixins.less +1 -0
  34. data/app/frameworks/twitter/bootstrap/mixins/background-variant.less +2 -1
  35. data/app/frameworks/twitter/bootstrap/mixins/border-radius.less +9 -1
  36. data/app/frameworks/twitter/bootstrap/mixins/buttons.less +19 -4
  37. data/app/frameworks/twitter/bootstrap/mixins/forms.less +5 -1
  38. data/app/frameworks/twitter/bootstrap/mixins/grid-framework.less +3 -3
  39. data/app/frameworks/twitter/bootstrap/mixins/grid.less +4 -4
  40. data/app/frameworks/twitter/bootstrap/mixins/hide-text.less +2 -2
  41. data/app/frameworks/twitter/bootstrap/mixins/image.less +0 -1
  42. data/app/frameworks/twitter/bootstrap/mixins/labels.less +1 -1
  43. data/app/frameworks/twitter/bootstrap/mixins/list-group.less +2 -1
  44. data/app/frameworks/twitter/bootstrap/mixins/pagination.less +2 -1
  45. data/app/frameworks/twitter/bootstrap/mixins/reset-text.less +18 -0
  46. data/app/frameworks/twitter/bootstrap/mixins/responsive-visibility.less +1 -1
  47. data/app/frameworks/twitter/bootstrap/mixins/text-emphasis.less +2 -1
  48. data/app/frameworks/twitter/bootstrap/mixins/vendor-prefixes.less +8 -5
  49. data/app/frameworks/twitter/bootstrap/modals.less +3 -3
  50. data/app/frameworks/twitter/bootstrap/navbar.less +30 -25
  51. data/app/frameworks/twitter/bootstrap/navs.less +1 -1
  52. data/app/frameworks/twitter/bootstrap/normalize.less +12 -13
  53. data/app/frameworks/twitter/bootstrap/pager.less +1 -2
  54. data/app/frameworks/twitter/bootstrap/pagination.less +5 -4
  55. data/app/frameworks/twitter/bootstrap/panels.less +36 -8
  56. data/app/frameworks/twitter/bootstrap/popovers.less +7 -9
  57. data/app/frameworks/twitter/bootstrap/print.less +96 -96
  58. data/app/frameworks/twitter/bootstrap/progress-bars.less +1 -19
  59. data/app/frameworks/twitter/bootstrap/responsive-embed.less +10 -9
  60. data/app/frameworks/twitter/bootstrap/scaffolding.less +12 -1
  61. data/app/frameworks/twitter/bootstrap/tables.less +14 -13
  62. data/app/frameworks/twitter/bootstrap/theme.less +49 -16
  63. data/app/frameworks/twitter/bootstrap/thumbnails.less +1 -1
  64. data/app/frameworks/twitter/bootstrap/tooltip.less +15 -9
  65. data/app/frameworks/twitter/bootstrap/type.less +2 -13
  66. data/app/frameworks/twitter/bootstrap/utilities.less +0 -2
  67. data/app/frameworks/twitter/bootstrap/variables.less +44 -21
  68. data/bootstrap_farsi.gemspec +1 -1
  69. data/lib/bootstrap_farsi/version.rb +1 -1
  70. metadata +5 -4
@@ -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,24 +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
- }
187
- &.input-lg {
188
- line-height: @input-height-large;
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
+ }
189
204
  }
190
205
  }
191
206
 
@@ -196,7 +211,7 @@ input[type="month"] {
196
211
  // horizontal forms, use the predefined grid classes.
197
212
 
198
213
  .form-group {
199
- margin-bottom: 15px;
214
+ margin-bottom: @form-group-margin-bottom;
200
215
  }
201
216
 
202
217
 
@@ -208,11 +223,11 @@ input[type="month"] {
208
223
  .checkbox {
209
224
  position: relative;
210
225
  display: block;
211
- min-height: @line-height-computed; // clear the floating input if there is no label text
212
226
  margin-top: 10px;
213
227
  margin-bottom: 10px;
214
228
 
215
229
  label {
230
+ min-height: @line-height-computed; // Ensure the input doesn't jump when there is no text
216
231
  .padding-left(20px);
217
232
  margin-bottom: 0;
218
233
  font-weight: normal;
@@ -236,6 +251,7 @@ input[type="month"] {
236
251
  // Radios and checkboxes on same line
237
252
  .radio-inline,
238
253
  .checkbox-inline {
254
+ position: relative;
239
255
  display: inline-block;
240
256
  .padding-left(20px);
241
257
  margin-bottom: 0;
@@ -258,7 +274,7 @@ input[type="checkbox"] {
258
274
  &[disabled],
259
275
  &.disabled,
260
276
  fieldset[disabled] & {
261
- cursor: not-allowed;
277
+ cursor: @cursor-disabled;
262
278
  }
263
279
  }
264
280
  // These classes are used directly on <label>s
@@ -266,7 +282,7 @@ input[type="checkbox"] {
266
282
  .checkbox-inline {
267
283
  &.disabled,
268
284
  fieldset[disabled] & {
269
- cursor: not-allowed;
285
+ cursor: @cursor-disabled;
270
286
  }
271
287
  }
272
288
  // These classes are used on elements with <label> descendants
@@ -275,7 +291,7 @@ input[type="checkbox"] {
275
291
  &.disabled,
276
292
  fieldset[disabled] & {
277
293
  label {
278
- cursor: not-allowed;
294
+ cursor: @cursor-disabled;
279
295
  }
280
296
  }
281
297
  }
@@ -292,6 +308,7 @@ input[type="checkbox"] {
292
308
  padding-bottom: (@padding-base-vertical + 1);
293
309
  // Remove default margin from `p`
294
310
  margin-bottom: 0;
311
+ min-height: (@line-height-computed + @font-size-base);
295
312
 
296
313
  &.input-lg,
297
314
  &.input-sm {
@@ -305,13 +322,64 @@ input[type="checkbox"] {
305
322
  //
306
323
  // Build on `.form-control` with modifier classes to decrease or increase the
307
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.
308
328
 
309
329
  .input-sm {
310
- .input-size(@input-height-small; @padding-small-vertical; @padding-small-horizontal; @font-size-small; @line-height-small; @border-radius-small);
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
+ }
311
355
  }
312
356
 
313
357
  .input-lg {
314
- .input-size(@input-height-large; @padding-large-vertical; @padding-large-horizontal; @font-size-large; @line-height-large; @border-radius-large);
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
+ }
315
383
  }
316
384
 
317
385
 
@@ -331,7 +399,7 @@ input[type="checkbox"] {
331
399
  // Feedback icon (requires .glyphicon classes)
332
400
  .form-control-feedback {
333
401
  position: absolute;
334
- top: (@line-height-computed + 5); // Height of the `label` and its margin
402
+ top: 0;
335
403
  .right(0);
336
404
  z-index: 2; // Ensure icon is above input groups
337
405
  display: block;
@@ -339,13 +407,18 @@ input[type="checkbox"] {
339
407
  height: @input-height-base;
340
408
  line-height: @input-height-base;
341
409
  text-align: center;
410
+ pointer-events: none;
342
411
  }
343
- .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 {
344
415
  width: @input-height-large;
345
416
  height: @input-height-large;
346
417
  line-height: @input-height-large;
347
418
  }
348
- .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 {
349
422
  width: @input-height-small;
350
423
  height: @input-height-small;
351
424
  line-height: @input-height-small;
@@ -362,10 +435,15 @@ input[type="checkbox"] {
362
435
  .form-control-validation(@state-danger-text; @state-danger-text; @state-danger-bg);
363
436
  }
364
437
 
438
+ // Reposition feedback icon if input has visible label above
439
+ .has-feedback label {
365
440
 
366
- // Reposition feedback icon if label is hidden with "screenreader only" state
367
- .has-feedback label.sr-only ~ .form-control-feedback {
368
- top: 0;
441
+ & ~ .form-control-feedback {
442
+ top: (@line-height-computed + 5); // Height of the `label` and its margin
443
+ }
444
+ &.sr-only ~ .form-control-feedback {
445
+ top: 0;
446
+ }
369
447
  }
370
448
 
371
449
 
@@ -382,7 +460,6 @@ input[type="checkbox"] {
382
460
  }
383
461
 
384
462
 
385
-
386
463
  // Inline forms
387
464
  //
388
465
  // Make forms appear inline(-block) by adding the `.form-inline` class. Inline
@@ -412,6 +489,11 @@ input[type="checkbox"] {
412
489
  vertical-align: middle;
413
490
  }
414
491
 
492
+ // Make static controls behave like regular ones
493
+ .form-control-static {
494
+ display: inline-block;
495
+ }
496
+
415
497
  .input-group {
416
498
  display: inline-table;
417
499
  vertical-align: middle;
@@ -434,8 +516,7 @@ input[type="checkbox"] {
434
516
  }
435
517
 
436
518
  // Remove default margin on radios/checkboxes that were used for stacking, and
437
- // then undo the floating of radios and checkboxes to match (which also avoids
438
- // a bug in WebKit: https://github.com/twbs/bootstrap/issues/1969).
519
+ // then undo the floating of radios and checkboxes to match.
439
520
  .radio,
440
521
  .checkbox {
441
522
  display: inline-block;
@@ -453,10 +534,7 @@ input[type="checkbox"] {
453
534
  .margin-left(0);
454
535
  }
455
536
 
456
- // Validation states
457
- //
458
- // Reposition the icon because it's now within a grid column and columns have
459
- // `position: relative;` on them. Also accounts for the grid gutter padding.
537
+ // Re-override the feedback icon.
460
538
  .has-feedback .form-control-feedback {
461
539
  top: 0;
462
540
  }
@@ -509,8 +587,7 @@ input[type="checkbox"] {
509
587
  // Reposition the icon because it's now within a grid column and columns have
510
588
  // `position: relative;` on them. Also accounts for the grid gutter padding.
511
589
  .has-feedback .form-control-feedback {
512
- top: 0;
513
- .right((@grid-gutter-width / 2));
590
+ .right(floor((@grid-gutter-width / 2)));
514
591
  }
515
592
 
516
593
  // Form group sizes
@@ -520,21 +597,17 @@ input[type="checkbox"] {
520
597
  .form-group-lg {
521
598
  @media (min-width: @screen-sm-min) {
522
599
  .control-label {
523
- padding-top: ((@padding-large-vertical * @line-height-large) + 1);
600
+ padding-top: (@padding-large-vertical + 1);
601
+ font-size: @font-size-large;
524
602
  }
525
603
  }
526
- .form-control {
527
- &:extend(.input-lg);
528
- }
529
604
  }
530
605
  .form-group-sm {
531
606
  @media (min-width: @screen-sm-min) {
532
607
  .control-label {
533
608
  padding-top: (@padding-small-vertical + 1);
609
+ font-size: @font-size-small;
534
610
  }
535
611
  }
536
- .form-control {
537
- &:extend(.input-sm);
538
- }
539
612
  }
540
613
  }
@@ -12,6 +12,7 @@
12
12
  font-family: 'Glyphicons Halflings';
13
13
  src: url('@{icon-font-path}@{icon-font-name}.eot');
14
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'),
15
16
  url('@{icon-font-path}@{icon-font-name}.woff') format('woff'),
16
17
  url('@{icon-font-path}@{icon-font-name}.ttf') format('truetype'),
17
18
  url('@{icon-font-path}@{icon-font-name}.svg#@{icon-font-svg-id}') format('svg');
@@ -31,9 +32,10 @@
31
32
  }
32
33
 
33
34
  // Individual icons
34
- .glyphicon-asterisk { &:before { content: "\2a"; } }
35
- .glyphicon-plus { &:before { content: "\2b"; } }
36
- .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"; } }
37
39
  .glyphicon-minus { &:before { content: "\2212"; } }
38
40
  .glyphicon-cloud { &:before { content: "\2601"; } }
39
41
  .glyphicon-envelope { &:before { content: "\2709"; } }
@@ -231,3 +233,73 @@
231
233
  .glyphicon-cloud-upload { &:before { content: "\e198"; } }
232
234
  .glyphicon-tree-conifer { &:before { content: "\e199"; } }
233
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
  }