bootstrap-generators 3.2.0 → 3.3.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (143) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +5 -3
  3. data/Rakefile +9 -18
  4. data/lib/bootstrap/generators/version.rb +1 -1
  5. data/lib/generators/bootstrap/install/templates/assets/stylesheets/bootstrap-variables.less +31 -21
  6. data/lib/generators/bootstrap/install/templates/assets/stylesheets/bootstrap-variables.scss +38 -24
  7. data/lib/generators/bootstrap/install/templates/assets/stylesheets/starter.scss +2 -1
  8. data/lib/generators/bootstrap/install/templates/form_builders/form_builder/_form.html.erb +3 -3
  9. data/lib/generators/bootstrap/install/templates/form_builders/form_builder/_form.html.haml +5 -3
  10. data/lib/generators/bootstrap/install/templates/form_builders/form_builder/_form.html.slim +7 -4
  11. data/lib/generators/bootstrap/install/templates/layouts/starter.html.erb +10 -9
  12. data/lib/generators/bootstrap/install/templates/layouts/starter.html.haml +12 -9
  13. data/lib/generators/bootstrap/install/templates/layouts/starter.html.slim +15 -11
  14. data/readme-template.md.erb +3 -1
  15. data/vendor/assets/fonts/bootstrap/glyphicons-halflings-regular.svg +1 -1
  16. data/vendor/assets/javascripts/bootstrap/affix.js +43 -23
  17. data/vendor/assets/javascripts/bootstrap/alert.js +6 -4
  18. data/vendor/assets/javascripts/bootstrap/button.js +16 -10
  19. data/vendor/assets/javascripts/bootstrap/carousel.js +27 -10
  20. data/vendor/assets/javascripts/bootstrap/collapse.js +69 -28
  21. data/vendor/assets/javascripts/bootstrap/dropdown.js +20 -10
  22. data/vendor/assets/javascripts/bootstrap/modal.js +67 -23
  23. data/vendor/assets/javascripts/bootstrap/popover.js +13 -7
  24. data/vendor/assets/javascripts/bootstrap/scrollspy.js +12 -7
  25. data/vendor/assets/javascripts/bootstrap/tab.js +41 -16
  26. data/vendor/assets/javascripts/bootstrap/tooltip.js +60 -39
  27. data/vendor/assets/javascripts/bootstrap/transition.js +1 -1
  28. data/vendor/assets/stylesheets/bootstrap.css.erb +332 -203
  29. data/vendor/assets/stylesheets/bootstrap.css.map +1 -0
  30. data/vendor/twitter/bootstrap/less/badges.less +7 -1
  31. data/vendor/twitter/bootstrap/less/button-groups.less +16 -13
  32. data/vendor/twitter/bootstrap/less/buttons.less +7 -4
  33. data/vendor/twitter/bootstrap/less/carousel.less +24 -0
  34. data/vendor/twitter/bootstrap/less/code.less +1 -0
  35. data/vendor/twitter/bootstrap/less/component-animations.less +5 -2
  36. data/vendor/twitter/bootstrap/less/dropdowns.less +3 -5
  37. data/vendor/twitter/bootstrap/less/forms.less +46 -40
  38. data/vendor/twitter/bootstrap/less/glyphicons.less +2 -1
  39. data/vendor/twitter/bootstrap/less/jumbotron.less +6 -5
  40. data/vendor/twitter/bootstrap/less/list-group.less +1 -8
  41. data/vendor/twitter/bootstrap/less/media.less +27 -36
  42. data/vendor/twitter/bootstrap/less/mixins/buttons.less +2 -0
  43. data/vendor/twitter/bootstrap/less/mixins/forms.less +5 -1
  44. data/vendor/twitter/bootstrap/less/mixins/grid-framework.less +2 -2
  45. data/vendor/twitter/bootstrap/less/mixins/image.less +0 -1
  46. data/vendor/twitter/bootstrap/less/mixins/labels.less +1 -1
  47. data/vendor/twitter/bootstrap/less/mixins/vendor-prefixes.less +6 -3
  48. data/vendor/twitter/bootstrap/less/modals.less +3 -5
  49. data/vendor/twitter/bootstrap/less/navbar.less +30 -25
  50. data/vendor/twitter/bootstrap/less/navs.less +3 -1
  51. data/vendor/twitter/bootstrap/less/normalize.less +5 -3
  52. data/vendor/twitter/bootstrap/less/pager.less +1 -2
  53. data/vendor/twitter/bootstrap/less/pagination.less +1 -1
  54. data/vendor/twitter/bootstrap/less/panels.less +21 -3
  55. data/vendor/twitter/bootstrap/less/popovers.less +6 -4
  56. data/vendor/twitter/bootstrap/less/print.less +102 -96
  57. data/vendor/twitter/bootstrap/less/progress-bars.less +1 -19
  58. data/vendor/twitter/bootstrap/less/responsive-embed.less +2 -1
  59. data/vendor/twitter/bootstrap/less/scaffolding.less +1 -1
  60. data/vendor/twitter/bootstrap/less/tables.less +11 -10
  61. data/vendor/twitter/bootstrap/less/theme.less +23 -9
  62. data/vendor/twitter/bootstrap/less/thumbnails.less +1 -1
  63. data/vendor/twitter/bootstrap/less/tooltip.less +12 -4
  64. data/vendor/twitter/bootstrap/less/type.less +0 -11
  65. data/vendor/twitter/bootstrap/less/utilities.less +0 -1
  66. data/vendor/twitter/bootstrap/less/variables.less +31 -21
  67. data/vendor/twitter/bootstrap/sass/_bootstrap-compass.scss +7 -0
  68. data/vendor/twitter/bootstrap/sass/_bootstrap-mincer.scss +17 -0
  69. data/vendor/twitter/bootstrap/sass/_bootstrap-sprockets.scss +7 -0
  70. data/vendor/twitter/bootstrap/sass/_bootstrap.scss +50 -0
  71. data/vendor/twitter/bootstrap/sass/{_alerts.scss → bootstrap/_alerts.scss} +0 -0
  72. data/vendor/twitter/bootstrap/sass/{_badges.scss → bootstrap/_badges.scss} +7 -1
  73. data/vendor/twitter/bootstrap/sass/{_breadcrumbs.scss → bootstrap/_breadcrumbs.scss} +0 -0
  74. data/vendor/twitter/bootstrap/sass/{_button-groups.scss → bootstrap/_button-groups.scss} +18 -15
  75. data/vendor/twitter/bootstrap/sass/{_buttons.scss → bootstrap/_buttons.scss} +8 -5
  76. data/vendor/twitter/bootstrap/sass/{_carousel.scss → bootstrap/_carousel.scss} +25 -1
  77. data/vendor/twitter/bootstrap/sass/{_close.scss → bootstrap/_close.scss} +0 -0
  78. data/vendor/twitter/bootstrap/sass/{_code.scss → bootstrap/_code.scss} +1 -0
  79. data/vendor/twitter/bootstrap/sass/{_component-animations.scss → bootstrap/_component-animations.scss} +5 -2
  80. data/vendor/twitter/bootstrap/sass/{_dropdowns.scss → bootstrap/_dropdowns.scss} +4 -6
  81. data/vendor/twitter/bootstrap/sass/{_forms.scss → bootstrap/_forms.scss} +53 -43
  82. data/vendor/twitter/bootstrap/sass/{_glyphicons.scss → bootstrap/_glyphicons.scss} +7 -10
  83. data/vendor/twitter/bootstrap/sass/{_grid.scss → bootstrap/_grid.scss} +4 -4
  84. data/vendor/twitter/bootstrap/sass/{_input-groups.scss → bootstrap/_input-groups.scss} +0 -0
  85. data/vendor/twitter/bootstrap/sass/{_jumbotron.scss → bootstrap/_jumbotron.scss} +6 -5
  86. data/vendor/twitter/bootstrap/sass/{_labels.scss → bootstrap/_labels.scss} +0 -0
  87. data/vendor/twitter/bootstrap/sass/{_list-group.scss → bootstrap/_list-group.scss} +1 -8
  88. data/vendor/twitter/bootstrap/sass/bootstrap/_media.scss +47 -0
  89. data/vendor/twitter/bootstrap/sass/{_mixins.scss → bootstrap/_mixins.scss} +0 -0
  90. data/vendor/twitter/bootstrap/sass/{_modals.scss → bootstrap/_modals.scss} +4 -6
  91. data/vendor/twitter/bootstrap/sass/{_navbar.scss → bootstrap/_navbar.scss} +36 -33
  92. data/vendor/twitter/bootstrap/sass/{_navs.scss → bootstrap/_navs.scss} +5 -3
  93. data/vendor/twitter/bootstrap/sass/{_normalize.scss → bootstrap/_normalize.scss} +5 -3
  94. data/vendor/twitter/bootstrap/sass/{_pager.scss → bootstrap/_pager.scss} +2 -3
  95. data/vendor/twitter/bootstrap/sass/{_pagination.scss → bootstrap/_pagination.scss} +1 -1
  96. data/vendor/twitter/bootstrap/sass/{_panels.scss → bootstrap/_panels.scss} +22 -4
  97. data/vendor/twitter/bootstrap/sass/{_popovers.scss → bootstrap/_popovers.scss} +6 -4
  98. data/vendor/twitter/bootstrap/sass/bootstrap/_print.scss +107 -0
  99. data/vendor/twitter/bootstrap/sass/{_progress-bars.scss → bootstrap/_progress-bars.scss} +2 -20
  100. data/vendor/twitter/bootstrap/sass/{_responsive-embed.scss → bootstrap/_responsive-embed.scss} +2 -1
  101. data/vendor/twitter/bootstrap/sass/{_responsive-utilities.scss → bootstrap/_responsive-utilities.scss} +0 -0
  102. data/vendor/twitter/bootstrap/sass/{_scaffolding.scss → bootstrap/_scaffolding.scss} +3 -3
  103. data/vendor/twitter/bootstrap/sass/{_tables.scss → bootstrap/_tables.scss} +11 -10
  104. data/vendor/twitter/bootstrap/sass/{_theme.scss → bootstrap/_theme.scss} +27 -13
  105. data/vendor/twitter/bootstrap/sass/{_thumbnails.scss → bootstrap/_thumbnails.scss} +2 -2
  106. data/vendor/twitter/bootstrap/sass/{_tooltip.scss → bootstrap/_tooltip.scss} +12 -4
  107. data/vendor/twitter/bootstrap/sass/{_type.scss → bootstrap/_type.scss} +10 -16
  108. data/vendor/twitter/bootstrap/sass/{_utilities.scss → bootstrap/_utilities.scss} +3 -4
  109. data/vendor/twitter/bootstrap/sass/{_variables.scss → bootstrap/_variables.scss} +38 -24
  110. data/vendor/twitter/bootstrap/sass/{_wells.scss → bootstrap/_wells.scss} +0 -0
  111. data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_alerts.scss +0 -0
  112. data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_background-variant.scss +0 -0
  113. data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_border-radius.scss +0 -0
  114. data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_buttons.scss +2 -0
  115. data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_center-block.scss +0 -0
  116. data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_clearfix.scss +0 -0
  117. data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_forms.scss +5 -1
  118. data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_gradients.scss +0 -0
  119. data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_grid-framework.scss +0 -0
  120. data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_grid.scss +2 -2
  121. data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_hide-text.scss +1 -1
  122. data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_image.scss +0 -1
  123. data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_labels.scss +1 -1
  124. data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_list-group.scss +0 -0
  125. data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_nav-divider.scss +0 -0
  126. data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_nav-vertical-align.scss +0 -0
  127. data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_opacity.scss +0 -0
  128. data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_pagination.scss +0 -0
  129. data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_panels.scss +0 -0
  130. data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_progress-bar.scss +1 -1
  131. data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_reset-filter.scss +0 -0
  132. data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_resize.scss +0 -0
  133. data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_responsive-visibility.scss +0 -0
  134. data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_size.scss +0 -0
  135. data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_tab-focus.scss +0 -0
  136. data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_table-row.scss +0 -0
  137. data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_text-emphasis.scss +0 -0
  138. data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_text-overflow.scss +0 -0
  139. data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_vendor-prefixes.scss +6 -3
  140. metadata +76 -72
  141. data/vendor/twitter/bootstrap/sass/_media.scss +0 -56
  142. data/vendor/twitter/bootstrap/sass/_print.scss +0 -101
  143. data/vendor/twitter/bootstrap/sass/bootstrap.scss +0 -50
