bootstrap-sass 3.3.0.1 → 3.4.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (139) hide show
  1. checksums.yaml +5 -5
  2. data/.gitignore +1 -0
  3. data/.travis.yml +8 -14
  4. data/CHANGELOG.md +64 -0
  5. data/CONTRIBUTING.md +8 -1
  6. data/Gemfile +1 -4
  7. data/LICENSE +2 -1
  8. data/README.md +135 -114
  9. data/Rakefile +58 -12
  10. data/assets/fonts/bootstrap/glyphicons-halflings-regular.eot +0 -0
  11. data/assets/fonts/bootstrap/glyphicons-halflings-regular.svg +273 -214
  12. data/assets/fonts/bootstrap/glyphicons-halflings-regular.ttf +0 -0
  13. data/assets/fonts/bootstrap/glyphicons-halflings-regular.woff +0 -0
  14. data/assets/fonts/bootstrap/glyphicons-halflings-regular.woff2 +0 -0
  15. data/assets/javascripts/bootstrap/affix.js +11 -9
  16. data/assets/javascripts/bootstrap/alert.js +6 -5
  17. data/assets/javascripts/bootstrap/button.js +25 -16
  18. data/assets/javascripts/bootstrap/carousel.js +25 -18
  19. data/assets/javascripts/bootstrap/collapse.js +13 -12
  20. data/assets/javascripts/bootstrap/dropdown.js +51 -47
  21. data/assets/javascripts/bootstrap/modal.js +112 -35
  22. data/assets/javascripts/bootstrap/popover.js +31 -27
  23. data/assets/javascripts/bootstrap/scrollspy.js +19 -22
  24. data/assets/javascripts/bootstrap/tab.js +14 -12
  25. data/assets/javascripts/bootstrap/tooltip.js +255 -56
  26. data/assets/javascripts/bootstrap/transition.js +5 -5
  27. data/assets/javascripts/bootstrap-sprockets.js +2 -2
  28. data/assets/javascripts/bootstrap.js +1282 -962
  29. data/assets/javascripts/bootstrap.min.js +6 -0
  30. data/assets/stylesheets/_bootstrap-compass.scss +2 -0
  31. data/assets/stylesheets/_bootstrap-mincer.scss +4 -2
  32. data/assets/stylesheets/_bootstrap-sprockets.scss +2 -0
  33. data/assets/stylesheets/_bootstrap.scss +6 -0
  34. data/assets/stylesheets/bootstrap/_alerts.scss +8 -3
  35. data/assets/stylesheets/bootstrap/_badges.scss +16 -5
  36. data/assets/stylesheets/bootstrap/_breadcrumbs.scss +3 -1
  37. data/assets/stylesheets/bootstrap/_button-groups.scss +11 -14
  38. data/assets/stylesheets/bootstrap/_buttons.scss +18 -10
  39. data/assets/stylesheets/bootstrap/_carousel.scss +40 -36
  40. data/assets/stylesheets/bootstrap/_close.scss +2 -0
  41. data/assets/stylesheets/bootstrap/_code.scss +3 -3
  42. data/assets/stylesheets/bootstrap/_component-animations.scss +2 -2
  43. data/assets/stylesheets/bootstrap/_dropdowns.scss +24 -24
  44. data/assets/stylesheets/bootstrap/_forms.scss +149 -103
  45. data/assets/stylesheets/bootstrap/_glyphicons.scss +85 -12
  46. data/assets/stylesheets/bootstrap/_grid.scss +10 -0
  47. data/assets/stylesheets/bootstrap/_input-groups.scss +10 -5
  48. data/assets/stylesheets/bootstrap/_jumbotron.scss +11 -5
  49. data/assets/stylesheets/bootstrap/_labels.scss +1 -1
  50. data/assets/stylesheets/bootstrap/_list-group.scss +30 -34
  51. data/assets/stylesheets/bootstrap/_media.scss +19 -0
  52. data/assets/stylesheets/bootstrap/_mixins.scss +1 -0
  53. data/assets/stylesheets/bootstrap/_modals.scss +9 -8
  54. data/assets/stylesheets/bootstrap/_navbar.scss +77 -82
  55. data/assets/stylesheets/bootstrap/_navs.scss +4 -6
  56. data/assets/stylesheets/bootstrap/_normalize.scss +13 -13
  57. data/assets/stylesheets/bootstrap/_pager.scss +2 -2
  58. data/assets/stylesheets/bootstrap/_pagination.scss +15 -17
  59. data/assets/stylesheets/bootstrap/_panels.scss +16 -6
  60. data/assets/stylesheets/bootstrap/_popovers.scss +50 -58
  61. data/assets/stylesheets/bootstrap/_print.scss +90 -98
  62. data/assets/stylesheets/bootstrap/_progress-bars.scss +3 -3
  63. data/assets/stylesheets/bootstrap/_responsive-embed.scss +10 -10
  64. data/assets/stylesheets/bootstrap/_responsive-utilities.scss +11 -6
  65. data/assets/stylesheets/bootstrap/_scaffolding.scss +18 -7
  66. data/assets/stylesheets/bootstrap/_tables.scss +24 -24
  67. data/assets/stylesheets/bootstrap/_theme.scss +57 -22
  68. data/assets/stylesheets/bootstrap/_thumbnails.scss +1 -1
  69. data/assets/stylesheets/bootstrap/_tooltip.scss +49 -32
  70. data/assets/stylesheets/bootstrap/_type.scss +12 -12
  71. data/assets/stylesheets/bootstrap/_utilities.scss +0 -1
  72. data/assets/stylesheets/bootstrap/_variables.scss +27 -17
  73. data/assets/stylesheets/bootstrap/_wells.scss +2 -2
  74. data/assets/stylesheets/bootstrap/mixins/_alerts.scss +2 -1
  75. data/assets/stylesheets/bootstrap/mixins/_background-variant.scss +2 -1
  76. data/assets/stylesheets/bootstrap/mixins/_border-radius.scss +4 -4
  77. data/assets/stylesheets/bootstrap/mixins/_buttons.scss +20 -11
  78. data/assets/stylesheets/bootstrap/mixins/_center-block.scss +1 -1
  79. data/assets/stylesheets/bootstrap/mixins/_clearfix.scss +1 -1
  80. data/assets/stylesheets/bootstrap/mixins/_forms.scss +4 -4
  81. data/assets/stylesheets/bootstrap/mixins/_gradients.scss +6 -8
  82. data/assets/stylesheets/bootstrap/mixins/_grid-framework.scss +2 -2
  83. data/assets/stylesheets/bootstrap/mixins/_grid.scss +8 -8
  84. data/assets/stylesheets/bootstrap/mixins/_hide-text.scss +3 -3
  85. data/assets/stylesheets/bootstrap/mixins/_image.scss +5 -10
  86. data/assets/stylesheets/bootstrap/mixins/_list-group.scss +3 -2
  87. data/assets/stylesheets/bootstrap/mixins/_opacity.scss +2 -3
  88. data/assets/stylesheets/bootstrap/mixins/_pagination.scss +2 -1
  89. data/assets/stylesheets/bootstrap/mixins/_reset-text.scss +18 -0
  90. data/assets/stylesheets/bootstrap/mixins/_resize.scss +1 -1
  91. data/assets/stylesheets/bootstrap/mixins/_responsive-visibility.scss +1 -5
  92. data/assets/stylesheets/bootstrap/mixins/_tab-focus.scss +3 -3
  93. data/assets/stylesheets/bootstrap/mixins/_text-emphasis.scss +2 -1
  94. data/assets/stylesheets/bootstrap/mixins/_vendor-prefixes.scss +4 -4
  95. data/bootstrap-sass.gemspec +10 -9
  96. data/bower.json +6 -20
  97. data/composer.json +2 -2
  98. data/eyeglass-exports.js +7 -0
  99. data/lib/bootstrap-sass/engine.rb +6 -1
  100. data/lib/bootstrap-sass/version.rb +2 -2
  101. data/lib/bootstrap-sass.rb +32 -13
  102. data/package-lock.json +1611 -0
  103. data/package.json +21 -7
  104. data/sache.json +1 -1
  105. data/tasks/bower.rake +2 -5
  106. data/tasks/converter/fonts_conversion.rb +1 -1
  107. data/tasks/converter/js_conversion.rb +7 -5
  108. data/tasks/converter/less_conversion.rb +48 -37
  109. data/tasks/converter/network.rb +12 -7
  110. data/tasks/converter.rb +1 -1
  111. data/templates/project/_bootstrap-variables.sass +27 -18
  112. data/templates/project/styles.sass +3 -0
  113. data/test/compilation_test.rb +24 -12
  114. data/test/dummy_rails/app/assets/stylesheets/{application.css.sass → application.sass} +0 -0
  115. data/test/dummy_rails/app/views/pages/root.html.slim +43 -0
  116. data/test/dummy_rails/config/application.rb +2 -1
  117. data/test/dummy_rails/config/boot.rb +1 -1
  118. data/test/dummy_rails/config/environments/development.rb +0 -3
  119. data/test/dummy_rails/config/environments/production.rb +7 -1
  120. data/test/dummy_rails/config/environments/test.rb +9 -1
  121. data/test/dummy_sass_only/Gemfile +1 -1
  122. data/test/dummy_sass_only/compile.rb +14 -7
  123. data/test/dummy_sass_only/import_all.scss +2 -0
  124. data/test/gemfiles/default.gemfile +3 -0
  125. data/test/node_mincer_test.rb +2 -3
  126. data/test/node_sass_compile_test.sh +4 -3
  127. data/test/sass_test.rb +10 -7
  128. data/test/sprockets_rails_test.rb +12 -8
  129. data/test/support/dummy_rails_integration.rb +1 -1
  130. data/test/support/reporting.rb +10 -0
  131. data/test/test_helper.rb +3 -2
  132. metadata +56 -46
  133. data/test/compass_test.rb +0 -9
  134. data/test/dummy_rails/log/development.log +0 -0
  135. data/test/dummy_sass_only/import_all.sass +0 -2
  136. data/test/gemfiles/sass_3_2.gemfile +0 -6
  137. data/test/gemfiles/sass_3_3.gemfile +0 -6
  138. data/test/gemfiles/sass_3_4.gemfile +0 -7
  139. data/test/gemfiles/sass_head.gemfile +0 -6
