locomotivecms_wagon 2.0.0.rc2 → 2.0.0.rc3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (159) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +1 -1
  3. data/generators/{bootstrap3 → bootstrap}/Gemfile.tt +0 -0
  4. data/generators/{bootstrap3 → bootstrap}/app/content_types/.empty_directory +0 -0
  5. data/generators/bootstrap/app/views/pages/404.liquid +18 -0
  6. data/generators/bootstrap/app/views/pages/404.liquid.haml +14 -0
  7. data/generators/bootstrap/app/views/pages/index.liquid +31 -0
  8. data/generators/bootstrap/app/views/pages/index.liquid.haml +25 -0
  9. data/generators/bootstrap/app/views/pages/layouts/default.liquid +31 -0
  10. data/generators/bootstrap/app/views/pages/layouts/default.liquid.haml +30 -0
  11. data/generators/bootstrap/app/views/pages/layouts/simple.liquid +36 -0
  12. data/generators/bootstrap/app/views/pages/layouts/simple.liquid.haml +29 -0
  13. data/generators/bootstrap/app/views/snippets/footer.liquid +5 -0
  14. data/generators/bootstrap/app/views/snippets/footer.liquid.haml +3 -0
  15. data/generators/bootstrap/app/views/snippets/nav.liquid +26 -0
  16. data/generators/bootstrap/app/views/snippets/nav.liquid.haml +19 -0
  17. data/generators/{bootstrap3 → bootstrap}/config/deploy.yml +0 -0
  18. data/generators/bootstrap/config/site.yml.tt +1 -6
  19. data/generators/{bootstrap3 → bootstrap}/config/translations.yml +0 -0
  20. data/generators/{bootstrap3 → bootstrap}/data/.empty_directory +0 -0
  21. data/generators/{bootstrap3 → bootstrap}/icon.png +0 -0
  22. data/generators/bootstrap/public/fonts/bootstrap/glyphicons-halflings-regular.eot +0 -0
  23. data/generators/bootstrap/public/fonts/bootstrap/glyphicons-halflings-regular.svg +288 -0
  24. data/generators/bootstrap/public/fonts/bootstrap/glyphicons-halflings-regular.ttf +0 -0
  25. data/generators/bootstrap/public/fonts/bootstrap/glyphicons-halflings-regular.woff +0 -0
  26. data/generators/bootstrap/public/fonts/bootstrap/glyphicons-halflings-regular.woff2 +0 -0
  27. data/generators/{bootstrap3/public/samples → bootstrap/public/images}/favicon.png +0 -0
  28. data/generators/bootstrap/public/javascripts/application.js +2 -0
  29. data/generators/{bootstrap3 → bootstrap}/public/javascripts/bootstrap/affix.js +60 -35
  30. data/generators/{bootstrap3 → bootstrap}/public/javascripts/bootstrap/alert.js +15 -9
  31. data/generators/{bootstrap3 → bootstrap}/public/javascripts/bootstrap/button.js +33 -20
  32. data/generators/{bootstrap3 → bootstrap}/public/javascripts/bootstrap/carousel.js +79 -47
  33. data/generators/{bootstrap3 → bootstrap}/public/javascripts/bootstrap/collapse.js +84 -43
  34. data/generators/{bootstrap3 → bootstrap}/public/javascripts/bootstrap/dropdown.js +64 -46
  35. data/generators/bootstrap/public/javascripts/bootstrap/modal.js +337 -0
  36. data/generators/{bootstrap3 → bootstrap}/public/javascripts/bootstrap/popover.js +12 -14
  37. data/generators/{bootstrap3 → bootstrap}/public/javascripts/bootstrap/scrollspy.js +57 -38
  38. data/generators/{bootstrap3 → bootstrap}/public/javascripts/bootstrap/tab.js +54 -24
  39. data/generators/{bootstrap3 → bootstrap}/public/javascripts/bootstrap/tooltip.js +202 -87
  40. data/generators/{bootstrap3 → bootstrap}/public/javascripts/bootstrap/transition.js +19 -8
  41. data/generators/bootstrap/public/javascripts/bootstrap.min.js +7 -0
  42. data/generators/bootstrap/public/javascripts/jquery.min.js +5 -0
  43. data/generators/bootstrap/public/stylesheets/application.css +7 -0
  44. data/generators/bootstrap/public/stylesheets/application.scss +7 -0
  45. data/generators/{bootstrap3 → bootstrap}/public/stylesheets/bootstrap/_alerts.scss +9 -3
  46. data/generators/{bootstrap3 → bootstrap}/public/stylesheets/bootstrap/_badges.scss +26 -13
  47. data/generators/{bootstrap3 → bootstrap}/public/stylesheets/bootstrap/_breadcrumbs.scss +3 -1
  48. data/generators/{bootstrap3 → bootstrap}/public/stylesheets/bootstrap/_button-groups.scss +32 -14
  49. data/generators/{bootstrap3 → bootstrap}/public/stylesheets/bootstrap/_buttons.scss +22 -13
  50. data/generators/{bootstrap3 → bootstrap}/public/stylesheets/bootstrap/_carousel.scss +43 -6
  51. data/generators/{bootstrap3 → bootstrap}/public/stylesheets/bootstrap/_close.scss +1 -0
  52. data/generators/{bootstrap3 → bootstrap}/public/stylesheets/bootstrap/_code.scss +7 -1
  53. data/generators/bootstrap/public/stylesheets/bootstrap/_component-animations.scss +37 -0
  54. data/generators/{bootstrap3 → bootstrap}/public/stylesheets/bootstrap/_dropdowns.scss +12 -9
  55. data/generators/{bootstrap3 → bootstrap}/public/stylesheets/bootstrap/_forms.scss +240 -65
  56. data/generators/{bootstrap3 → bootstrap}/public/stylesheets/bootstrap/_glyphicons.scss +83 -9
  57. data/generators/{bootstrap3 → bootstrap}/public/stylesheets/bootstrap/_grid.scss +4 -4
  58. data/generators/{bootstrap3 → bootstrap}/public/stylesheets/bootstrap/_input-groups.scss +7 -2
  59. data/generators/{bootstrap3 → bootstrap}/public/stylesheets/bootstrap/_jumbotron.scss +12 -4
  60. data/generators/{bootstrap3 → bootstrap}/public/stylesheets/bootstrap/_labels.scss +11 -9
  61. data/generators/{bootstrap3 → bootstrap}/public/stylesheets/bootstrap/_list-group.scss +32 -12
  62. data/generators/bootstrap/public/stylesheets/bootstrap/_media.scss +66 -0
  63. data/generators/bootstrap/public/stylesheets/bootstrap/_mixins.scss +40 -0
  64. data/generators/{bootstrap3 → bootstrap}/public/stylesheets/bootstrap/_modals.scss +18 -7
  65. data/generators/{bootstrap3 → bootstrap}/public/stylesheets/bootstrap/_navbar.scss +75 -33
  66. data/generators/{bootstrap3 → bootstrap}/public/stylesheets/bootstrap/_navs.scss +4 -4
  67. data/generators/{bootstrap3 → bootstrap}/public/stylesheets/bootstrap/_normalize.scss +29 -28
  68. data/generators/{bootstrap3 → bootstrap}/public/stylesheets/bootstrap/_pager.scss +2 -3
  69. data/generators/{bootstrap3 → bootstrap}/public/stylesheets/bootstrap/_pagination.scss +4 -3
  70. data/generators/{bootstrap3 → bootstrap}/public/stylesheets/bootstrap/_panels.scss +40 -10
  71. data/generators/{bootstrap3 → bootstrap}/public/stylesheets/bootstrap/_popovers.scss +6 -8
  72. data/generators/bootstrap/public/stylesheets/bootstrap/_print.scss +101 -0
  73. data/generators/{bootstrap3 → bootstrap}/public/stylesheets/bootstrap/_progress-bars.scss +13 -6
  74. data/generators/bootstrap/public/stylesheets/bootstrap/_responsive-embed.scss +35 -0
  75. data/generators/bootstrap/public/stylesheets/bootstrap/_responsive-utilities.scss +179 -0
  76. data/generators/{bootstrap3 → bootstrap}/public/stylesheets/bootstrap/_scaffolding.scss +31 -4
  77. data/generators/{bootstrap3 → bootstrap}/public/stylesheets/bootstrap/_tables.scss +17 -16
  78. data/generators/{bootstrap3 → bootstrap}/public/stylesheets/bootstrap/_theme.scss +57 -13
  79. data/generators/{bootstrap3 → bootstrap}/public/stylesheets/bootstrap/_thumbnails.scss +2 -2
  80. data/generators/{bootstrap3 → bootstrap}/public/stylesheets/bootstrap/_tooltip.scss +13 -7
  81. data/generators/{bootstrap3 → bootstrap}/public/stylesheets/bootstrap/_type.scss +38 -24
  82. data/generators/{bootstrap3 → bootstrap}/public/stylesheets/bootstrap/_utilities.scss +3 -4
  83. data/generators/{bootstrap3 → bootstrap}/public/stylesheets/bootstrap/_variables.scss +86 -47
  84. data/generators/{bootstrap3 → bootstrap}/public/stylesheets/bootstrap/_wells.scss +0 -0
  85. data/generators/bootstrap/public/stylesheets/bootstrap/mixins/_alerts.scss +14 -0
  86. data/generators/bootstrap/public/stylesheets/bootstrap/mixins/_background-variant.scss +12 -0
  87. data/generators/bootstrap/public/stylesheets/bootstrap/mixins/_border-radius.scss +18 -0
  88. data/generators/bootstrap/public/stylesheets/bootstrap/mixins/_buttons.scss +68 -0
  89. data/generators/bootstrap/public/stylesheets/bootstrap/mixins/_center-block.scss +7 -0
  90. data/generators/bootstrap/public/stylesheets/bootstrap/mixins/_clearfix.scss +22 -0
  91. data/generators/bootstrap/public/stylesheets/bootstrap/mixins/_forms.scss +88 -0
  92. data/generators/bootstrap/public/stylesheets/bootstrap/mixins/_gradients.scss +58 -0
  93. data/generators/bootstrap/public/stylesheets/bootstrap/mixins/_grid-framework.scss +81 -0
  94. data/generators/bootstrap/public/stylesheets/bootstrap/mixins/_grid.scss +122 -0
  95. data/generators/bootstrap/public/stylesheets/bootstrap/mixins/_hide-text.scss +21 -0
  96. data/generators/bootstrap/public/stylesheets/bootstrap/mixins/_image.scss +33 -0
  97. data/generators/bootstrap/public/stylesheets/bootstrap/mixins/_labels.scss +12 -0
  98. data/generators/bootstrap/public/stylesheets/bootstrap/mixins/_list-group.scss +32 -0
  99. data/generators/bootstrap/public/stylesheets/bootstrap/mixins/_nav-divider.scss +10 -0
  100. data/generators/bootstrap/public/stylesheets/bootstrap/mixins/_nav-vertical-align.scss +9 -0
  101. data/generators/bootstrap/public/stylesheets/bootstrap/mixins/_opacity.scss +8 -0
  102. data/generators/bootstrap/public/stylesheets/bootstrap/mixins/_pagination.scss +24 -0
  103. data/generators/bootstrap/public/stylesheets/bootstrap/mixins/_panels.scss +24 -0
  104. data/generators/bootstrap/public/stylesheets/bootstrap/mixins/_progress-bar.scss +10 -0
  105. data/generators/bootstrap/public/stylesheets/bootstrap/mixins/_reset-filter.scss +8 -0
  106. data/generators/bootstrap/public/stylesheets/bootstrap/mixins/_reset-text.scss +18 -0
  107. data/generators/bootstrap/public/stylesheets/bootstrap/mixins/_resize.scss +6 -0
  108. data/generators/bootstrap/public/stylesheets/bootstrap/mixins/_responsive-visibility.scss +21 -0
  109. data/generators/bootstrap/public/stylesheets/bootstrap/mixins/_size.scss +10 -0
  110. data/generators/bootstrap/public/stylesheets/bootstrap/mixins/_tab-focus.scss +9 -0
  111. data/generators/bootstrap/public/stylesheets/bootstrap/mixins/_table-row.scss +28 -0
  112. data/generators/bootstrap/public/stylesheets/bootstrap/mixins/_text-emphasis.scss +12 -0
  113. data/generators/bootstrap/public/stylesheets/bootstrap/mixins/_text-overflow.scss +8 -0
  114. data/generators/bootstrap/public/stylesheets/bootstrap/mixins/_vendor-prefixes.scss +222 -0
  115. data/generators/bootstrap/public/stylesheets/bootstrap.css +5 -0
  116. data/generators/{bootstrap3/public/stylesheets/bootstrap.css.scss → bootstrap/public/stylesheets/bootstrap.scss} +16 -2
  117. data/lib/locomotive/wagon/cli.rb +3 -3
  118. data/lib/locomotive/wagon/commands/authenticate_command.rb +2 -1
  119. data/lib/locomotive/wagon/commands/concerns/spinner_concern.rb +29 -0
  120. data/lib/locomotive/wagon/commands/pull_command.rb +18 -3
  121. data/lib/locomotive/wagon/commands/push_command.rb +28 -4
  122. data/lib/locomotive/wagon/commands/sync_command.rb +21 -6
  123. data/lib/locomotive/wagon/commands/sync_sub_commands/sync_pages_command.rb +27 -3
  124. data/lib/locomotive/wagon/generators/site/{bootstrap3.rb → bootstrap.rb} +12 -6
  125. data/lib/locomotive/wagon/generators/site.rb +1 -1
  126. data/lib/locomotive/wagon/tools/listen.rb +1 -1
  127. data/lib/locomotive/wagon/version.rb +1 -1
  128. data/lib/locomotive/wagon.rb +2 -2
  129. data/locomotivecms_wagon.gemspec +3 -2
  130. data/spec/unit/decorators/theme_asset_decorator_spec.rb +10 -0
  131. metadata +124 -90
  132. data/generators/bootstrap3/app/views/pages/404.liquid +0 -13
  133. data/generators/bootstrap3/app/views/pages/404.liquid.haml +0 -10
  134. data/generators/bootstrap3/app/views/pages/index.liquid +0 -738
  135. data/generators/bootstrap3/app/views/pages/index.liquid.haml +0 -1018
  136. data/generators/bootstrap3/app/views/snippets/footer.liquid +0 -3
  137. data/generators/bootstrap3/app/views/snippets/footer.liquid.haml +0 -2
  138. data/generators/bootstrap3/config/site.yml.tt +0 -28
  139. data/generators/bootstrap3/public/fonts/glyphicons-halflings-regular.eot +0 -0
  140. data/generators/bootstrap3/public/fonts/glyphicons-halflings-regular.svg +0 -229
  141. data/generators/bootstrap3/public/fonts/glyphicons-halflings-regular.ttf +0 -0
  142. data/generators/bootstrap3/public/fonts/glyphicons-halflings-regular.woff +0 -0
  143. data/generators/bootstrap3/public/images/.empty_directory +0 -1
  144. data/generators/bootstrap3/public/javascripts/bootstrap/modal.js +0 -243
  145. data/generators/bootstrap3/public/javascripts/bootstrap.min.js +0 -12
  146. data/generators/bootstrap3/public/samples/apple-touch-icon-114x114-precomposed.png +0 -0
  147. data/generators/bootstrap3/public/samples/apple-touch-icon-144x144-precomposed.png +0 -0
  148. data/generators/bootstrap3/public/samples/apple-touch-icon-72x72-precomposed.png +0 -0
  149. data/generators/bootstrap3/public/samples/apple-touch-icon-precomposed.png +0 -0
  150. data/generators/bootstrap3/public/stylesheets/application.css +0 -1
  151. data/generators/bootstrap3/public/stylesheets/application.css.scss +0 -8
  152. data/generators/bootstrap3/public/stylesheets/bootstrap/_component-animations.scss +0 -29
  153. data/generators/bootstrap3/public/stylesheets/bootstrap/_media.scss +0 -56
  154. data/generators/bootstrap3/public/stylesheets/bootstrap/_mixins.scss +0 -947
  155. data/generators/bootstrap3/public/stylesheets/bootstrap/_print.scss +0 -101
  156. data/generators/bootstrap3/public/stylesheets/bootstrap/_responsive-utilities.scss +0 -74
  157. data/generators/bootstrap3/public/stylesheets/bootstrap/bootstrap.css.scss +0 -49
  158. data/generators/bootstrap3/public/stylesheets/bootstrap.css +0 -5784
  159. data/lib/locomotive/wagon/generators/site/bootstrap2.rb +0 -34
