twitter-bootstrap-rails 3.2.0 → 5.0.0

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

Potentially problematic release.


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

Files changed (148) hide show
  1. checksums.yaml +5 -5
  2. data/README.md +263 -247
  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 +60 -35
  9. data/app/assets/javascripts/twitter/bootstrap/alert.js +15 -9
  10. data/app/assets/javascripts/twitter/bootstrap/button.js +33 -20
  11. data/app/assets/javascripts/twitter/bootstrap/carousel.js +79 -47
  12. data/app/assets/javascripts/twitter/bootstrap/collapse.js +84 -43
  13. data/app/assets/javascripts/twitter/bootstrap/dropdown.js +65 -47
  14. data/app/assets/javascripts/twitter/bootstrap/modal.js +138 -44
  15. data/app/assets/javascripts/twitter/bootstrap/popover.js +12 -14
  16. data/app/assets/javascripts/twitter/bootstrap/scrollspy.js +57 -38
  17. data/app/assets/javascripts/twitter/bootstrap/tab.js +54 -24
  18. data/app/assets/javascripts/twitter/bootstrap/tooltip.js +202 -87
  19. data/app/assets/javascripts/twitter/bootstrap/transition.js +19 -8
  20. data/app/assets/stylesheets/twitter-bootstrap-static/bootstrap.css.erb +1 -1
  21. data/app/assets/stylesheets/twitter-bootstrap-static/sprites.css.erb +1 -1
  22. data/app/helpers/bootstrap_flash_helper.rb +8 -3
  23. data/app/helpers/form_errors_helper.rb +11 -11
  24. data/app/helpers/glyph_helper.rb +7 -3
  25. data/app/helpers/modal_helper.rb +9 -13
  26. data/app/helpers/navbar_helper.rb +5 -2
  27. data/app/helpers/twitter_breadcrumbs_helper.rb +4 -1
  28. data/app/views/twitter-bootstrap/_breadcrumbs.html.erb +5 -5
  29. data/lib/generators/bootstrap/install/templates/bootstrap_and_overrides.css +3 -4
  30. data/lib/generators/bootstrap/install/templates/bootstrap_and_overrides.less +7 -15
  31. data/lib/generators/bootstrap/layout/templates/layout.html.erb +5 -5
  32. data/lib/generators/bootstrap/layout/templates/layout.html.haml +3 -3
  33. data/lib/generators/bootstrap/layout/templates/layout.html.slim +3 -5
  34. data/lib/generators/bootstrap/themed/templates/_form.html.erb +12 -9
  35. data/lib/generators/bootstrap/themed/templates/_form.html.haml +7 -5
  36. data/lib/generators/bootstrap/themed/templates/_form.html.slim +8 -6
  37. data/lib/generators/bootstrap/themed/templates/edit.html.slim +1 -1
  38. data/lib/generators/bootstrap/themed/templates/index.html.erb +2 -0
  39. data/lib/generators/bootstrap/themed/templates/index.html.haml +1 -0
  40. data/lib/generators/bootstrap/themed/templates/index.html.slim +4 -3
  41. data/lib/generators/bootstrap/themed/templates/new.html.slim +1 -1
  42. data/lib/generators/bootstrap/themed/templates/show.html.slim +1 -1
  43. data/lib/generators/bootstrap/themed/templates/simple_form/_form.html.haml +1 -1
  44. data/lib/twitter/bootstrap/rails/breadcrumbs.rb +24 -13
  45. data/lib/twitter/bootstrap/rails/engine.rb +17 -12
  46. data/lib/twitter/bootstrap/rails/version.rb +1 -1
  47. data/spec/lib/breadcrumbs_spec.rb +42 -17
  48. data/spec/lib/twitter_bootstrap_rails/badge_label_helper_spec.rb +10 -4
  49. data/spec/lib/twitter_bootstrap_rails/bootstrap_flash_helper_spec.rb +128 -0
  50. data/spec/lib/twitter_bootstrap_rails/form_errors_helper_spec.rb +148 -0
  51. data/spec/lib/twitter_bootstrap_rails/glyph_helper_spec.rb +24 -0
  52. data/spec/lib/twitter_bootstrap_rails/modal_helper_spec.rb +2 -2
  53. data/spec/lib/twitter_bootstrap_rails/navbar_helper_spec.rb +62 -12
  54. data/spec/spec_helper.rb +5 -1
  55. data/vendor/assets/stylesheets/twitter-bootstrap-static/bootstrap.css.erb +1 -3
  56. data/vendor/toolkit/twitter/bootstrap/alerts.less +5 -0
  57. data/vendor/toolkit/twitter/bootstrap/badges.less +14 -3
  58. data/vendor/toolkit/twitter/bootstrap/bootstrap.less +6 -1
  59. data/vendor/toolkit/twitter/bootstrap/breadcrumbs.less +0 -0
  60. data/vendor/toolkit/twitter/bootstrap/button-groups.less +13 -14
  61. data/vendor/toolkit/twitter/bootstrap/buttons.less +14 -7
  62. data/vendor/toolkit/twitter/bootstrap/carousel.less +34 -7
  63. data/vendor/toolkit/twitter/bootstrap/close.less +1 -0
  64. data/vendor/toolkit/twitter/bootstrap/code.less +0 -0
  65. data/vendor/toolkit/twitter/bootstrap/component-animations.less +3 -1
  66. data/vendor/toolkit/twitter/bootstrap/dropdowns.less +9 -8
  67. data/vendor/toolkit/twitter/bootstrap/forms.less +110 -41
  68. data/vendor/toolkit/twitter/bootstrap/glyphicons.less +75 -3
  69. data/vendor/toolkit/twitter/bootstrap/grid.less +0 -0
  70. data/vendor/toolkit/twitter/bootstrap/input-groups.less +8 -3
  71. data/vendor/toolkit/twitter/bootstrap/jumbotron.less +10 -4
  72. data/vendor/toolkit/twitter/bootstrap/labels.less +0 -0
  73. data/vendor/toolkit/twitter/bootstrap/list-group.less +11 -13
  74. data/vendor/toolkit/twitter/bootstrap/media.less +40 -30
  75. data/vendor/toolkit/twitter/bootstrap/mixins/alerts.less +0 -0
  76. data/vendor/toolkit/twitter/bootstrap/mixins/background-variant.less +2 -1
  77. data/vendor/toolkit/twitter/bootstrap/mixins/border-radius.less +0 -0
  78. data/vendor/toolkit/twitter/bootstrap/mixins/buttons.less +19 -6
  79. data/vendor/toolkit/twitter/bootstrap/mixins/center-block.less +0 -0
  80. data/vendor/toolkit/twitter/bootstrap/mixins/clearfix.less +0 -0
  81. data/vendor/toolkit/twitter/bootstrap/mixins/forms.less +0 -0
  82. data/vendor/toolkit/twitter/bootstrap/mixins/gradients.less +0 -0
  83. data/vendor/toolkit/twitter/bootstrap/mixins/grid-framework.less +4 -4
  84. data/vendor/toolkit/twitter/bootstrap/mixins/grid.less +4 -4
  85. data/vendor/toolkit/twitter/bootstrap/mixins/hide-text.less +2 -2
  86. data/vendor/toolkit/twitter/bootstrap/mixins/image.less +0 -0
  87. data/vendor/toolkit/twitter/bootstrap/mixins/labels.less +1 -1
  88. data/vendor/toolkit/twitter/bootstrap/mixins/list-group.less +2 -1
  89. data/vendor/toolkit/twitter/bootstrap/mixins/nav-divider.less +0 -0
  90. data/vendor/toolkit/twitter/bootstrap/mixins/nav-vertical-align.less +0 -0
  91. data/vendor/toolkit/twitter/bootstrap/mixins/opacity.less +0 -0
  92. data/vendor/toolkit/twitter/bootstrap/mixins/pagination.less +2 -1
  93. data/vendor/toolkit/twitter/bootstrap/mixins/panels.less +0 -0
  94. data/vendor/toolkit/twitter/bootstrap/mixins/progress-bar.less +0 -0
  95. data/vendor/toolkit/twitter/bootstrap/mixins/reset-filter.less +0 -0
  96. data/vendor/toolkit/twitter/bootstrap/mixins/reset-text.less +18 -0
  97. data/vendor/toolkit/twitter/bootstrap/mixins/resize.less +0 -0
  98. data/vendor/toolkit/twitter/bootstrap/mixins/responsive-visibility.less +1 -1
  99. data/vendor/toolkit/twitter/bootstrap/mixins/size.less +0 -0
  100. data/vendor/toolkit/twitter/bootstrap/mixins/tab-focus.less +0 -0
  101. data/vendor/toolkit/twitter/bootstrap/mixins/table-row.less +0 -0
  102. data/vendor/toolkit/twitter/bootstrap/mixins/text-emphasis.less +2 -1
  103. data/vendor/toolkit/twitter/bootstrap/mixins/text-overflow.less +0 -0
  104. data/vendor/toolkit/twitter/bootstrap/mixins/vendor-prefixes.less +8 -5
  105. data/vendor/toolkit/twitter/bootstrap/mixins.less +1 -0
  106. data/vendor/toolkit/twitter/bootstrap/modals.less +3 -3
  107. data/vendor/toolkit/twitter/bootstrap/navbar.less +6 -1
  108. data/vendor/toolkit/twitter/bootstrap/navs.less +1 -1
  109. data/vendor/toolkit/twitter/bootstrap/normalize.less +12 -13
  110. data/vendor/toolkit/twitter/bootstrap/pager.less +1 -2
  111. data/vendor/toolkit/twitter/bootstrap/pagination.less +5 -4
  112. data/vendor/toolkit/twitter/bootstrap/panels.less +27 -4
  113. data/vendor/toolkit/twitter/bootstrap/popovers.less +5 -7
  114. data/vendor/toolkit/twitter/bootstrap/print.less +96 -96
  115. data/vendor/toolkit/twitter/bootstrap/progress-bars.less +1 -14
  116. data/vendor/toolkit/twitter/bootstrap/responsive-embed.less +10 -9
  117. data/vendor/toolkit/twitter/bootstrap/responsive-utilities.less +0 -0
  118. data/vendor/toolkit/twitter/bootstrap/scaffolding.less +12 -1
  119. data/vendor/toolkit/twitter/bootstrap/tables.less +6 -5
  120. data/vendor/toolkit/twitter/bootstrap/theme.less +47 -16
  121. data/vendor/toolkit/twitter/bootstrap/thumbnails.less +1 -1
  122. data/vendor/toolkit/twitter/bootstrap/tooltip.less +13 -7
  123. data/vendor/toolkit/twitter/bootstrap/type.less +2 -8
  124. data/vendor/toolkit/twitter/bootstrap/utilities.less +0 -1
  125. data/vendor/toolkit/twitter/bootstrap/variables.less +36 -14
  126. data/vendor/toolkit/twitter/bootstrap/wells.less +0 -0
  127. metadata +76 -52
  128. data/app/assets/fonts/fontawesome-webfont.eot +0 -0
  129. data/app/assets/fonts/fontawesome-webfont.svg +0 -504
  130. data/app/assets/fonts/fontawesome-webfont.ttf +0 -0
  131. data/app/assets/fonts/fontawesome-webfont.woff +0 -0
  132. data/app/assets/images/twitter/bootstrap/glyphicons-halflings-white.png +0 -0
  133. data/app/assets/images/twitter/bootstrap/glyphicons-halflings.png +0 -0
  134. data/app/assets/stylesheets/twitter-bootstrap-static/fontawesome.css.erb +0 -4
  135. data/vendor/static-source/fontawesome.less +0 -8
  136. data/vendor/toolkit/fontawesome/bordered-pulled.less +0 -16
  137. data/vendor/toolkit/fontawesome/core.less +0 -12
  138. data/vendor/toolkit/fontawesome/fixed-width.less +0 -6
  139. data/vendor/toolkit/fontawesome/font-awesome.less +0 -17
  140. data/vendor/toolkit/fontawesome/icons.less +0 -506
  141. data/vendor/toolkit/fontawesome/larger.less +0 -13
  142. data/vendor/toolkit/fontawesome/list.less +0 -19
  143. data/vendor/toolkit/fontawesome/mixins.less +0 -20
  144. data/vendor/toolkit/fontawesome/path.less +0 -14
  145. data/vendor/toolkit/fontawesome/rotated-flipped.less +0 -9
  146. data/vendor/toolkit/fontawesome/spinning.less +0 -32
  147. data/vendor/toolkit/fontawesome/stacked.less +0 -20
  148. data/vendor/toolkit/fontawesome/variables.less +0 -515