@@ -48,11 +48,11 @@
48
48
  // content for the user's viewport.
49
49
 
50
50
  .navbar-collapse {
51
- overflow-x: visible;
52
51
  padding-right: $navbar-padding-horizontal;
53
- padding-left: $navbar-padding-horizontal;
52
+ padding-left: $navbar-padding-horizontal;
53
+ overflow-x: visible;
54
54
  border-top: 1px solid transparent;
55
- box-shadow: inset 0 1px 0 rgba(255,255,255,.1);
55
+ box-shadow: inset 0 1px 0 rgba(255, 255, 255, .1);
56
56
  @include clearfix;
57
57
  -webkit-overflow-scrolling: touch;
58
58
 
@@ -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;
@@ -82,8 +81,8 @@
82
81
  .navbar-fixed-top &,
83
82
  .navbar-static-top &,
84
83
  .navbar-fixed-bottom & {
85
- padding-left: 0;
86
84
  padding-right: 0;
85
+ padding-left: 0;
87
86
  }
88
87
  }
89
88
  }
@@ -97,6 +96,27 @@
97
96
  max-height: 200px;
98
97
  }
99
98
  }
99
+
100
+ // Fix the top/bottom navbars when screen real estate supports it
101
+ position: fixed;
102
+ right: 0;
103
+ left: 0;
104
+ z-index: $zindex-navbar-fixed;
105
+
106
+ // Undo the rounded corners
107
+ @media (min-width: $grid-float-breakpoint) {
108
+ border-radius: 0;
109
+ }
110
+ }
111
+
112
+ .navbar-fixed-top {
113
+ top: 0;
114
+ border-width: 0 0 1px;
115
+ }
116
+ .navbar-fixed-bottom {
117
+ bottom: 0;
118
+ margin-bottom: 0; // override .navbar defaults
119
+ border-width: 1px 0 0;
100
120
  }
