bootstrap-sass 3.3.1.0 → 3.3.6

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

Potentially problematic release.


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

Files changed (109) hide show
  1. checksums.yaml +4 -4
  2. data/.travis.yml +8 -8
  3. data/CHANGELOG.md +44 -0
  4. data/CONTRIBUTING.md +8 -1
  5. data/Gemfile +1 -1
  6. data/LICENSE +1 -1
  7. data/README.md +69 -49
  8. data/Rakefile +46 -4
  9. data/assets/fonts/bootstrap/glyphicons-halflings-regular.eot +0 -0
  10. data/assets/fonts/bootstrap/glyphicons-halflings-regular.svg +273 -214
  11. data/assets/fonts/bootstrap/glyphicons-halflings-regular.ttf +0 -0
  12. data/assets/fonts/bootstrap/glyphicons-halflings-regular.woff +0 -0
  13. data/assets/fonts/bootstrap/glyphicons-halflings-regular.woff2 +0 -0
  14. data/assets/javascripts/bootstrap/affix.js +7 -7
  15. data/assets/javascripts/bootstrap/alert.js +3 -3
  16. data/assets/javascripts/bootstrap/button.js +14 -10
  17. data/assets/javascripts/bootstrap/carousel.js +11 -14
  18. data/assets/javascripts/bootstrap/collapse.js +9 -9
  19. data/assets/javascripts/bootstrap/dropdown.js +49 -45
  20. data/assets/javascripts/bootstrap/modal.js +45 -32
  21. data/assets/javascripts/bootstrap/popover.js +9 -20
  22. data/assets/javascripts/bootstrap/scrollspy.js +18 -21
  23. data/assets/javascripts/bootstrap/tab.js +7 -5
  24. data/assets/javascripts/bootstrap/tooltip.js +82 -46
  25. data/assets/javascripts/bootstrap/transition.js +2 -2
  26. data/assets/javascripts/bootstrap-sprockets.js +2 -2
  27. data/assets/javascripts/bootstrap.js +1210 -1151
  28. data/assets/javascripts/bootstrap.min.js +7 -0
  29. data/assets/stylesheets/_bootstrap-compass.scss +2 -0
  30. data/assets/stylesheets/_bootstrap-mincer.scss +4 -2
  31. data/assets/stylesheets/_bootstrap-sprockets.scss +2 -0
  32. data/assets/stylesheets/_bootstrap.scss +6 -0
  33. data/assets/stylesheets/bootstrap/_alerts.scss +5 -0
  34. data/assets/stylesheets/bootstrap/_badges.scss +7 -2
  35. data/assets/stylesheets/bootstrap/_breadcrumbs.scss +3 -1
  36. data/assets/stylesheets/bootstrap/_button-groups.scss +5 -4
  37. data/assets/stylesheets/bootstrap/_buttons.scss +14 -6
  38. data/assets/stylesheets/bootstrap/_carousel.scss +16 -13
  39. data/assets/stylesheets/bootstrap/_close.scss +1 -0
  40. data/assets/stylesheets/bootstrap/_component-animations.scss +1 -2
  41. data/assets/stylesheets/bootstrap/_dropdowns.scss +6 -3
  42. data/assets/stylesheets/bootstrap/_forms.scss +98 -29
  43. data/assets/stylesheets/bootstrap/_glyphicons.scss +83 -10
  44. data/assets/stylesheets/bootstrap/_input-groups.scss +8 -3
  45. data/assets/stylesheets/bootstrap/_jumbotron.scss +8 -3
  46. data/assets/stylesheets/bootstrap/_list-group.scss +9 -3
  47. data/assets/stylesheets/bootstrap/_media.scss +19 -0
  48. data/assets/stylesheets/bootstrap/_mixins.scss +1 -0
  49. data/assets/stylesheets/bootstrap/_modals.scss +4 -2
  50. data/assets/stylesheets/bootstrap/_navbar.scss +1 -1
  51. data/assets/stylesheets/bootstrap/_navs.scss +0 -2
  52. data/assets/stylesheets/bootstrap/_normalize.scss +8 -11
  53. data/assets/stylesheets/bootstrap/_pagination.scss +4 -3
  54. data/assets/stylesheets/bootstrap/_panels.scss +11 -1
  55. data/assets/stylesheets/bootstrap/_popovers.scss +4 -8
  56. data/assets/stylesheets/bootstrap/_print.scss +0 -6
  57. data/assets/stylesheets/bootstrap/_responsive-embed.scss +8 -8
  58. data/assets/stylesheets/bootstrap/_responsive-utilities.scss +8 -3
  59. data/assets/stylesheets/bootstrap/_scaffolding.scss +11 -0
  60. data/assets/stylesheets/bootstrap/_tables.scss +3 -3
  61. data/assets/stylesheets/bootstrap/_theme.scss +26 -7
  62. data/assets/stylesheets/bootstrap/_tooltip.scss +4 -6
  63. data/assets/stylesheets/bootstrap/_type.scss +2 -2
  64. data/assets/stylesheets/bootstrap/_utilities.scss +0 -1
  65. data/assets/stylesheets/bootstrap/_variables.scss +20 -10
  66. data/assets/stylesheets/bootstrap/mixins/_background-variant.scss +2 -1
  67. data/assets/stylesheets/bootstrap/mixins/_buttons.scss +19 -6
  68. data/assets/stylesheets/bootstrap/mixins/_grid-framework.scss +2 -2
  69. data/assets/stylesheets/bootstrap/mixins/_grid.scss +4 -4
  70. data/assets/stylesheets/bootstrap/mixins/_hide-text.scss +3 -3
  71. data/assets/stylesheets/bootstrap/mixins/_list-group.scss +3 -2
  72. data/assets/stylesheets/bootstrap/mixins/_opacity.scss +1 -1
  73. data/assets/stylesheets/bootstrap/mixins/_pagination.scss +2 -1
  74. data/assets/stylesheets/bootstrap/mixins/_reset-text.scss +18 -0
  75. data/assets/stylesheets/bootstrap/mixins/_responsive-visibility.scss +1 -1
  76. data/assets/stylesheets/bootstrap/mixins/_text-emphasis.scss +2 -1
  77. data/assets/stylesheets/bootstrap/mixins/_vendor-prefixes.scss +3 -3
  78. data/bootstrap-sass.gemspec +9 -9
  79. data/bower.json +5 -19
  80. data/composer.json +1 -1
  81. data/lib/bootstrap-sass/engine.rb +6 -1
  82. data/lib/bootstrap-sass/version.rb +2 -2
  83. data/lib/bootstrap-sass.rb +27 -5
  84. data/package.json +6 -6
  85. data/sache.json +1 -1
  86. data/tasks/bower.rake +2 -5
  87. data/tasks/converter/fonts_conversion.rb +1 -1
  88. data/tasks/converter/js_conversion.rb +7 -5
  89. data/tasks/converter/less_conversion.rb +41 -29
  90. data/tasks/converter/network.rb +10 -5
  91. data/tasks/converter.rb +1 -1
  92. data/templates/project/_bootstrap-variables.sass +20 -11
  93. data/templates/project/styles.sass +3 -0
  94. data/test/dummy_rails/app/assets/stylesheets/{application.css.sass → application.sass} +0 -0
  95. data/test/dummy_rails/app/views/pages/root.html.slim +43 -0
  96. data/test/dummy_rails/config/application.rb +1 -1
  97. data/test/dummy_rails/config/environments/development.rb +0 -3
  98. data/test/dummy_rails/config/environments/production.rb +7 -1
  99. data/test/dummy_rails/config/environments/test.rb +9 -1
  100. data/test/dummy_sass_only/Gemfile +1 -1
  101. data/test/gemfiles/rails_head.gemfile +17 -0
  102. data/test/node_mincer_test.rb +2 -3
  103. data/test/node_sass_compile_test.sh +2 -2
  104. data/test/sprockets_rails_test.rb +1 -1
  105. data/test/support/reporting.rb +10 -0
  106. data/test/test_helper.rb +1 -1
  107. metadata +36 -34
  108. data/test/dummy_rails/log/development.log +0 -0
  109. data/test/gemfiles/sass_3_2.gemfile +0 -6