@@ -1,9 +1,9 @@
1
- /*! normalize.css v3.0.0 | 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 {
@@ -24,7 +24,10 @@ body {
24
24
  // ==========================================================================
25
25
 
26
26
  //
27
- // Correct `block` display not defined in IE 8/9.
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
29
+ // and Firefox.
30
+ // Correct `block` display not defined for `main` in IE 11.
28
31
  //
29
32
 
30
33
  article,
@@ -36,6 +39,7 @@ footer,
36
39
  header,
37
40
  hgroup,
38
41
  main,
42
+ menu,
39
43
  nav,
40
44
  section,
41
45
  summary {
@@ -66,8 +70,8 @@ audio:not([controls]) {
66
70
  }
67
71
 
68
72
  //
69
- // Address `[hidden]` styling not present in IE 8/9.
70
- // Hide the `template` element in IE, Safari, and Firefox < 22.
73
+ // Address `[hidden]` styling not present in IE 8/9/10.
74
+ // Hide the `template` element in IE 8/9/10/11, Safari, and Firefox < 22.
71
75
  //
72
76
 
73
77
  [hidden],
@@ -83,11 +87,12 @@ template {
83
87
  //
84
88
 
85
89
  a {
86
- background: transparent;
90
+ background-color: transparent;
87
91
  }
88
92
 
89
93
  //
90
- // 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.
91
96
  //
92
97
 
93
98
  a:active,
@@ -99,7 +104,7 @@ a:hover {
99
104
  // ==========================================================================
100
105
 
101
106
  //
102
- // Address styling not present in IE 8/9, Safari 5, and Chrome.
107
+ // Address styling not present in IE 8/9/10/11, Safari, and Chrome.
103
108
  //
104
109
 
105
110
  abbr[title] {
@@ -107,7 +112,7 @@ abbr[title] {
107
112
  }
108
113
 
109
114
  //
110
- // Address style set to `bolder` in Firefox 4+, Safari 5, and Chrome.
115
+ // Address style set to `bolder` in Firefox 4+, Safari, and Chrome.
111
116
  //
112
117
 
113
118
  b,
@@ -116,7 +121,7 @@ strong {
116
121
  }
117
122
 
118
123
  //
119
- // Address styling not present in Safari 5 and Chrome.
124
+ // Address styling not present in Safari and Chrome.
120
125
  //
121
126
 
122
127
  dfn {
@@ -125,7 +130,7 @@ dfn {
125
130
 
126
131
  //
127
132
  // Address variable `h1` font-size and margin within `section` and `article`
128
- // contexts in Firefox 4+, Safari 5, and Chrome.
133
+ // contexts in Firefox 4+, Safari, and Chrome.
129
134
  //
130
135
 
131
136
  h1 {
@@ -174,7 +179,7 @@ sub {
174
179
  // ==========================================================================
175
180
 
176
181
  //
177
- // Remove border when inside `a` element in IE 8/9.
182
+ // Remove border when inside `a` element in IE 8/9/10.
178
183
  //
179
184
 
180
185
  img {
@@ -182,7 +187,7 @@ img {
182
187
  }
183
188
 
184
189
  //
185
- // Correct overflow displayed oddly in IE 9.
190
+ // Correct overflow not hidden in IE 9/10/11.
186
191
  //
187
192
 
188
193
  svg:not(:root) {
@@ -193,7 +198,7 @@ svg:not(:root) {
193
198
  // ==========================================================================
194
199
 
195
200
  //
196
- // Address margin not present in IE 8/9 and Safari 5.
201
+ // Address margin not present in IE 8/9 and Safari.
197
202
  //
198
203
 
199
204
  figure {
@@ -205,7 +210,6 @@ figure {
205
210
  //
206
211
 
207
212
  hr {
208
- -moz-box-sizing: content-box;
209
213
  box-sizing: content-box;
210
214
  height: 0;
211
215
  }
@@ -242,7 +246,7 @@ samp {
242
246
  // 1. Correct color not being inherited.
243
247
  // Known issue: affects color of disabled elements.
244
248
  // 2. Correct font properties not being inherited.
245
- // 3. Address margins set differently in Firefox 4+, Safari 5, and Chrome.
249
+ // 3. Address margins set differently in Firefox 4+, Safari, and Chrome.
246
250
  //
247
251
 
248
252
  button,
@@ -256,7 +260,7 @@ textarea {
256
260
  }
257
261
 
258
262
  //
259
- // Address `overflow` set to `hidden` in IE 8/9/10.
263
+ // Address `overflow` set to `hidden` in IE 8/9/10/11.
260
264
  //
261
265
 
262
266
  button {
@@ -266,7 +270,7 @@ button {
266
270
  //
267
271
  // Address inconsistent `text-transform` inheritance for `button` and `select`.
268
272
  // All other form control elements do not inherit `text-transform` values.
269
- // Correct `button` style inheritance in Firefox, IE 8+, and Opera
273
+ // Correct `button` style inheritance in Firefox, IE 8/9/10/11, and Opera.
270
274
  // Correct `select` style inheritance in Firefox.
271
275
  //
272
276
 
@@ -345,16 +349,13 @@ input[type="number"]::-webkit-outer-spin-button {
345
349
  }
346
350
 
347
351
  //
348
- // 1. Address `appearance` set to `searchfield` in Safari 5 and Chrome.
349
- // 2. Address `box-sizing` set to `border-box` in Safari 5 and Chrome
350
- // (include `-moz` to future-proof).
352
+ // 1. Address `appearance` set to `searchfield` in Safari and Chrome.
353
+ // 2. Address `box-sizing` set to `border-box` in Safari and Chrome.
351
354
  //
352
355
 
353
356
  input[type="search"] {
354
357
  -webkit-appearance: textfield; // 1
355
- -moz-box-sizing: content-box;
356
- -webkit-box-sizing: content-box; // 2
357
- box-sizing: content-box;
358
+ box-sizing: content-box; //2
358
359
  }
359
360
 
360
361
  //
@@ -379,7 +380,7 @@ fieldset {
379
380
  }
380
381
 
381
382
  //
382
- // 1. Correct `color` not being inherited in IE 8/9.
383
+ // 1. Correct `color` not being inherited in IE 8/9/10/11.
383
384
  // 2. Remove padding so people aren't caught out if they zero out fieldsets.
384
385
  //
385
386
 
@@ -389,7 +390,7 @@ legend {
389
390
  }
390
391
 
391
392
  //
392
- // Remove default vertical scrollbar in IE 8/9.
393
+ // Remove default vertical scrollbar in IE 8/9/10/11.
393
394
  //
394
395
 
395
396
  textarea {
@@ -420,4 +421,4 @@ table {
420
421
  td,
421
422
  th {
422
423
  padding: 0;
423
- }
424
+ }
@@ -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
  }
@@ -40,6 +40,7 @@
40
40
  > li > span {
41
41
  &:hover,
42
42
  &:focus {
43
+ z-index: 3;
43
44
  color: $pagination-hover-color;
44
45
  background-color: $pagination-hover-bg;
45
46
  border-color: $pagination-hover-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
- @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
  }
@@ -15,12 +15,12 @@
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
22
22
  .panel-heading {
23
- padding: 10px 15px;
23
+ padding: $panel-heading-padding;
24
24
  border-bottom: 1px solid transparent;
25
25
  @include border-top-radius(($panel-border-radius - 1));
26
26
 
@@ -36,14 +36,18 @@
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
  }
43
47
 
44
48
  // Optional footer (stays gray in every modifier class)
45
49
  .panel-footer {
46
- padding: 10px 15px;
50
+ padding: $panel-footer-padding;
47
51
  background-color: $panel-footer-bg;
48
52
  border-top: 1px solid $panel-inner-border;
49
53
  @include border-bottom-radius(($panel-border-radius - 1));
@@ -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
  @include 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
+ @include 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 {
@@ -86,7 +97,9 @@
86
97
  border-top-width: 0;
87
98
  }
88
99
  }
89
-
100
+ .list-group + .panel-footer {
101
+ border-top-width: 0;
102
+ }
90
103
 
91
104
  // Tables in panels
92
105
  //
@@ -95,8 +108,14 @@
95
108
 
96
109
  .panel {
97
110
  > .table,
98
- > .table-responsive > .table {
111
+ > .table-responsive > .table,
112
+ > .panel-collapse > .table {
99
113
  margin-bottom: 0;
114
+
115
+ caption {
116
+ padding-left: $panel-body-padding;
117
+ padding-right: $panel-body-padding;
118
+ }
100
119
  }
101
120
  // Add border top radius for first one
102
121
  > .table:first-child,
@@ -106,6 +125,9 @@
106
125
  > thead:first-child,
107
126
  > tbody:first-child {
108
127
  > tr:first-child {
128
+ border-top-left-radius: ($panel-border-radius - 1);
129
+ border-top-right-radius: ($panel-border-radius - 1);
130
+
109
131
  td:first-child,
110
132
  th:first-child {
111
133
  border-top-left-radius: ($panel-border-radius - 1);
@@ -125,6 +147,9 @@
125
147
  > tbody:last-child,
126
148
  > tfoot:last-child {
127
149
  > tr:last-child {
150
+ border-bottom-left-radius: ($panel-border-radius - 1);
151
+ border-bottom-right-radius: ($panel-border-radius - 1);
152
+
128
153
  td:first-child,
129
154
  th:first-child {
130
155
  border-bottom-left-radius: ($panel-border-radius - 1);
@@ -137,7 +162,9 @@
137
162
  }
138
163
  }
139
164
  > .panel-body + .table,
140
- > .panel-body + .table-responsive {
165
+ > .panel-body + .table-responsive,
166
+ > .table + .panel-body,
167
+ > .table-responsive + .panel-body {
141
168
  border-top: 1px solid $table-border-color;
142
169
  }
143
170
  > .table > tbody:first-child > tr:first-child th,
@@ -199,7 +226,7 @@
199
226
  .panel {
200
227
  margin-bottom: 0;
201
228
  border-radius: $panel-border-radius;
202
- overflow: hidden; // crop contents when collapsed
229
+
203
230
  + .panel {
204
231
  margin-top: 5px;
205
232
  }
@@ -207,10 +234,13 @@
207
234
 
208
235
  .panel-heading {
209
236
  border-bottom: 0;
210
- + .panel-collapse .panel-body {
237
+
238
+ + .panel-collapse > .panel-body,
239
+ + .panel-collapse > .list-group {
211
240
  border-top: 1px solid $panel-inner-border;
212
241
  }
213
242
  }
243
+
214
244
  .panel-footer {
215
245
  border-top: 0;
216
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
+ @include 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
  @include 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,11 +34,9 @@
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
- border-radius: 5px 5px 0 0;
39
+ border-radius: ($border-radius-large - 1) ($border-radius-large - 1) 0 0;
41
40
  }
42
41
 
43
42
  .popover-content {
@@ -129,5 +128,4 @@
129
128
  bottom: -$popover-arrow-width;
130
129
  }
131
130
  }
132
-
133
131
  }
@@ -0,0 +1,101 @@
1
+ /*! Source: https://github.com/h5bp/html5-boilerplate/blob/master/src/css/main.css */
2
+
3
+ // ==========================================================================
4
+ // Print styles.
5
+ // Inlined to avoid the additional HTTP request: h5bp.com/r
6
+ // ==========================================================================
7
+
8
+ @media print {
9
+ *,
10
+ *:before,
11
+ *:after {
12
+ background: transparent !important;
13
+ color: #000 !important; // Black prints faster: h5bp.com/s
14
+ box-shadow: none !important;
15
+ text-shadow: none !important;
16
+ }
17
+
18
+ a,
19
+ a:visited {
20
+ text-decoration: underline;
21
+ }
22
+
23
+ a[href]:after {
24
+ content: " (" attr(href) ")";
25
+ }
26
+
27
+ abbr[title]:after {
28
+ content: " (" attr(title) ")";
29
+ }
30
+
31
+ // Don't show links that are fragment identifiers,
32
+ // or use the `javascript:` pseudo protocol
33
+ a[href^="#"]:after,
34
+ a[href^="javascript:"]:after {
35
+ content: "";
36
+ }
37
+
38
+ pre,
39
+ blockquote {
40
+ border: 1px solid #999;
41
+ page-break-inside: avoid;
42
+ }
43
+
44
+ thead {
45
+ display: table-header-group; // h5bp.com/t
46
+ }
47
+
48
+ tr,
49
+ img {
50
+ page-break-inside: avoid;
51
+ }
52
+
53
+ img {
54
+ max-width: 100% !important;
55
+ }
56
+
57
+ p,
58
+ h2,
59
+ h3 {
60
+ orphans: 3;
61
+ widows: 3;
62
+ }
63
+
64
+ h2,
65
+ h3 {
66
+ page-break-after: avoid;
67
+ }
68
+
69
+ // Bootstrap specific changes start
70
+
71
+ // Bootstrap components
72
+ .navbar {
73
+ display: none;
74
+ }
75
+ .btn,
76
+ .dropup > .btn {
77
+ > .caret {
78
+ border-top-color: #000 !important;
79
+ }
80
+ }
81
+ .label {
82
+ border: 1px solid #000;
83
+ }
84
+
85
+ .table {
86
+ border-collapse: collapse !important;
87
+
88
+ td,
89
+ th {
90
+ background-color: #fff !important;
91
+ }
92
+ }
93
+ .table-bordered {
94
+ th,
95
+ td {
96
+ border: 1px solid #ddd !important;
97
+ }
98
+ }
99
+
100
+ // Bootstrap specific changes end
101
+ }
@@ -19,7 +19,6 @@
19
19
  }