101
121
 
102
122
 
@@ -109,11 +129,11 @@
109
129
  > .navbar-header,
110
130
  > .navbar-collapse {
111
131
  margin-right: -$navbar-padding-horizontal;
112
- margin-left: -$navbar-padding-horizontal;
132
+ margin-left: -$navbar-padding-horizontal;
113
133
 
114
134
  @media (min-width: $grid-float-breakpoint) {
115
135
  margin-right: 0;
116
- margin-left: 0;
136
+ margin-left: 0;
117
137
  }
118
138
  }
119
139
  }
@@ -135,38 +155,15 @@
135
155
  }
136
156
  }
137
157
 
138
- // Fix the top/bottom navbars when screen real estate supports it
139
- .navbar-fixed-top,
140
- .navbar-fixed-bottom {
141
- position: fixed;
142
- right: 0;
143
- left: 0;
144
- z-index: $zindex-navbar-fixed;
145
-
146
- // Undo the rounded corners
147
- @media (min-width: $grid-float-breakpoint) {
148
- border-radius: 0;
149
- }
150
- }
151
- .navbar-fixed-top {
152
- top: 0;
153
- border-width: 0 0 1px;
154
- }
155
- .navbar-fixed-bottom {
156
- bottom: 0;
157
- margin-bottom: 0; // override .navbar defaults
158
- border-width: 1px 0 0;
159
- }
160
-
161
158
 