@@ -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
  @include box-shadow(inset 0 1px 1px rgba(0,0,0,.075));
128
127
  @include 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
  @include 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: $cursor-disabled;
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
  // [converter] extracted textarea& to textarea.form-control
@@ -172,26 +181,28 @@ input[type="search"] {
172
181
  // In Mobile Safari, setting `display: block` on temporal inputs causes the
173
182
  // text within the input to become vertically misaligned. As a workaround, we
174
183
  // set a pixel line-height that matches the given height of the input, but only
175
- // for Safari.
184
+ // for Safari. See https://bugs.webkit.org/show_bug.cgi?id=139848
185
+ //
186
+ // Note that as of 8.3, iOS doesn't support `datetime` or `week`.
176
187
 
177
188
  @media screen and (-webkit-min-device-pixel-ratio: 0) {
178
189
  input[type="date"],
179
190
  input[type="time"],
180
191
  input[type="datetime-local"],
181
192
  input[type="month"] {
182
- line-height: $input-height-base;
183
- }
184
- input[type="date"].input-sm,
185
- input[type="time"].input-sm,
186
- input[type="datetime-local"].input-sm,
187
- input[type="month"].input-sm {
188
- line-height: $input-height-small;
189
- }
190
- input[type="date"].input-lg,
191
- input[type="time"].input-lg,
192
- input[type="datetime-local"].input-lg,
193
- input[type="month"].input-lg {
194
- line-height: $input-height-large;
193
+ &.form-control {
194
+ line-height: $input-height-base;
195
+ }
196
+
197
+ &.input-sm,
198
+ .input-group-sm & {
199
+ line-height: $input-height-small;
200
+ }
201
+
202
+ &.input-lg,
203
+ .input-group-lg & {
204
+ line-height: $input-height-large;
205
+ }
195
206
  }
196
207
  }
197
208
 
@@ -202,7 +213,7 @@ input[type="search"] {
202
213
  // horizontal forms, use the predefined grid classes.
203
214
 
204
215
  .form-group {
205
- margin-bottom: 15px;
216
+ margin-bottom: $form-group-margin-bottom;
206
217
  }
207
218
 
208
219
 
@@ -242,6 +253,7 @@ input[type="search"] {
242
253
  // Radios and checkboxes on same line
243
254
  .radio-inline,
244
255
  .checkbox-inline {
256
+ position: relative;
245
257
  display: inline-block;
246
258
  padding-left: 20px;
247
259
  margin-bottom: 0;
@@ -298,6 +310,7 @@ input[type="checkbox"] {
298
310
  padding-bottom: ($padding-base-vertical + 1);
299
311
  // Remove default margin from `p`
300
312
  margin-bottom: 0;
313
+ min-height: ($line-height-computed + $font-size-base);
301
314
 
302
315
  &.input-lg,
303
316
  &.input-sm {
@@ -311,10 +324,61 @@ input[type="checkbox"] {
311
324
  //
312
325
  // Build on `.form-control` with modifier classes to decrease or increase the
313
326
  // height and font-size of form controls.
327
+ //
328
+ // The `.form-group-* form-control` variations are sadly duplicated to avoid the
329
+ // issue documented in https://github.com/twbs/bootstrap/issues/15074.
314
330
 
315
- @include input-size('.input-sm, .form-group-sm .form-control', $input-height-small, $padding-small-vertical, $padding-small-horizontal, $font-size-small, $line-height-small, $input-border-radius-small);
331
+ @include input-size('.input-sm', $input-height-small, $padding-small-vertical, $padding-small-horizontal, $font-size-small, $line-height-small, $input-border-radius-small);
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
+ }
355
+ }
316
356
 
317
- @include input-size('.input-lg, .form-group-lg .form-control', $input-height-large, $padding-large-vertical, $padding-large-horizontal, $font-size-large, $line-height-large, $input-border-radius-large);
357
+ @include input-size('.input-lg', $input-height-large, $padding-large-vertical, $padding-large-horizontal, $font-size-large, $line-height-large, $input-border-radius-large);
358
+ .form-group-lg {
359
+ .form-control {
360
+ height: $input-height-large;
361
+ padding: $padding-large-vertical $padding-large-horizontal;
362
+ font-size: $font-size-large;
363
+ line-height: $line-height-large;
364
+ border-radius: $input-border-radius-large;
365
+ }
366
+ select.form-control {
367
+ height: $input-height-large;
368
+ line-height: $input-height-large;
369
+ }
370
+ textarea.form-control,
371
+ select[multiple].form-control {
372
+ height: auto;
373
+ }
374
+ .form-control-static {
375
+ height: $input-height-large;
376
+ min-height: ($line-height-computed + $font-size-large);
377
+ padding: ($padding-large-vertical + 1) $padding-large-horizontal;
378
+ font-size: $font-size-large;
379
+ line-height: $line-height-large;
380
+ }
381
+ }
318
382
 
319
383
 
320
384
  // Form control feedback states
@@ -343,12 +407,16 @@ input[type="checkbox"] {
343
407
  text-align: center;
344
408
  pointer-events: none;
345
409
  }
346
- .input-lg + .form-control-feedback {
410
+ .input-lg + .form-control-feedback,
411
+ .input-group-lg + .form-control-feedback,
412
+ .form-group-lg .form-control + .form-control-feedback {
347
413
  width: $input-height-large;
348
414
  height: $input-height-large;
349
415
  line-height: $input-height-large;
350
416
  }
351
- .input-sm + .form-control-feedback {
417
+ .input-sm + .form-control-feedback,
418
+ .input-group-sm + .form-control-feedback,
419
+ .form-group-sm .form-control + .form-control-feedback {
352
420
  width: $input-height-small;
353
421
  height: $input-height-small;
354
422
  line-height: $input-height-small;
@@ -369,10 +437,10 @@ input[type="checkbox"] {
369
437
  .has-feedback label {
370
438
 
371
439
  & ~ .form-control-feedback {
372
- top: ($line-height-computed + 5); // Height of the `label` and its margin
440
+ top: ($line-height-computed + 5); // Height of the `label` and its margin
373
441
  }
374
442
  &.sr-only ~ .form-control-feedback {
375
- top: 0;
443
+ top: 0;
376
444
  }
377
445
  }
378
446
 
@@ -447,8 +515,7 @@ input[type="checkbox"] {
447
515
  }
448
516
 
449
517
  // Remove default margin on radios/checkboxes that were used for stacking, and
450
- // then undo the floating of radios and checkboxes to match (which also avoids
451
- // a bug in WebKit: https://github.com/twbs/bootstrap/issues/1969).
518
+ // then undo the floating of radios and checkboxes to match.
452
519
  .radio,
453
520
  .checkbox {
454
521
  display: inline-block;
@@ -524,7 +591,7 @@ input[type="checkbox"] {
524
591
  // Reposition the icon because it's now within a grid column and columns have
525
592
  // `position: relative;` on them. Also accounts for the grid gutter padding.
526
593
  .has-feedback .form-control-feedback {
527
- right: ($grid-gutter-width / 2);
594
+ right: floor(($grid-gutter-width / 2));
528
595
  }
529
596
 
530
597
  // Form group sizes
@@ -534,7 +601,8 @@ input[type="checkbox"] {
534
601
  .form-group-lg {
535
602
  @media (min-width: $screen-sm-min) {
536
603
  .control-label {
537
- padding-top: (($padding-large-vertical * $line-height-large) + 1);
604
+ padding-top: ($padding-large-vertical + 1);
605
+ font-size: $font-size-large;
538
606
  }
539
607
  }
540
608
  }
@@ -542,6 +610,7 @@ input[type="checkbox"] {
542
610
  @media (min-width: $screen-sm-min) {
543
611
  .control-label {
544
612
  padding-top: ($padding-small-vertical + 1);
613
+ font-size: $font-size-small;
545
614
  }
546
615
  }
547
616
  }
@@ -7,14 +7,17 @@
7
7
  //
8
8
  // <a href="#"><span class="glyphicon glyphicon-star"></span> Star</a>
9
9
 
10
- // Import the fonts
11
- @font-face {
12
- font-family: 'Glyphicons Halflings';
13
- src: url(if($bootstrap-sass-asset-helper, twbs-font-path('#{$icon-font-path}#{$icon-font-name}.eot'), '#{$icon-font-path}#{$icon-font-name}.eot'));
14
- src: url(if($bootstrap-sass-asset-helper, twbs-font-path('#{$icon-font-path}#{$icon-font-name}.eot?#iefix'), '#{$icon-font-path}#{$icon-font-name}.eot?#iefix')) format('embedded-opentype'),
15
- url(if($bootstrap-sass-asset-helper, twbs-font-path('#{$icon-font-path}#{$icon-font-name}.woff'), '#{$icon-font-path}#{$icon-font-name}.woff')) format('woff'),
16
- url(if($bootstrap-sass-asset-helper, twbs-font-path('#{$icon-font-path}#{$icon-font-name}.ttf'), '#{$icon-font-path}#{$icon-font-name}.ttf')) format('truetype'),
17
- url(if($bootstrap-sass-asset-helper, twbs-font-path('#{$icon-font-path}#{$icon-font-name}.svg##{$icon-font-svg-id}'), '#{$icon-font-path}#{$icon-font-name}.svg##{$icon-font-svg-id}')) format('svg');
10
+ @at-root {
11
+ // Import the fonts
12
+ @font-face {
13
+ font-family: 'Glyphicons Halflings';
14
+ src: url(if($bootstrap-sass-asset-helper, twbs-font-path('#{$icon-font-path}#{$icon-font-name}.eot'), '#{$icon-font-path}#{$icon-font-name}.eot'));
15
+ src: url(if($bootstrap-sass-asset-helper, twbs-font-path('#{$icon-font-path}#{$icon-font-name}.eot?#iefix'), '#{$icon-font-path}#{$icon-font-name}.eot?#iefix')) format('embedded-opentype'),
16
+ url(if($bootstrap-sass-asset-helper, twbs-font-path('#{$icon-font-path}#{$icon-font-name}.woff2'), '#{$icon-font-path}#{$icon-font-name}.woff2')) format('woff2'),
17
+ url(if($bootstrap-sass-asset-helper, twbs-font-path('#{$icon-font-path}#{$icon-font-name}.woff'), '#{$icon-font-path}#{$icon-font-name}.woff')) format('woff'),
18
+ url(if($bootstrap-sass-asset-helper, twbs-font-path('#{$icon-font-path}#{$icon-font-name}.ttf'), '#{$icon-font-path}#{$icon-font-name}.ttf')) format('truetype'),
19
+ url(if($bootstrap-sass-asset-helper, twbs-font-path('#{$icon-font-path}#{$icon-font-name}.svg##{$icon-font-svg-id}'), '#{$icon-font-path}#{$icon-font-name}.svg##{$icon-font-svg-id}')) format('svg');
20
+ }
18
21
  }
19
22
 
20
23
  // Catchall baseclass
@@ -31,8 +34,8 @@
31
34
  }
32
35
 
33
36
  // Individual icons
34
- .glyphicon-asterisk { &:before { content: "\2a"; } }
35
- .glyphicon-plus { &:before { content: "\2b"; } }
37
+ .glyphicon-asterisk { &:before { content: "\002a"; } }
38
+ .glyphicon-plus { &:before { content: "\002b"; } }
36
39
  .glyphicon-euro,
37
40
  .glyphicon-eur { &:before { content: "\20ac"; } }
38
41
  .glyphicon-minus { &:before { content: "\2212"; } }
@@ -232,3 +235,73 @@
232
235
  .glyphicon-cloud-upload { &:before { content: "\e198"; } }
233
236
  .glyphicon-tree-conifer { &:before { content: "\e199"; } }
234
237
  .glyphicon-tree-deciduous { &:before { content: "\e200"; } }
238
+ .glyphicon-cd { &:before { content: "\e201"; } }
239
+ .glyphicon-save-file { &:before { content: "\e202"; } }
240
+ .glyphicon-open-file { &:before { content: "\e203"; } }
241
+ .glyphicon-level-up { &:before { content: "\e204"; } }
242
+ .glyphicon-copy { &:before { content: "\e205"; } }
243
+ .glyphicon-paste { &:before { content: "\e206"; } }
244
+ // The following 2 Glyphicons are omitted for the time being because
245
+ // they currently use Unicode codepoints that are outside the
246
+ // Basic Multilingual Plane (BMP). Older buggy versions of WebKit can't handle
247
+ // non-BMP codepoints in CSS string escapes, and thus can't display these two icons.
248
+ // Notably, the bug affects some older versions of the Android Browser.
249
+ // More info: https://github.com/twbs/bootstrap/issues/10106
250
+ // .glyphicon-door { &:before { content: "\1f6aa"; } }
251
+ // .glyphicon-key { &:before { content: "\1f511"; } }
252
+ .glyphicon-alert { &:before { content: "\e209"; } }
253
+ .glyphicon-equalizer { &:before { content: "\e210"; } }
254
+ .glyphicon-king { &:before { content: "\e211"; } }
255
+ .glyphicon-queen { &:before { content: "\e212"; } }
256
+ .glyphicon-pawn { &:before { content: "\e213"; } }
257
+ .glyphicon-bishop { &:before { content: "\e214"; } }
258
+ .glyphicon-knight { &:before { content: "\e215"; } }
259
+ .glyphicon-baby-formula { &:before { content: "\e216"; } }
260
+ .glyphicon-tent { &:before { content: "\26fa"; } }
261
+ .glyphicon-blackboard { &:before { content: "\e218"; } }
262
+ .glyphicon-bed { &:before { content: "\e219"; } }
263
+ .glyphicon-apple { &:before { content: "\f8ff"; } }
264
+ .glyphicon-erase { &:before { content: "\e221"; } }
265
+ .glyphicon-hourglass { &:before { content: "\231b"; } }
266
+ .glyphicon-lamp { &:before { content: "\e223"; } }
267
+ .glyphicon-duplicate { &:before { content: "\e224"; } }
268
+ .glyphicon-piggy-bank { &:before { content: "\e225"; } }
269
+ .glyphicon-scissors { &:before { content: "\e226"; } }
270
+ .glyphicon-bitcoin { &:before { content: "\e227"; } }
271
+ .glyphicon-btc { &:before { content: "\e227"; } }
272
+ .glyphicon-xbt { &:before { content: "\e227"; } }
273
+ .glyphicon-yen { &:before { content: "\00a5"; } }
274
+ .glyphicon-jpy { &:before { content: "\00a5"; } }
275
+ .glyphicon-ruble { &:before { content: "\20bd"; } }
276
+ .glyphicon-rub { &:before { content: "\20bd"; } }
277
+ .glyphicon-scale { &:before { content: "\e230"; } }
278
+ .glyphicon-ice-lolly { &:before { content: "\e231"; } }
279
+ .glyphicon-ice-lolly-tasted { &:before { content: "\e232"; } }
280
+ .glyphicon-education { &:before { content: "\e233"; } }
281
+ .glyphicon-option-horizontal { &:before { content: "\e234"; } }
282
+ .glyphicon-option-vertical { &:before { content: "\e235"; } }
283
+ .glyphicon-menu-hamburger { &:before { content: "\e236"; } }
284
+ .glyphicon-modal-window { &:before { content: "\e237"; } }
285
+ .glyphicon-oil { &:before { content: "\e238"; } }
286
+ .glyphicon-grain { &:before { content: "\e239"; } }
287
+ .glyphicon-sunglasses { &:before { content: "\e240"; } }
288
+ .glyphicon-text-size { &:before { content: "\e241"; } }
289
+ .glyphicon-text-color { &:before { content: "\e242"; } }
290
+ .glyphicon-text-background { &:before { content: "\e243"; } }
291
+ .glyphicon-object-align-top { &:before { content: "\e244"; } }
292
+ .glyphicon-object-align-bottom { &:before { content: "\e245"; } }
293
+ .glyphicon-object-align-horizontal{ &:before { content: "\e246"; } }
294
+ .glyphicon-object-align-left { &:before { content: "\e247"; } }
295
+ .glyphicon-object-align-vertical { &:before { content: "\e248"; } }
296
+ .glyphicon-object-align-right { &:before { content: "\e249"; } }
297
+ .glyphicon-triangle-right { &:before { content: "\e250"; } }
298
+ .glyphicon-triangle-left { &:before { content: "\e251"; } }
299
+ .glyphicon-triangle-bottom { &:before { content: "\e252"; } }
300
+ .glyphicon-triangle-top { &:before { content: "\e253"; } }
301
+ .glyphicon-console { &:before { content: "\e254"; } }
302
+ .glyphicon-superscript { &:before { content: "\e255"; } }
303
+ .glyphicon-subscript { &:before { content: "\e256"; } }
304
+ .glyphicon-menu-left { &:before { content: "\e257"; } }
305
+ .glyphicon-menu-right { &:before { content: "\e258"; } }
306
+ .glyphicon-menu-down { &:before { content: "\e259"; } }
307
+ .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
  }
@@ -4,7 +4,8 @@
4
4
 
5
5
 
6
6
  .jumbotron {
7
- padding: $jumbotron-padding ($jumbotron-padding / 2);
7
+ padding-top: $jumbotron-padding;
8
+ padding-bottom: $jumbotron-padding;
8
9
  margin-bottom: $jumbotron-padding;
9
10
  color: $jumbotron-color;
10
11
  background-color: $jumbotron-bg;
@@ -13,6 +14,7 @@
13
14
  .h1 {
14
15
  color: $jumbotron-heading-color;
15
16
  }
17
+
16
18
  p {
17
19
  margin-bottom: ($jumbotron-padding / 2);
18
20
  font-size: $jumbotron-font-size;
@@ -26,6 +28,8 @@
26
28
  .container &,
27
29
  .container-fluid & {
28
30
  border-radius: $border-radius-large; // Only round corners at higher resolutions if contained in a container
31
+ padding-left: ($grid-gutter-width / 2);
32
+ padding-right: ($grid-gutter-width / 2);
29
33
  }
30
34
 
31
35
  .container {
@@ -33,7 +37,8 @@
33
37
  }
34
38
 
35
39
  @media screen and (min-width: $screen-sm-min) {
36
- padding: ($jumbotron-padding * 1.6) 0;
40
+ padding-top: ($jumbotron-padding * 1.6);
41
+ padding-bottom: ($jumbotron-padding * 1.6);
37
42
 
38
43
  .container &,
39
44
  .container-fluid & {
@@ -43,7 +48,7 @@
43
48
 
44
49
  h1,
45
50
  .h1 {
46
- font-size: ($font-size-base * 4.5);
51
+ font-size: $jumbotron-heading-font-size;
47
52
  }
48
53
  }
49
54
  }
@@ -38,12 +38,13 @@
38
38
  }
39
39
 
40
40
 
41
- // Linked list items
41
+ // Interactive list items
42
42
  //
43
- // Use anchor elements instead of `li`s or `div`s to create linked list items.
43
+ // Use anchor or button elements instead of `li`s or `div`s to create interactive items.
44
44
  // Includes an extra `.active` modifier class for showing selected items.
45
45
 
46
- a.list-group-item {
46
+ a.list-group-item,
47
+ button.list-group-item {
47
48
  color: $list-group-link-color;
48
49
 
49
50
  .list-group-item-heading {
@@ -59,6 +60,11 @@ a.list-group-item {
59
60
  }
60
61
  }
61
62
 
63
+ button.list-group-item {
64
+ width: 100%;
65
+ text-align: left;
66
+ }
67
+
62
68
  .list-group-item {
63
69
  // Disabled state
64
70
  &.disabled,
@@ -7,6 +7,25 @@
7
7
  }
8
8
  }
9
9
 
10
+ .media,
11
+ .media-body {
12
+ zoom: 1;
13
+ overflow: hidden;
14
+ }
15
+
16
+ .media-body {
17
+ width: 10000px;
18
+ }
19
+
20
+ .media-object {
21
+ display: block;
22
+
23
+ // Fix collapse in webkit from max-width: 100% and display: table-cell.
24
+ &.img-thumbnail {
25
+ max-width: none;
26
+ }
27
+ }
28
+
10
29
  .media-right,
11
30
  .media > .pull-right {
12
31
  padding-left: 10px;
@@ -11,6 +11,7 @@
11
11
  @import "mixins/responsive-visibility";
12
12
  @import "mixins/size";
13
13
  @import "mixins/tab-focus";
14
+ @import "mixins/reset-text";
14
15
  @import "mixins/text-emphasis";
15
16
  @import "mixins/text-overflow";
16
17
  @import "mixins/vendor-prefixes";
@@ -62,10 +62,12 @@
62
62
 
63
63
  // Modal background
64
64
  .modal-backdrop {
65
- position: absolute;
65
+ position: fixed;
66
66
  top: 0;
67
67
  right: 0;
68
+ bottom: 0;
68
69
  left: 0;
70
+ z-index: $zindex-modal-background;
69
71
  background-color: $modal-backdrop-bg;
70
72
  // Fade for backdrop
71
73
  &.fade { @include opacity(0); }
@@ -77,7 +79,7 @@
77
79
  .modal-header {
78
80
  padding: $modal-title-padding;
79
81
  border-bottom: 1px solid $modal-header-border-color;
80
- min-height: ($modal-title-padding + $modal-title-line-height);
82
+ @include clearfix;
81
83
  }
82
84
  // Close icon
83
85
  .modal-header .close {
@@ -67,7 +67,6 @@
67
67
 
68
68
  &.collapse {
69
69
  display: block !important;
70
- visibility: visible !important;
71
70
  height: auto !important;
72
71
  padding-bottom: 0; // Override default setting
73
72
  overflow: visible !important;
@@ -331,6 +330,7 @@
331
330
  }
332
331
  // Menu position and menu caret support for dropups via extra dropup class
333
332
  .navbar-fixed-bottom .navbar-nav > li > .dropdown-menu {
333
+ margin-bottom: 0;
334
334
  @include border-top-radius($navbar-border-radius);
335
335
  @include border-bottom-radius(0);
336
336
  }
@@ -223,11 +223,9 @@
223
223
  .tab-content {
224
224
  > .tab-pane {
225
225
  display: none;
226
- visibility: hidden;
227
226
  }
228
227
  > .active {
229
228
  display: block;
230
- visibility: visible;
231
229
  }
232
230
  }
233
231
 
@@ -1,9 +1,9 @@
1
- /*! normalize.css v3.0.2 | MIT License | git.io/normalize */
1
+ /*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */
2
2
 
3
3
  //
4
4
  // 1. Set default font family to sans-serif.
5
- // 2. Prevent iOS text size adjust after orientation change, without disabling
6
- // user zoom.
5
+ // 2. Prevent iOS and IE text size adjust after device orientation change,
6
+ // without disabling user zoom.
7
7
  //
8
8
 
9
9
  html {
@@ -71,7 +71,7 @@ audio:not([controls]) {
71
71
 
72
72
  //
73
73
  // Address `[hidden]` styling not present in IE 8/9/10.
74
- // Hide the `template` element in IE 8/9/11, Safari, and Firefox < 22.
74
+ // Hide the `template` element in IE 8/9/10/11, Safari, and Firefox < 22.
75
75
  //
76
76
 
77
77
  [hidden],
@@ -91,7 +91,8 @@ a {
91
91
  }
92
92
 
93
93
  //
94
- // Improve readability when focused and also mouse hovered in all browsers.
94
+ // Improve readability of focused elements when they are also in an
95
+ // active/hover state.
95
96
  //
96
97
 
97
98
  a:active,
@@ -209,7 +210,6 @@ figure {
209
210
  //
210
211
 
211
212
  hr {
212
- -moz-box-sizing: content-box;
213
213
  box-sizing: content-box;
214
214
  height: 0;
215
215
  }
@@ -350,15 +350,12 @@ input[type="number"]::-webkit-outer-spin-button {
350
350
 
351
351
  //
352
352
  // 1. Address `appearance` set to `searchfield` in Safari and Chrome.
353
- // 2. Address `box-sizing` set to `border-box` in Safari and Chrome
354
- // (include `-moz` to future-proof).
353
+ // 2. Address `box-sizing` set to `border-box` in Safari and Chrome.
355
354
  //
356
355
 
357
356
  input[type="search"] {
358
357
  -webkit-appearance: textfield; // 1
359
- -moz-box-sizing: content-box;
360
- -webkit-box-sizing: content-box; // 2
361
- box-sizing: content-box;
358
+ box-sizing: content-box; //2
362
359
  }
363
360
 
364
361
  //
@@ -40,6 +40,7 @@
40
40
  > li > span {
41
41
  &:hover,
42
42
  &:focus {
43
+ z-index: 2;
43
44
  color: $pagination-hover-color;
44
45
  background-color: $pagination-hover-bg;
45
46
  border-color: $pagination-hover-border;
@@ -51,7 +52,7 @@
51
52
  &,
52
53
  &:hover,
53
54
  &:focus {
54
- z-index: 2;
55
+ z-index: 3;
55
56
  color: $pagination-active-color;
56
57
  background-color: $pagination-active-bg;
57
58
  border-color: $pagination-active-border;
@@ -79,10 +80,10 @@
79
80
 
80
81
  // Large
81
82
  .pagination-lg {
82
- @include pagination-size($padding-large-vertical, $padding-large-horizontal, $font-size-large, $border-radius-large);
83
+ @include pagination-size($padding-large-vertical, $padding-large-horizontal, $font-size-large, $line-height-large, $border-radius-large);
83
84
  }
84
85
 
85
86
  // Small
86
87
  .pagination-sm {
87
- @include pagination-size($padding-small-vertical, $padding-small-horizontal, $font-size-small, $border-radius-small);
88
+ @include pagination-size($padding-small-vertical, $padding-small-horizontal, $font-size-small, $line-height-small, $border-radius-small);
88
89
  }
@@ -36,7 +36,11 @@
36
36
  font-size: ceil(($font-size-base * 1.125));
37
37
  color: inherit;
38
38
 
39
- > a {
39
+ > a,
40
+ > small,
41
+ > .small,
42
+ > small > a,
43
+ > .small > a {
40
44
  color: inherit;
41
45
  }
42
46
  }
@@ -72,6 +76,7 @@
72
76
  @include border-top-radius(($panel-border-radius - 1));
73
77
  }
74
78
  }
79
+
75
80
  // Add border bottom radius for last one
76
81
  &:last-child {
77
82
  .list-group-item:last-child {
@@ -80,6 +85,11 @@
80
85
  }
81
86
  }
82
87
  }
88
+ > .panel-heading + .panel-collapse > .list-group {
89
+ .list-group-item:first-child {
90
+ @include border-top-radius(0);
91
+ }
92
+ }
83
93
  }
84
94
  // Collapse space between when there's no additional content.
85
95
  .panel-heading + .list-group {