@@ -0,0 +1,47 @@
1
+ .media {
2
+ // Proper spacing between instances of .media
3
+ margin-top: 15px;
4
+
5
+ &:first-child {
6
+ margin-top: 0;
7
+ }
8
+ }
9
+
10
+ .media-right,
11
+ .media > .pull-right {
12
+ padding-left: 10px;
13
+ }
14
+
15
+ .media-left,
16
+ .media > .pull-left {
17
+ padding-right: 10px;
18
+ }
19
+
20
+ .media-left,
21
+ .media-right,
22
+ .media-body {
23
+ display: table-cell;
24
+ vertical-align: top;
25
+ }
26
+
27
+ .media-middle {
28
+ vertical-align: middle;
29
+ }
30
+
31
+ .media-bottom {
32
+ vertical-align: bottom;
33
+ }
34
+
35
+ // Reset margins on headings for tighter default spacing
36
+ .media-heading {
37
+ margin-top: 0;
38
+ margin-bottom: 5px;
39
+ }
40
+
41
+ // Media list variation
42
+ //
43
+ // Undo default ul/ol styles
44
+ .media-list {
45
+ padding-left: 0;
46
+ list-style: none;
47
+ }
@@ -30,10 +30,10 @@
30
30
 
31
31
  // When fading in the modal, animate it to slide down