162
159
  // Brand/project name
163
160
 
164
161
  .navbar-brand {
165
162
  float: left;
163
+ height: $navbar-height;
166
164
  padding: $navbar-padding-vertical $navbar-padding-horizontal;
167
165
  font-size: $font-size-large;
168
166
  line-height: $line-height-computed;
169
- height: $navbar-height;
170
167
 
171
168
  &:hover,
172
169
  &:focus {
@@ -194,8 +191,8 @@
194
191
  .navbar-toggle {
195
192
  position: relative;
196
193
  float: right;
197
- margin-right: $navbar-padding-horizontal;
198
194
  padding: 9px 10px;
195
+ margin-right: $navbar-padding-horizontal;
199
196
  @include navbar-vertical-align(34px);
200
197
  background-color: transparent;
201
198
  background-image: none; // Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214
@@ -234,7 +231,7 @@
234
231
  margin: ($navbar-padding-vertical / 2) (-$navbar-padding-horizontal);
235
232
 
236
233
  > li > a {
237
- padding-top: 10px;
234
+ padding-top: 10px;
238
235
  padding-bottom: 10px;
239
236
  line-height: $line-height-computed;
240
237
  }
@@ -271,7 +268,7 @@
271
268
  > li {
272
269
  float: left;
273
270
  > a {
274
- padding-top: $navbar-padding-vertical;
271
+ padding-top: $navbar-padding-vertical;
275
272
  padding-bottom: $navbar-padding-vertical;
276
273
  }
277
274
  }
@@ -285,12 +282,12 @@
285
282
  // our navbars.
286
283
 
287
284
  .navbar-form {
288
- margin-left: -$navbar-padding-horizontal;
289
- margin-right: -$navbar-padding-horizontal;
290
285
  padding: 10px $navbar-padding-horizontal;
286
+ margin-right: -$navbar-padding-horizontal;
287
+ margin-left: -$navbar-padding-horizontal;
291
288
  border-top: 1px solid transparent;
292
289
  border-bottom: 1px solid transparent;
293
- $shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1);
290
+ $shadow: inset 0 1px 0 rgba(255, 255, 255, .1), 0 1px 0 rgba(255, 255, 255, .1);
294
291
  @include box-shadow($shadow);
295
292
 
296
293
  // Mixin behavior for optimum display
@@ -312,11 +309,11 @@
312
309
  // Undo 100% width for pull classes
313
310
  @media (min-width: $grid-float-breakpoint) {
314
311
  width: auto;
315
- border: 0;
316
- margin-left: 0;
317
- margin-right: 0;
318
312
  padding-top: 0;
319
313
  padding-bottom: 0;
314
+ margin-right: 0;
315
+ margin-left: 0;
316
+ border: 0;
320
317
  @include box-shadow(none);
321
318
  }
322
319
  }
@@ -331,6 +328,8 @@
331
328
  }
332
329
  // Menu position and menu caret support for dropups via extra dropup class
333
330
  .navbar-fixed-bottom .navbar-nav > li > .dropdown-menu {
331
+ margin-bottom: 0;
332
+ @include border-top-radius($navbar-border-radius);
334
333
  @include border-bottom-radius(0);
335
334
  }
336
335
 
@@ -360,8 +359,8 @@
360
359
 
361
360
  @media (min-width: $grid-float-breakpoint) {
362
361
  float: left;
363
- margin-left: $navbar-padding-horizontal;
364
362
  margin-right: $navbar-padding-horizontal;
363
+ margin-left: $navbar-padding-horizontal;
365
364
  }
366
365
  }