File without changes
@@ -5,7 +5,7 @@
5
5
 
6
6
  .make-grid-columns() {
7
7
  // Common styles for all sizes of grid columns, widths 1-12
8
- .col(@index) when (@index = 1) { // initial
8
+ .col(@index) { // initial
9
9
  @item: ~".col-xs-@{index}, .col-sm-@{index}, .col-md-@{index}, .col-lg-@{index}";
10
10
  .col((@index + 1), @item);
11
11
  }
@@ -19,15 +19,15 @@
19
19
  // Prevent columns from collapsing when empty
20
20
  min-height: 1px;
21
21
  // Inner gutter via padding
22
- padding-left: (@grid-gutter-width / 2);
23
- padding-right: (@grid-gutter-width / 2);
22
+ padding-left: ceil((@grid-gutter-width / 2));
23
+ padding-right: floor((@grid-gutter-width / 2));
24
24
  }
25
25
  }
26
26
  .col(1); // kickstart it
27
27
  }
28
28
 
29
29
  .float-grid-columns(@class) {
30
- .col(@index) when (@index = 1) { // initial
30
+ .col(@index) { // initial
31
31
  @item: ~".col-@{class}-@{index}";
32
32
  .col((@index + 1), @item);
33
33
  }
@@ -6,15 +6,15 @@
6
6
  .container-fixed(@gutter: @grid-gutter-width) {
7
7
  margin-right: auto;
8
8
  margin-left: auto;
9
- padding-left: (@gutter / 2);
10
- padding-right: (@gutter / 2);
9
+ padding-left: floor((@gutter / 2));
10
+ padding-right: ceil((@gutter / 2));
11
11
  &:extend(.clearfix all);
12
12
  }
13
13
 
14
14
  // Creates a wrapper for a series of columns
15
15
  .make-row(@gutter: @grid-gutter-width) {
16
- margin-left: (@gutter / -2);
17
- margin-right: (@gutter / -2);
16
+ margin-left: ceil((@gutter / -2));
17
+ margin-right: floor((@gutter / -2));
18
18
  &:extend(.clearfix all);
19
19
  }
20
20
 
@@ -1,12 +1,12 @@
1
1
  // CSS image replacement
2
2
  //
3
- // Heads up! v3 launched with with only `.hide-text()`, but per our pattern for
3
+ // Heads up! v3 launched with only `.hide-text()`, but per our pattern for
4
4
  // mixins being reused as classes with the same name, this doesn't hold up. As
5
5
  // of v3.0.1 we have added `.text-hide()` and deprecated `.hide-text()`.
6
6
  //
7
7
  // Source: https://github.com/h5bp/html5-boilerplate/commit/aa0396eae757
8
8
 
9
- // Deprecated as of v3.0.1 (will be removed in v4)
9
+ // Deprecated as of v3.0.1 (has been removed in v4)
10
10
  .hide-text() {
11
11
  font: ~"0/0" a;
12
12
  color: transparent;
File without changes
@@ -2,7 +2,7 @@
2
2
 
3
3
  .label-variant(@color) {
4
4
  background-color: @color;
5
-
5
+
6
6
  &[href] {
7
7
  &:hover,
8
8
  &:focus {
@@ -5,7 +5,8 @@
5
5
  color: @color;
6
6
  background-color: @background;
7
7
 
8
- a& {
8
+ a&,
9
+ button& {
9
10
  color: @color;
10
11
 
11
12
  .list-group-item-heading {
File without changes
@@ -1,11 +1,12 @@
1
1
  // Pagination
2
2
 
3
- .pagination-size(@padding-vertical; @padding-horizontal; @font-size; @border-radius) {
3
+ .pagination-size(@padding-vertical; @padding-horizontal; @font-size; @line-height; @border-radius) {
4
4
  > li {
5
5
  > a,
6
6
  > span {
7
7
  padding: @padding-vertical @padding-horizontal;
8
8
  font-size: @font-size;
9
+ line-height: @line-height;
9
10
  }
10
11
  &:first-child {
11
12
  > a,
File without changes
@@ -0,0 +1,18 @@
1
+ .reset-text() {
2
+ font-family: @font-family-base;
3
+ // We deliberately do NOT reset font-size.
4
+ font-style: normal;
5
+ font-weight: normal;
6
+ letter-spacing: normal;
7
+ line-break: auto;
8
+ line-height: @line-height-base;
9
+ text-align: left; // Fallback for where `start` is not supported
10
+ text-align: start;
11
+ text-decoration: none;
12
+ text-shadow: none;
13
+ text-transform: none;
14
+ white-space: normal;
15
+ word-break: normal;
16
+ word-spacing: normal;
17
+ word-wrap: normal;
18
+ }
File without changes
@@ -4,7 +4,7 @@
4
4
  // More easily include all the states for responsive-utilities.less.
5
5
  .responsive-visibility() {
6
6
  display: block !important;
7
- table& { display: table; }
7
+ table& { display: table !important; }
8
8
  tr& { display: table-row !important; }
9
9
  th&,
10
10
  td& { display: table-cell !important; }
File without changes
@@ -2,7 +2,8 @@
2
2
 
3
3
  .text-emphasis-variant(@color) {
4
4
  color: @color;
5
- a&:hover {
5
+ a&:hover,
6
+ a&:focus {
6
7
  color: darken(@color, 10%);
7
8
  }
8
9
  }
@@ -1,7 +1,7 @@
1
1
  // Vendor Prefixes
2
2
  //
3
3
  // All vendor mixins are deprecated as of v3.2.0 due to the introduction of
4
- // Autoprefixer in our Gruntfile. They will be removed in v4.
4
+ // Autoprefixer in our Gruntfile. They have been removed in v4.
5
5
 
6
6
  // - Animations
7
7
  // - Backface visibility
@@ -54,7 +54,7 @@
54
54
  // Prevent browsers from flickering when using CSS 3D transforms.
55
55
  // Default value is `visible`, but can be changed to `hidden`
56
56
 
57
- .backface-visibility(@visibility){
57
+ .backface-visibility(@visibility) {
58
58
  -webkit-backface-visibility: @visibility;
59
59
  -moz-backface-visibility: @visibility;
60
60
  backface-visibility: @visibility;
@@ -99,9 +99,12 @@
99
99
 
100
100
  // Placeholder text
101
101
  .placeholder(@color: @input-color-placeholder) {
102
- &::-moz-placeholder { color: @color; // Firefox
103
- opacity: 1; } // See https://github.com/twbs/bootstrap/pull/11526
104
- &:-ms-input-placeholder { color: @color; } // Internet Explorer 10+
102
+ // Firefox
103
+ &::-moz-placeholder {
104
+ color: @color;
105
+ opacity: 1; // Override Firefox's unusual default opacity; see https://github.com/twbs/bootstrap/pull/11526
106
+ }
107
+ &:-ms-input-placeholder { color: @color; } // Internet Explorer 10+
105
108
  &::-webkit-input-placeholder { color: @color; } // Safari and Chrome
106
109
  }
107
110
 
@@ -11,6 +11,7 @@
11
11
  @import "mixins/responsive-visibility.less";
12
12
  @import "mixins/size.less";
13
13
  @import "mixins/tab-focus.less";
14
+ @import "mixins/reset-text.less";
14
15
  @import "mixins/text-emphasis.less";
15
16
  @import "mixins/text-overflow.less";
16
17
  @import "mixins/vendor-prefixes.less";
@@ -30,10 +30,10 @@
30
30
 
31
31
  // When fading in the modal, animate it to slide down
32
32
  &.fade .modal-dialog {
33
- .translate3d(0, -25%, 0);
33
+ .translate(0, -25%);
34
34
  .transition-transform(~"0.3s ease-out");
35
35
  }
36
- &.in .modal-dialog { .translate3d(0, 0, 0) }
36
+ &.in .modal-dialog { .translate(0, 0) }
37
37
  }
38
38
  .modal-open .modal {
39
39
  overflow-x: hidden;
@@ -79,7 +79,7 @@
79
79
  .modal-header {
80
80
  padding: @modal-title-padding;
81
81
  border-bottom: 1px solid @modal-header-border-color;
82
- min-height: (@modal-title-padding + @modal-title-line-height);
82
+ &:extend(.clearfix all);
83
83
  }
84
84
  // Close icon
85
85
  .modal-header .close {
@@ -141,7 +141,6 @@
141
141
  right: 0;
142
142
  left: 0;
143
143
  z-index: @zindex-navbar-fixed;
144
- .translate3d(0, 0, 0);
145
144
 
146
145
  // Undo the rounded corners
147
146
  @media (min-width: @grid-float-breakpoint) {
@@ -299,6 +298,10 @@
299
298
  .form-group {
300
299
  @media (max-width: @grid-float-breakpoint-max) {
301
300
  margin-bottom: 5px;
301
+
302
+ &:last-child {
303
+ margin-bottom: 0;
304
+ }
302
305
  }
303
306
  }
304
307
 
@@ -327,6 +330,8 @@
327
330
  }
328
331
  // Menu position and menu caret support for dropups via extra dropup class
329
332
  .navbar-fixed-bottom .navbar-nav > li > .dropdown-menu {
333
+ margin-bottom: 0;
334
+ .border-top-radius(@navbar-border-radius);
330
335
  .border-bottom-radius(0);
331
336
  }
332
337
 
@@ -36,7 +36,7 @@
36
36
  color: @nav-disabled-link-hover-color;
37
37
  text-decoration: none;
38
38
  background-color: transparent;
39
- cursor: not-allowed;
39
+ cursor: @cursor-disabled;
40
40
  }
41
41
  }
42
42
  }
@@ -1,9 +1,9 @@
1
- /*! normalize.css v3.0.1 | 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 {
@@ -25,7 +25,8 @@ body {
25
25
 
26
26
  //
27
27
  // Correct `block` display not defined for any HTML5 element in IE 8/9.
28
- // Correct `block` display not defined for `details` or `summary` in IE 10/11 and Firefox.
28
+ // Correct `block` display not defined for `details` or `summary` in IE 10/11
29
+ // and Firefox.
29
30
  // Correct `block` display not defined for `main` in IE 11.
30
31
  //
31
32
 
@@ -38,6 +39,7 @@ footer,
38
39
  header,
39
40
  hgroup,
40
41
  main,
42
+ menu,
41
43
  nav,
42
44
  section,
43
45
  summary {
@@ -69,7 +71,7 @@ audio:not([controls]) {
69
71
 
70
72
  //
71
73
  // Address `[hidden]` styling not present in IE 8/9/10.
72
- // 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.
73
75
  //
74
76
 
75
77
  [hidden],
@@ -85,11 +87,12 @@ template {
85
87
  //
86
88
 
87
89
  a {
88
- background: transparent;
90
+ background-color: transparent;
89
91
  }
90
92
 
91
93
  //
92
- // 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.
93
96
  //
94
97
 
95
98
  a:active,
@@ -207,7 +210,6 @@ figure {
207
210
  //
208
211
 
209
212
  hr {
210
- -moz-box-sizing: content-box;
211
213
  box-sizing: content-box;
212
214
  height: 0;
213
215
  }
@@ -348,15 +350,12 @@ input[type="number"]::-webkit-outer-spin-button {
348
350
 
349
351
  //
350
352
  // 1. Address `appearance` set to `searchfield` in Safari and Chrome.
351
- // 2. Address `box-sizing` set to `border-box` in Safari and Chrome
352
- // (include `-moz` to future-proof).
353
+ // 2. Address `box-sizing` set to `border-box` in Safari and Chrome.
353
354
  //
354
355
 
355
356
  input[type="search"] {
356
357
  -webkit-appearance: textfield; // 1
357
- -moz-box-sizing: content-box;
358
- -webkit-box-sizing: content-box; // 2
359
- box-sizing: content-box;
358
+ box-sizing: content-box; //2
360
359
  }
361
360
 
362
361
  //
@@ -48,8 +48,7 @@
48
48
  > span {
49
49
  color: @pager-disabled-color;
50
50
  background-color: @pager-bg;
51
- cursor: not-allowed;
51
+ cursor: @cursor-disabled;
52
52
  }
53
53
  }
54
-
55
54
  }
@@ -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;
@@ -69,7 +70,7 @@
69
70
  color: @pagination-disabled-color;
70
71
  background-color: @pagination-disabled-bg;
71
72
  border-color: @pagination-disabled-border;
72
- cursor: not-allowed;
73
+ cursor: @cursor-disabled;
73
74
  }
74
75
  }
75
76
  }
@@ -79,10 +80,10 @@
79
80
 
80
81
  // Large
81
82
  .pagination-lg {
82
- .pagination-size(@padding-large-vertical; @padding-large-horizontal; @font-size-large; @border-radius-large);
83
+ .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
- .pagination-size(@padding-small-vertical; @padding-small-horizontal; @font-size-small; @border-radius-small);
88
+ .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
  }
@@ -56,7 +60,8 @@
56
60
  // any kind of custom content between the two.
57
61
 
58
62
  .panel {
59
- > .list-group {
63
+ > .list-group,
64
+ > .panel-collapse > .list-group {
60
65
  margin-bottom: 0;
61
66
 
62
67
  .list-group-item {
@@ -71,6 +76,7 @@
71
76
  .border-top-radius((@panel-border-radius - 1));
72
77
  }
73
78
  }
79
+
74
80
  // Add border bottom radius for last one
75
81
  &:last-child {
76
82
  .list-group-item:last-child {
@@ -79,6 +85,11 @@
79
85
  }
80
86
  }
81
87
  }
88
+ > .panel-heading + .panel-collapse > .list-group {
89
+ .list-group-item:first-child {
90
+ .border-top-radius(0);
91
+ }
92
+ }
82
93
  }
83
94
  // Collapse space between when there's no additional content.
84
95
  .panel-heading + .list-group {
@@ -114,6 +125,9 @@
114
125
  > thead:first-child,
115
126
  > tbody:first-child {
116
127
  > tr:first-child {
128
+ border-top-left-radius: (@panel-border-radius - 1);
129
+ border-top-right-radius: (@panel-border-radius - 1);
130
+
117
131
  td:first-child,
118
132
  th:first-child {
119
133
  border-top-left-radius: (@panel-border-radius - 1);
@@ -133,6 +147,9 @@
133
147
  > tbody:last-child,
134
148
  > tfoot:last-child {
135
149
  > tr:last-child {
150
+ border-bottom-left-radius: (@panel-border-radius - 1);
151
+ border-bottom-right-radius: (@panel-border-radius - 1);
152
+
136
153
  td:first-child,
137
154
  th:first-child {
138
155
  border-bottom-left-radius: (@panel-border-radius - 1);
@@ -145,7 +162,9 @@
145
162
  }
146
163
  }
147
164
  > .panel-body + .table,
148
- > .panel-body + .table-responsive {
165
+ > .panel-body + .table-responsive,
166
+ > .table + .panel-body,
167
+ > .table-responsive + .panel-body {
149
168
  border-top: 1px solid @table-border-color;
150
169
  }
151
170
  > .table > tbody:first-child > tr:first-child th,
@@ -207,6 +226,7 @@
207
226
  .panel {
208
227
  margin-bottom: 0;
209
228
  border-radius: @panel-border-radius;
229
+
210
230
  + .panel {
211
231
  margin-top: 5px;
212
232
  }
@@ -214,10 +234,13 @@
214
234
 
215
235
  .panel-heading {
216
236
  border-bottom: 0;
217
- + .panel-collapse > .panel-body {
237
+
238
+ + .panel-collapse > .panel-body,
239
+ + .panel-collapse > .list-group {
218
240
  border-top: 1px solid @panel-inner-border;
219
241
  }
220
242
  }
243
+
221
244
  .panel-footer {
222
245
  border-top: 0;
223
246
  + .panel-collapse .panel-body {
@@ -11,7 +11,11 @@
11
11
  display: none;
12
12
  max-width: @popover-max-width;
13
13
  padding: 1px;
14
- text-align: left; // Reset given new insertion method
14
+ // Our parent element can be arbitrary since popovers are by default inserted as a sibling of their target element.
15
+ // So reset our font and text properties to avoid inheriting weird values.
16
+ .reset-text();
17
+ font-size: @font-size-base;
18
+
15
19
  background-color: @popover-bg;
16
20
  background-clip: padding-box;
17
21
  border: 1px solid @popover-fallback-border-color;
@@ -19,9 +23,6 @@
19
23
  border-radius: @border-radius-large;
20
24
  .box-shadow(0 5px 10px rgba(0,0,0,.2));
21
25
 
22
- // Overrides for proper insertion
23
- white-space: normal;
24
-
25
26
  // Offset the popover to account for the popover arrow
26
27
  &.top { margin-top: -@popover-arrow-width; }
27
28
  &.right { margin-left: @popover-arrow-width; }
@@ -33,8 +34,6 @@
33
34
  margin: 0; // reset heading margin
34
35
  padding: 8px 14px;
35
36
  font-size: @font-size-base;
36
- font-weight: normal;
37
- line-height: 18px;
38
37
  background-color: @popover-title-bg;
39
38
  border-bottom: 1px solid darken(@popover-title-bg, 5%);
40
39
  border-radius: (@border-radius-large - 1) (@border-radius-large - 1) 0 0;
@@ -129,5 +128,4 @@
129
128
  bottom: -@popover-arrow-width;
130
129
  }
131
130
  }
132
-
133
131
  }