20
20
 
21
21
 
22
-
23
22
  // Bar itself
24
23
  // -------------------------
25
24
 
@@ -29,7 +28,7 @@
29
28
  height: $line-height-computed;
30
29
  margin-bottom: $line-height-computed;
31
30
  background-color: $progress-bg;
32
- border-radius: $border-radius-base;
31
+ border-radius: $progress-border-radius;
33
32
  @include box-shadow(inset 0 1px 2px rgba(0,0,0,.1));
34
33
  }
35
34
 
@@ -48,18 +47,26 @@
48
47
  }
49
48
 
50
49
  // Striped bars
51
- .progress-striped .progress-bar {
52
- @include gradient-striped();
50
+ //
51
+ // `.progress-striped .progress-bar` is deprecated as of v3.2.0 in favor of the
52
+ // `.progress-bar-striped` class, which you just add to an existing
53
+ // `.progress-bar`.
54
+ .progress-striped .progress-bar,
55
+ .progress-bar-striped {
56
+ @include gradient-striped;
53
57
  background-size: 40px 40px;
54
58
  }
55
59
 
56
60
  // Call animation for the active one
57
- .progress.active .progress-bar {
61
+ //
62
+ // `.progress.active .progress-bar` is deprecated as of v3.2.0 in favor of the
63
+ // `.progress-bar.active` approach.
64
+ .progress.active .progress-bar,
65
+ .progress-bar.active {
58
66
  @include animation(progress-bar-stripes 2s linear infinite);
59
67
  }
60
68
 
61
69
 
62
-
63
70
  // Variations
64
71
  // -------------------------
65
72
 
@@ -0,0 +1,35 @@
1
+ // Embeds responsive
2
+ //
3
+ // Credit: Nicolas Gallagher and SUIT CSS.
4
+
5
+ .embed-responsive {
6
+ position: relative;
7
+ display: block;
8
+ height: 0;
9
+ padding: 0;
10
+ overflow: hidden;
11
+
12
+ .embed-responsive-item,
13
+ iframe,
14
+ embed,
15
+ object,
16
+ video {
17
+ position: absolute;
18
+ top: 0;
19
+ left: 0;
20
+ bottom: 0;
21
+ height: 100%;
22
+ width: 100%;
23
+ border: 0;
24
+ }
25
+ }
26
+
27
+ // Modifier class for 16:9 aspect ratio
28
+ .embed-responsive-16by9 {
29
+ padding-bottom: 56.25%;
30
+ }
31
+
32
+ // Modifier class for 4:3 aspect ratio
33
+ .embed-responsive-4by3 {
34
+ padding-bottom: 75%;
35
+ }