367
366
 
@@ -436,33 +435,15 @@
436
435
  background-color: $navbar-default-link-disabled-bg;
437
436
  }
438
437
  }
439
- }
440
-
441
- .navbar-toggle {
442
- border-color: $navbar-default-toggle-border-color;
443
- &:hover,
444
- &:focus {
445
- background-color: $navbar-default-toggle-hover-bg;
446
- }
447
- .icon-bar {
448
- background-color: $navbar-default-toggle-icon-bar-bg;
449
- }
450
- }
451
438
 
452
- .navbar-collapse,
453
- .navbar-form {
454
- border-color: $navbar-default-border;
455
- }
456
-
457
- // Dropdown menu items
458
- .navbar-nav {
439
+ // Dropdown menu items
459
440
  // Remove background color from open dropdown
460
441
  > .open > a {
461
442
  &,
462
443
  &:hover,
463
444
  &:focus {
464
- background-color: $navbar-default-link-active-bg;
465
445
  color: $navbar-default-link-active-color;
446
+ background-color: $navbar-default-link-active-bg;
466
447
  }
467
448
  }
468
449
 
@@ -497,6 +478,22 @@
497
478
  }
498
479
  }
499
480
 
481
+ .navbar-toggle {
482
+ border-color: $navbar-default-toggle-border-color;
483
+ &:hover,
484
+ &:focus {
485
+ background-color: $navbar-default-toggle-hover-bg;
486
+ }
487
+ .icon-bar {
488
+ background-color: $navbar-default-toggle-icon-bar-bg;
489
+ }
490
+ }
491
+
492
+ .navbar-collapse,
493
+ .navbar-form {
494
+ border-color: $navbar-default-border;
495
+ }
496
+
500
497
 
501
498
  // Links in navbars
502
499
  //
@@ -570,33 +567,14 @@
570
567
  background-color: $navbar-inverse-link-disabled-bg;
571
568
  }
572
569
  }
573
- }
574
-
575
- // Darken the responsive nav toggle
576
- .navbar-toggle {
577
- border-color: $navbar-inverse-toggle-border-color;
578
- &:hover,
579
- &:focus {
580
- background-color: $navbar-inverse-toggle-hover-bg;
581
- }
582
- .icon-bar {
583
- background-color: $navbar-inverse-toggle-icon-bar-bg;
584
- }
585
- }
586
570
 
587
- .navbar-collapse,
588
- .navbar-form {
589
- border-color: darken($navbar-inverse-bg, 7%);
590
- }
591
-
592
- // Dropdowns
593
- .navbar-nav {
571
+ // Dropdowns
594
572
  > .open > a {
595
573
  &,
596
574
  &:hover,
597
575
  &:focus {
598
- background-color: $navbar-inverse-link-active-bg;
599
576
  color: $navbar-inverse-link-active-color;
577
+ background-color: $navbar-inverse-link-active-bg;
600
578
  }
601
579
  }
602
580
 
@@ -637,6 +615,23 @@
637
615
  }
638
616
  }
639
617
 