32
32
  &.fade .modal-dialog {
33
- @include translate3d(0, -25%, 0);
33
+ @include translate(0, -25%);
34
34
  @include transition-transform(0.3s ease-out);
35
35
  }
36
- &.in .modal-dialog { @include translate3d(0, 0, 0) }
36
+ &.in .modal-dialog { @include translate(0, 0) }
37
37
  }
38
38
  .modal-open .modal {
39
39
  overflow-x: hidden;
@@ -62,12 +62,10 @@
62
62
 
63
63
  // Modal background
64
64
  .modal-backdrop {
65
- position: fixed;
65
+ position: absolute;
66
66
  top: 0;
67
67
  right: 0;
68
- bottom: 0;
69
68
  left: 0;
70
- z-index: $zindex-modal-background;
71
69
  background-color: $modal-backdrop-bg;
72
70
  // Fade for backdrop
73
71
  &.fade { @include opacity(0); }
@@ -104,7 +102,7 @@
104
102
  padding: $modal-inner-padding;
105
103
  text-align: right; // right align buttons
106
104
  border-top: 1px solid $modal-footer-border-color;
107
- @include clearfix(); // clear it in case folks use .pull-* classes on buttons
105
+ @include clearfix; // clear it in case folks use .pull-* classes on buttons
108
106
 
109
107
  // Properly space out buttons
110
108
  .btn + .btn {
@@ -15,7 +15,7 @@
15
15
  border: 1px solid transparent;
16
16
 
17
17
  // Prevent floats from breaking the navbar
18
- @include clearfix();
18
+ @include clearfix;
19
19
 
20
20
  @media (min-width: $grid-float-breakpoint) {
21
21
  border-radius: $navbar-border-radius;
@@ -29,7 +29,7 @@
29
29
  // styling of responsive aspects.
30
30
 
31
31
  .navbar-header {
32
- @include clearfix();
32
+ @include clearfix;
33
33
 
34
34
  @media (min-width: $grid-float-breakpoint) {
35
35
  float: left;
@@ -53,7 +53,7 @@
53
53
  padding-left: $navbar-padding-horizontal;
54
54
  border-top: 1px solid transparent;
55
55
  box-shadow: inset 0 1px 0 rgba(255,255,255,.1);
56
- @include clearfix();
56
+ @include clearfix;
57
57
  -webkit-overflow-scrolling: touch;
58
58
 
59
59
  &.in {
@@ -67,6 +67,7 @@
67
67
 
68
68
  &.collapse {
69
69
  display: block !important;
70
+ visibility: visible !important;
70
71
  height: auto !important;
71
72
  padding-bottom: 0; // Override default setting
72
73
  overflow: visible !important;
@@ -92,7 +93,7 @@
92
93
  .navbar-collapse {
93
94
  max-height: $navbar-collapse-max-height;
94
95
 
95
- @media (max-width: $screen-xs-min) and (orientation: landscape) {
96
+ @media (max-device-width: $screen-xs-min) and (orientation: landscape) {
96
97
  max-height: 200px;
97
98
  }
98
99
  }
@@ -141,7 +142,6 @@
141
142
  right: 0;
142
143
  left: 0;
143
144
  z-index: $zindex-navbar-fixed;
144
- @include translate3d(0, 0, 0);
145
145
 
146
146
  // Undo the rounded corners
147
147
  @media (min-width: $grid-float-breakpoint) {
@@ -173,6 +173,10 @@
173
173
  text-decoration: none;
174
174
  }
175
175
 
176
+ > img {
177
+ display: block;
178
+ }
179
+
176
180
  @media (min-width: $grid-float-breakpoint) {
177
181
  .navbar > .container &,
178
182
  .navbar > .container-fluid & {
@@ -271,26 +275,6 @@
271
275
  padding-bottom: $navbar-padding-vertical;
272
276
  }
273
277
  }
274
-
275
- &.navbar-right:last-child {
276
- margin-right: -$navbar-padding-horizontal;
277
- }
278
- }
279
- }
280
-
281
-
282
- // Component alignment
283
- //
284
- // Repurpose the pull utilities as their own navbar utilities to avoid specificity
285
- // issues with parents and chaining. Only do this when the navbar is uncollapsed
286
- // though so that navbar contents properly stack and align in mobile.
287
-
288
- @media (min-width: $grid-float-breakpoint) {
289
- .navbar-left {
290
- float: left !important;
291
- }
292
- .navbar-right {
293
- float: right !important;
294
278
  }
295
279
  }
296
280
 
@@ -310,11 +294,15 @@
310
294
  @include box-shadow($shadow);
311
295
 
312
296
  // Mixin behavior for optimum display
313
- @extend .form-inline;
297
+ @include form-inline;
314
298
 
315
299
  .form-group {
316
300
  @media (max-width: $grid-float-breakpoint-max) {
317
301
  margin-bottom: 5px;
302
+
303
+ &:last-child {
304
+ margin-bottom: 0;
305
+ }
318
306
  }
319
307
  }
320
308
 
@@ -330,11 +318,6 @@
330
318
  padding-top: 0;
331
319
  padding-bottom: 0;
332
320
  @include box-shadow(none);
333
-
334
- // Outdent the form if last child to line up with content down the page
335
- &.navbar-right:last-child {
336
- margin-right: -$navbar-padding-horizontal;
337
- }
338
321
  }
339
322
  }
340
323
 
@@ -348,6 +331,7 @@
348
331
  }
349
332
  // Menu position and menu caret support for dropups via extra dropup class
350
333
  .navbar-fixed-bottom .navbar-nav > li > .dropdown-menu {
334
+ @include border-top-radius($navbar-border-radius);
351
335
  @include border-bottom-radius(0);
352
336
  }
353
337
 
@@ -379,14 +363,33 @@
379
363
  float: left;
380
364
  margin-left: $navbar-padding-horizontal;
381
365
  margin-right: $navbar-padding-horizontal;
366
+ }
367
+ }
368
+
369
+
370
+ // Component alignment
371
+ //
372
+ // Repurpose the pull utilities as their own navbar utilities to avoid specificity
373
+ // issues with parents and chaining. Only do this when the navbar is uncollapsed
374
+ // though so that navbar contents properly stack and align in mobile.
375
+ //
376
+ // Declared after the navbar components to ensure more specificity on the margins.
382
377
 
383
- // Outdent the form if last child to line up with content down the page
384
- &.navbar-right:last-child {
378
+ @media (min-width: $grid-float-breakpoint) {
379
+ .navbar-left {
380
+ float: left !important;
381
+ }
382
+ .navbar-right {
383
+ float: right !important;
384
+ margin-right: -$navbar-padding-horizontal;
385
+
386
+ ~ .navbar-right {
385
387
  margin-right: 0;
386
388
  }
387
389
  }
388
390
  }
389
391
 
392
+
390
393
  // Alternate navbars
391
394
  // --------------------------------------------------
392
395
 
@@ -10,7 +10,7 @@
10
10
  margin-bottom: 0;
11
11
  padding-left: 0; // Override default ul/ol
12
12
  list-style: none;
13
- @include clearfix();
13
+ @include clearfix;
14
14
 
15
15
  > li {
16
16
  position: relative;
@@ -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
  }
@@ -57,7 +57,7 @@
57
57
  // we missed it. We don't currently support this anywhere, but in the interest
58
58
  // of maintaining backward compatibility in case you use it, it's deprecated.
59
59
  .nav-divider {
60
- @include nav-divider();
60
+ @include nav-divider;
61
61
  }
62
62
 
63
63
  // Prevent IE8 from misplacing imgs
@@ -223,9 +223,11 @@
223
223
  .tab-content {
224
224
  > .tab-pane {
225
225
  display: none;
226
+ visibility: hidden;
226
227
  }
227
228
  > .active {
228
229
  display: block;
230
+ visibility: visible;
229
231
  }
230
232
  }
231
233
 
@@ -1,4 +1,4 @@
1
- /*! normalize.css v3.0.1 | MIT License | git.io/normalize */
1
+ /*! normalize.css v3.0.2 | MIT License | git.io/normalize */
2
2
 
3
3
  //
4
4
  // 1. Set default font family to sans-serif.
@@ -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 {
@@ -85,7 +87,7 @@ template {
85
87
  //
86
88
 
87
89
  a {
88
- background: transparent;
90
+ background-color: transparent;
89
91
  }
90
92
 
91
93
  //
@@ -8,7 +8,7 @@
8
8
  margin: $line-height-computed 0;
9
9
  list-style: none;
10
10
  text-align: center;
11
- @include clearfix();
11
+ @include clearfix;
12
12
  li {
13
13
  display: inline;
14
14
  > a,
@@ -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
  }
@@ -69,7 +69,7 @@
69
69
  color: $pagination-disabled-color;
70
70
  background-color: $pagination-disabled-bg;
71
71
  border-color: $pagination-disabled-border;
72
- cursor: not-allowed;
72
+ cursor: $cursor-disabled;
73
73
  }
74
74
  }
75
75
  }
@@ -15,7 +15,7 @@
15
15
  // Panel contents
16
16
  .panel-body {
17
17
  padding: $panel-body-padding;
18
- @include clearfix();
18
+ @include clearfix;
19
19
  }
20
20
 
21
21
  // Optional heading
@@ -56,7 +56,8 @@
56
56
  // any kind of custom content between the two.
57
57
 
58
58
  .panel {
59
- > .list-group {
59
+ > .list-group,
60
+ > .panel-collapse > .list-group {
60
61
  margin-bottom: 0;
61
62
 
62
63
  .list-group-item {
@@ -100,6 +101,11 @@
100
101
  > .table-responsive > .table,
101
102
  > .panel-collapse > .table {
102
103
  margin-bottom: 0;
104
+
105
+ caption {
106
+ padding-left: $panel-body-padding;
107
+ padding-right: $panel-body-padding;
108
+ }
103
109
  }
104
110
  // Add border top radius for first one
105
111
  > .table:first-child,
@@ -109,6 +115,9 @@
109
115
  > thead:first-child,
110
116
  > tbody:first-child {
111
117
  > tr:first-child {
118
+ border-top-left-radius: ($panel-border-radius - 1);
119
+ border-top-right-radius: ($panel-border-radius - 1);
120
+
112
121
  td:first-child,
113
122
  th:first-child {
114
123
  border-top-left-radius: ($panel-border-radius - 1);
@@ -128,6 +137,9 @@
128
137
  > tbody:last-child,
129
138
  > tfoot:last-child {
130
139
  > tr:last-child {
140
+ border-bottom-left-radius: ($panel-border-radius - 1);
141
+ border-bottom-right-radius: ($panel-border-radius - 1);
142
+
131
143
  td:first-child,
132
144
  th:first-child {
133
145
  border-bottom-left-radius: ($panel-border-radius - 1);
@@ -140,7 +152,9 @@
140
152
  }
141
153
  }
142
154
  > .panel-body + .table,
143
- > .panel-body + .table-responsive {
155
+ > .panel-body + .table-responsive,
156
+ > .table + .panel-body,
157
+ > .table-responsive + .panel-body {
144
158
  border-top: 1px solid $table-border-color;
145
159
  }
146
160
  > .table > tbody:first-child > tr:first-child th,
@@ -202,6 +216,7 @@
202
216
  .panel {
203
217
  margin-bottom: 0;
204
218
  border-radius: $panel-border-radius;
219
+
205
220
  + .panel {
206
221
  margin-top: 5px;
207
222
  }
@@ -209,10 +224,13 @@
209
224
 
210
225
  .panel-heading {
211
226
  border-bottom: 0;
212
- + .panel-collapse > .panel-body {
227
+
228
+ + .panel-collapse > .panel-body,
229
+ + .panel-collapse > .list-group {
213
230
  border-top: 1px solid $panel-inner-border;
214
231
  }
215
232
  }
233
+
216
234
  .panel-footer {
217
235
  border-top: 0;
218
236
  + .panel-collapse .panel-body {
@@ -11,7 +11,12 @@
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
+ // Reset font and text propertes given new insertion method
15
+ font-family: $font-family-base;
16
+ font-size: $font-size-base;
17
+ font-weight: normal;
18
+ line-height: $line-height-base;
19
+ text-align: left;
15
20
  background-color: $popover-bg;
16
21
  background-clip: padding-box;
17
22
  border: 1px solid $popover-fallback-border-color;
@@ -33,8 +38,6 @@
33
38
  margin: 0; // reset heading margin
34
39
  padding: 8px 14px;
35
40
  font-size: $font-size-base;
36
- font-weight: normal;
37
- line-height: 18px;
38
41
  background-color: $popover-title-bg;
39
42
  border-bottom: 1px solid darken($popover-title-bg, 5%);
40
43
  border-radius: ($border-radius-large - 1) ($border-radius-large - 1) 0 0;
@@ -129,5 +132,4 @@
129
132
  bottom: -$popover-arrow-width;
130
133
  }
131
134
  }
132
-
133
135
  }