618
+ // Darken the responsive nav toggle
619
+ .navbar-toggle {
620
+ border-color: $navbar-inverse-toggle-border-color;
621
+ &:hover,
622
+ &:focus {
623
+ background-color: $navbar-inverse-toggle-hover-bg;
624
+ }
625
+ .icon-bar {
626
+ background-color: $navbar-inverse-toggle-icon-bar-bg;
627
+ }
628
+ }
629
+
630
+ .navbar-collapse,
631
+ .navbar-form {
632
+ border-color: darken($navbar-inverse-bg, 7%);
633
+ }
634
+
640
635
  .navbar-link {
641
636
  color: $navbar-inverse-link-color;
642
637
  &:hover {
@@ -7,8 +7,8 @@
7
7
  // --------------------------------------------------
8
8
 
9
9
  .nav {
10
- margin-bottom: 0;
11
10
  padding-left: 0; // Override default ul/ol
11
+ margin-bottom: 0;
12
12
  list-style: none;
13
13
  @include clearfix;
14
14
 
@@ -35,8 +35,8 @@
35
35
  &:focus {
36
36
  color: $nav-disabled-link-hover-color;
37
37
  text-decoration: none;
38
- background-color: transparent;
39
38
  cursor: $cursor-disabled;
39
+ background-color: transparent;
40
40
  }
41
41
  }
42
42
  }
@@ -97,10 +97,10 @@
97
97
  &:hover,
98
98
  &:focus {
99
99
  color: $nav-tabs-active-link-hover-color;
100
+ cursor: default;
100
101
  background-color: $nav-tabs-active-link-hover-bg;
101
102
  border: 1px solid $nav-tabs-active-link-hover-border-color;
102
103
  border-bottom-color: transparent;
103
- cursor: default;
104
104
  }
105
105
  }
106
106
  }
@@ -163,8 +163,8 @@
163
163
  > li {
164
164
  float: none;
165
165
  > a {
166
- text-align: center;
167
166
  margin-bottom: 5px;
167
+ text-align: center;
168
168
  }
169
169
  }
170
170
 
@@ -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,
@@ -103,11 +104,14 @@ a:hover {
103
104
  // ==========================================================================
104
105
 
105
106
  //
106
- // Address styling not present in IE 8/9/10/11, Safari, and Chrome.
107
+ // 1. Remove the bottom border in Chrome 57- and Firefox 39-.
108
+ // 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari.
107
109
  //
108
110
 
109
111
  abbr[title] {
110
- border-bottom: 1px dotted;
112
+ border-bottom: none; // 1
113
+ text-decoration: underline; // 2
114
+ text-decoration: underline dotted; // 2
111
115
  }
112
116
 
113
117
  //
@@ -209,7 +213,6 @@ figure {
209
213
  //
210
214
 
211
215
  hr {
212
- -moz-box-sizing: content-box;
213
216
  box-sizing: content-box;
214
217
  height: 0;
215
218
  }
@@ -350,15 +353,12 @@ input[type="number"]::-webkit-outer-spin-button {
350
353
 
351
354
  //
352
355
  // 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).
356
+ // 2. Address `box-sizing` set to `border-box` in Safari and Chrome.
355
357
  //
356
358
 
357
359
  input[type="search"] {
358
360
  -webkit-appearance: textfield; // 1
359
- -moz-box-sizing: content-box;
360
- -webkit-box-sizing: content-box; // 2
361
- box-sizing: content-box;
361
+ box-sizing: content-box; //2
362
362
  }
363
363
 
364
364
  //
@@ -6,8 +6,8 @@
6
6
  .pager {
7
7
  padding-left: 0;
8
8
  margin: $line-height-computed 0;
9
- list-style: none;
10
9
  text-align: center;
10
+ list-style: none;
11
11
  @include clearfix;
12
12
  li {
13
13
  display: inline;
@@ -47,8 +47,8 @@
47
47
  > a:focus,
48
48
  > span {
49
49
  color: $pager-disabled-color;
50
- background-color: $pager-bg;
51
50
  cursor: $cursor-disabled;
51
+ background-color: $pager-bg;
52
52
  }
53
53
  }
54
54
  }
@@ -14,12 +14,20 @@
14
14
  position: relative;
15
15
  float: left; // Collapse white-space
16
16
  padding: $padding-base-vertical $padding-base-horizontal;
17
+ margin-left: -1px;
17
18
  line-height: $line-height-base;
18
- text-decoration: none;
19
19
  color: $pagination-color;
20
+ text-decoration: none;
20
21
  background-color: $pagination-bg;
21
22
  border: 1px solid $pagination-border;
22
- margin-left: -1px;
23
+
24
+ &:hover,
25
+ &:focus {
26
+ z-index: 2;
27
+ color: $pagination-hover-color;
28
+ background-color: $pagination-hover-bg;
29
+ border-color: $pagination-hover-border;
30
+ }
23
31
  }
24
32
  &:first-child {
25
33
  > a,
@@ -36,26 +44,16 @@
36
44
  }
37
45
  }
38
46
 
39
- > li > a,
40
- > li > span {
41
- &:hover,
42
- &:focus {
43
- color: $pagination-hover-color;
44
- background-color: $pagination-hover-bg;
45
- border-color: $pagination-hover-border;
46
- }
47
- }
48
-
49
47
  > .active > a,
50
48
  > .active > span {
51
49
  &,
52
50
  &:hover,
53
51
  &:focus {
54
- z-index: 2;
52
+ z-index: 3;
55
53
  color: $pagination-active-color;
54
+ cursor: default;
56
55
  background-color: $pagination-active-bg;
57
56
  border-color: $pagination-active-border;
58
- cursor: default;
59
57
  }
60
58
  }
61
59
 
@@ -67,9 +65,9 @@
67
65
  > a:hover,
68
66
  > a:focus {
69
67
  color: $pagination-disabled-color;
68
+ cursor: $cursor-disabled;
70
69
  background-color: $pagination-disabled-bg;
71
70
  border-color: $pagination-disabled-border;
72
- cursor: $cursor-disabled;
73
71
  }
74
72
  }
75
73
  }
@@ -79,10 +77,10 @@
79
77
 
80
78
  // Large
81
79
  .pagination-lg {
82
- @include pagination-size($padding-large-vertical, $padding-large-horizontal, $font-size-large, $border-radius-large);
80
+ @include pagination-size($padding-large-vertical, $padding-large-horizontal, $font-size-large, $line-height-large, $border-radius-large);
83
81
  }
84
82
 
85
83
  // Small
86
84
  .pagination-sm {
87
- @include pagination-size($padding-small-vertical, $padding-small-horizontal, $font-size-small, $border-radius-small);
85
+ @include pagination-size($padding-small-vertical, $padding-small-horizontal, $font-size-small, $line-height-small, $border-radius-small);
88
86
  }
@@ -9,7 +9,7 @@
9
9
  background-color: $panel-bg;
10
10
  border: 1px solid transparent;
11
11
  border-radius: $panel-border-radius;
12
- @include box-shadow(0 1px 1px rgba(0,0,0,.05));
12
+ @include box-shadow(0 1px 1px rgba(0, 0, 0, .05));
13
13
  }
14
14
 
15
15
  // Panel contents
@@ -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 {
@@ -103,8 +113,8 @@
103
113
  margin-bottom: 0;
104
114
 
105
115
  caption {
106
- padding-left: $panel-body-padding;
107
116
  padding-right: $panel-body-padding;
117
+ padding-left: $panel-body-padding;
108
118
  }
109
119
  }
110
120
  // Add border top radius for first one
@@ -137,8 +147,8 @@
137
147
  > tbody:last-child,
138
148
  > tfoot:last-child {
139
149
  > tr:last-child {
140
- border-bottom-left-radius: ($panel-border-radius - 1);
141
150
  border-bottom-right-radius: ($panel-border-radius - 1);
151
+ border-bottom-left-radius: ($panel-border-radius - 1);
142
152
 
143
153
  td:first-child,
144
154
  th:first-child {
@@ -198,13 +208,13 @@
198
208
  }
199
209
  }
200
210
  > .table-responsive {
201
- border: 0;
202
211
  margin-bottom: 0;
212
+ border: 0;
203
213
  }
204
214
  }
205
215
 
206
216
 
207
- // Collapsable panels (aka, accordion)
217
+ // Collapsible panels (aka, accordion)
208
218
  //
209
219
  // Wrap a series of panels in `.panel-group` to turn them into an accordion with
210
220
  // the help of our collapse JavaScript plugin.