bootstrap 4.0.0.alpha5 → 4.0.0.alpha6

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

Potentially problematic release.


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

Files changed (85) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +7 -4
  3. data/assets/javascripts/bootstrap.js +312 -207
  4. data/assets/javascripts/bootstrap.min.js +4 -4
  5. data/assets/javascripts/bootstrap/alert.js +9 -5
  6. data/assets/javascripts/bootstrap/button.js +5 -5
  7. data/assets/javascripts/bootstrap/carousel.js +52 -28
  8. data/assets/javascripts/bootstrap/collapse.js +19 -11
  9. data/assets/javascripts/bootstrap/dropdown.js +21 -19
  10. data/assets/javascripts/bootstrap/modal.js +69 -43
  11. data/assets/javascripts/bootstrap/popover.js +4 -4
  12. data/assets/javascripts/bootstrap/scrollspy.js +20 -11
  13. data/assets/javascripts/bootstrap/tab.js +19 -14
  14. data/assets/javascripts/bootstrap/tooltip.js +54 -22
  15. data/assets/javascripts/bootstrap/util.js +7 -12
  16. data/assets/stylesheets/_bootstrap-grid.scss +23 -3
  17. data/assets/stylesheets/_bootstrap-reboot.scss +2 -3
  18. data/assets/stylesheets/_bootstrap.scss +6 -6
  19. data/assets/stylesheets/bootstrap/_alert.scss +3 -4
  20. data/assets/stylesheets/bootstrap/_badge.scss +77 -0
  21. data/assets/stylesheets/bootstrap/_button-group.scss +18 -51
  22. data/assets/stylesheets/bootstrap/_buttons.scss +14 -20
  23. data/assets/stylesheets/bootstrap/_card.scss +30 -76
  24. data/assets/stylesheets/bootstrap/_carousel.scss +96 -171
  25. data/assets/stylesheets/bootstrap/_close.scss +3 -3
  26. data/assets/stylesheets/bootstrap/_code.scss +7 -0
  27. data/assets/stylesheets/bootstrap/_custom-forms.scss +13 -12
  28. data/assets/stylesheets/bootstrap/_dropdown.scss +17 -36
  29. data/assets/stylesheets/bootstrap/_forms.scss +61 -47
  30. data/assets/stylesheets/bootstrap/_grid.scss +13 -0
  31. data/assets/stylesheets/bootstrap/_images.scss +2 -2
  32. data/assets/stylesheets/bootstrap/_input-group.scss +17 -27
  33. data/assets/stylesheets/bootstrap/_list-group.scss +79 -63
  34. data/assets/stylesheets/bootstrap/_media.scss +5 -78
  35. data/assets/stylesheets/bootstrap/_mixins.scss +8 -5
  36. data/assets/stylesheets/bootstrap/_modal.scss +21 -13
  37. data/assets/stylesheets/bootstrap/_nav.scss +30 -68
  38. data/assets/stylesheets/bootstrap/_navbar.scss +131 -178
  39. data/assets/stylesheets/bootstrap/_normalize.scss +133 -94
  40. data/assets/stylesheets/bootstrap/_pagination.scss +16 -22
  41. data/assets/stylesheets/bootstrap/_popover.scss +3 -3
  42. data/assets/stylesheets/bootstrap/_print.scss +5 -8
  43. data/assets/stylesheets/bootstrap/_progress.scss +14 -127
  44. data/assets/stylesheets/bootstrap/_reboot.scss +16 -15
  45. data/assets/stylesheets/bootstrap/_responsive-embed.scss +18 -5
  46. data/assets/stylesheets/bootstrap/_tables.scss +13 -56
  47. data/assets/stylesheets/bootstrap/_tooltip.scss +1 -1
  48. data/assets/stylesheets/bootstrap/{_animation.scss → _transitions.scss} +6 -8
  49. data/assets/stylesheets/bootstrap/_type.scss +5 -12
  50. data/assets/stylesheets/bootstrap/_utilities.scss +2 -0
  51. data/assets/stylesheets/bootstrap/_variables.scss +320 -216
  52. data/assets/stylesheets/bootstrap/mixins/{_tag.scss → _badge.scss} +2 -2
  53. data/assets/stylesheets/bootstrap/mixins/_breakpoints.scss +25 -16
  54. data/assets/stylesheets/bootstrap/mixins/_buttons.scss +31 -58
  55. data/assets/stylesheets/bootstrap/mixins/_cards.scss +3 -0
  56. data/assets/stylesheets/bootstrap/mixins/_clearfix.scss +1 -1
  57. data/assets/stylesheets/bootstrap/mixins/_float.scss +3 -0
  58. data/assets/stylesheets/bootstrap/mixins/_forms.scss +3 -5
  59. data/assets/stylesheets/bootstrap/mixins/_gradients.scss +1 -7
  60. data/assets/stylesheets/bootstrap/mixins/_grid-framework.scss +19 -23
  61. data/assets/stylesheets/bootstrap/mixins/_grid.scss +19 -26
  62. data/assets/stylesheets/bootstrap/mixins/_list-group.scss +3 -5
  63. data/assets/stylesheets/bootstrap/mixins/_reset-text.scss +1 -1
  64. data/assets/stylesheets/bootstrap/mixins/_transforms.scss +14 -0
  65. data/assets/stylesheets/bootstrap/mixins/_visibility.scss +5 -0
  66. data/assets/stylesheets/bootstrap/utilities/_align.scss +5 -5
  67. data/assets/stylesheets/bootstrap/utilities/_background.scss +1 -1
  68. data/assets/stylesheets/bootstrap/utilities/_borders.scss +10 -3
  69. data/assets/stylesheets/bootstrap/utilities/_display.scss +13 -8
  70. data/assets/stylesheets/bootstrap/utilities/_flex.scss +42 -31
  71. data/assets/stylesheets/bootstrap/utilities/_float.scss +5 -9
  72. data/assets/stylesheets/bootstrap/utilities/_position.scss +23 -0
  73. data/assets/stylesheets/bootstrap/utilities/_sizing.scss +10 -0
  74. data/assets/stylesheets/bootstrap/utilities/_spacing.scss +36 -37
  75. data/assets/stylesheets/bootstrap/utilities/_text.scss +14 -12
  76. data/assets/stylesheets/bootstrap/utilities/_visibility.scss +1 -1
  77. data/lib/bootstrap/version.rb +2 -2
  78. data/tasks/updater/scss.rb +3 -5
  79. data/templates/project/_bootstrap-variables.scss +321 -217
  80. metadata +10 -10
  81. data/assets/stylesheets/_bootstrap-flex.scss +0 -8
  82. data/assets/stylesheets/bootstrap/_tags.scss +0 -77
  83. data/assets/stylesheets/bootstrap/mixins/_progress.scss +0 -23
  84. data/assets/stylesheets/bootstrap/mixins/_reset-filter.scss +0 -8
  85. data/assets/stylesheets/bootstrap/mixins/_tab-focus.scss +0 -9
@@ -5,7 +5,9 @@
5
5
  @import "utilities/display";
6
6
  @import "utilities/flex";
7
7
  @import "utilities/float";
8
+ @import "utilities/position";
8
9
  @import "utilities/screenreaders";
10
+ @import "utilities/sizing";
9
11
  @import "utilities/spacing";
10
12
  @import "utilities/text";
11
13
  @import "utilities/visibility";
@@ -16,6 +16,30 @@
16
16
  // Grid columns
17
17
  // Fonts
18
18
  // Components
19
+ // Tables
20
+ // Buttons
21
+ // Forms
22
+ // Dropdowns
23
+ // Z-index master list
24
+ // Navbar
25
+ // Navs
26
+ // Pagination
27
+ // Jumbotron
28
+ // Form states and alerts
29
+ // Cards
30
+ // Tooltips
31
+ // Popovers
32
+ // Badges
33
+ // Modals
34
+ // Alerts
35
+ // Progress bars
36
+ // List group
37
+ // Image thumbnails
38
+ // Figures
39
+ // Breadcrumbs
40
+ // Carousel
41
+ // Close
42
+ // Code
19
43
 
20
44
  @mixin _assert-ascending($map, $map-name) {
21
45
  $prev-key: null;
@@ -33,6 +57,31 @@
33
57
  }
34
58
  }
35
59
 
60
+ // Replace `$search` with `$replace` in `$string`
61
+ // @author Hugo Giraudel
62
+ // @param {String} $string - Initial string
63
+ // @param {String} $search - Substring to replace
64
+ // @param {String} $replace ('') - New value
65
+ // @return {String} - Updated string
66
+ @function str-replace($string, $search, $replace: "") {
67
+ $index: str-index($string, $search);
68
+
69
+ @if $index {
70
+ @return str-slice($string, 1, $index - 1) + $replace + str-replace(str-slice($string, $index + str-length($search)), $search, $replace);
71
+ }
72
+
73
+ @return $string;
74
+ }
75
+
76
+ @mixin _assert-starts-at-zero($map) {
77
+ $values: map-values($map);
78
+ $first-value: nth($values, 1);
79
+ @if $first-value != 0 {
80
+ @warn "First breakpoint in `$grid-breakpoints` must start at 0, but starts at #{$first-value}.";
81
+ }
82
+ }
83
+
84
+
36
85
  // General variable structure
37
86
  //
38
87
  // Variable format should follow the `$component-modifier-state-property` order.
@@ -42,17 +91,31 @@
42
91
  //
43
92
  // Grayscale and brand colors for use across Bootstrap.
44
93
 
45
- $gray-dark: #373a3c !default;
46
- $gray: #55595c !default;
47
- $gray-light: #818a91 !default;
94
+ // Start with assigning color names to specific hex values.
95
+ $white: #fff !default;
96
+ $black: #000 !default;
97
+ $red: #d9534f !default;
98
+ $orange: #f0ad4e !default;
99
+ $yellow: #ffd500 !default;
100
+ $green: #5cb85c !default;
101
+ $blue: #0275d8 !default;
102
+ $teal: #5bc0de !default;
103
+ $pink: #ff5b77 !default;
104
+ $purple: #613d7c !default;
105
+
106
+ // Create grayscale
107
+ $gray-dark: #292b2c !default;
108
+ $gray: #464a4c !default;
109
+ $gray-light: #636c72 !default;
48
110
  $gray-lighter: #eceeef !default;
49
111
  $gray-lightest: #f7f7f9 !default;
50
112
 
51
- $brand-primary: #0275d8 !default;
52
- $brand-success: #5cb85c !default;
53
- $brand-info: #5bc0de !default;
54
- $brand-warning: #f0ad4e !default;
55
- $brand-danger: #d9534f !default;
113
+ // Reassign color vars to semantic color scheme
114
+ $brand-primary: $blue !default;
115
+ $brand-success: $green !default;
116
+ $brand-info: $teal !default;
117
+ $brand-warning: $orange !default;
118
+ $brand-danger: $red !default;
56
119
  $brand-inverse: $gray-dark !default;
57
120
 
58
121
 
@@ -60,11 +123,10 @@ $brand-inverse: $gray-dark !default;
60
123
  //
61
124
  // Quickly modify global styling by enabling or disabling optional features.
62
125
 
63
- $enable-flex: false !default;
64
126
  $enable-rounded: true !default;
65
127
  $enable-shadows: false !default;
66
128
  $enable-gradients: false !default;
67
- $enable-transitions: false !default;
129
+ $enable-transitions: true !default;
68
130
  $enable-hover-media-query: false !default;
69
131
  $enable-grid-classes: true !default;
70
132
  $enable-print-styles: true !default;
@@ -85,27 +147,44 @@ $spacers: (
85
147
  y: 0
86
148
  ),
87
149
  1: (
150
+ x: ($spacer-x * .25),
151
+ y: ($spacer-y * .25)
152
+ ),
153
+ 2: (
154
+ x: ($spacer-x * .5),
155
+ y: ($spacer-y * .5)
156
+ ),
157
+ 3: (
88
158
  x: $spacer-x,
89
159
  y: $spacer-y
90
160
  ),
91
- 2: (
161
+ 4: (
92
162
  x: ($spacer-x * 1.5),
93
163
  y: ($spacer-y * 1.5)
94
164
  ),
95
- 3: (
165
+ 5: (
96
166
  x: ($spacer-x * 3),
97
167
  y: ($spacer-y * 3)
98
168
  )
99
169
  ) !default;
100
170
  $border-width: 1px !default;
101
171
 
172
+ // This variable affects the `.h-*` and `.w-*` classes.
173
+ $sizes: (
174
+ 25: 25%,
175
+ 50: 50%,
176
+ 75: 75%,
177
+ 100: 100%
178
+ ) !default;
102
179
 
103
180
  // Body
104
181
  //
105
182
  // Settings for the `<body>` element.
106
183
 
107
- $body-bg: #fff !default;
108
- $body-color: $gray-dark !default;
184
+ $body-bg: $white !default;
185
+ $body-color: $gray-dark !default;
186
+ $inverse-bg: $gray-dark !default;
187
+ $inverse-color: $gray-lighter !default;
109
188
 
110
189
 
111
190
  // Links
@@ -131,6 +210,7 @@ $grid-breakpoints: (
131
210
  xl: 1200px
132
211
  ) !default;
133
212
  @include _assert-ascending($grid-breakpoints, "$grid-breakpoints");
213
+ @include _assert-starts-at-zero($grid-breakpoints);
134
214
 
135
215
 
136
216
  // Grid containers
@@ -160,23 +240,24 @@ $grid-gutter-widths: (
160
240
  xl: $grid-gutter-width-base
161
241
  ) !default;
162
242
 
163
- // Typography
243
+ // Fonts
164
244
  //
165
245
  // Font, line-height, and color for body text, headings, and more.
166
246
 
167
- $font-family-sans-serif: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif !default;
247
+ $font-family-sans-serif: -apple-system, system-ui, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif !default;
168
248
  $font-family-serif: Georgia, "Times New Roman", Times, serif !default;
169
249
  $font-family-monospace: Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace !default;
170
250
  $font-family-base: $font-family-sans-serif !default;
171
251
 
172
- // Pixel value used to responsively scale all typography. Applied to the `<html>` element.
173
- $font-size-root: 16px !default;
174
-
175
- $font-size-base: 1rem !default;
252
+ $font-size-base: 1rem !default; // Assumes the browser default, typically `16px`
176
253
  $font-size-lg: 1.25rem !default;
177
254
  $font-size-sm: .875rem !default;
178
255
  $font-size-xs: .75rem !default;
179
256
 
257
+ $font-weight-normal: normal !default;
258
+ $font-weight-bold: bold !default;
259
+
260
+ $font-weight-base: $font-weight-normal !default;
180
261
  $line-height-base: 1.5 !default;
181
262
 
182
263
  $font-size-h1: 2.5rem !default;
@@ -186,22 +267,23 @@ $font-size-h4: 1.5rem !default;
186
267
  $font-size-h5: 1.25rem !default;
187
268
  $font-size-h6: 1rem !default;
188
269
 
189
- $display1-size: 6rem !default;
190
- $display2-size: 5.5rem !default;
191
- $display3-size: 4.5rem !default;
192
- $display4-size: 3.5rem !default;
193
-
194
- $display1-weight: 300 !default;
195
- $display2-weight: 300 !default;
196
- $display3-weight: 300 !default;
197
- $display4-weight: 300 !default;
198
-
199
270
  $headings-margin-bottom: ($spacer / 2) !default;
200
271
  $headings-font-family: inherit !default;
201
272
  $headings-font-weight: 500 !default;
202
273
  $headings-line-height: 1.1 !default;
203
274
  $headings-color: inherit !default;
204
275
 
276
+ $display1-size: 6rem !default;
277
+ $display2-size: 5.5rem !default;
278
+ $display3-size: 4.5rem !default;
279
+ $display4-size: 3.5rem !default;
280
+
281
+ $display1-weight: 300 !default;
282
+ $display2-weight: 300 !default;
283
+ $display3-weight: 300 !default;
284
+ $display4-weight: 300 !default;
285
+ $display-line-height: $headings-line-height !default;
286
+
205
287
  $lead-font-size: 1.25rem !default;
206
288
  $lead-font-weight: 300 !default;
207
289
 
@@ -216,15 +298,15 @@ $blockquote-font-size: ($font-size-base * 1.25) !default;
216
298
  $blockquote-border-color: $gray-lighter !default;
217
299
  $blockquote-border-width: .25rem !default;
218
300
 
219
- $hr-border-color: rgba(0,0,0,.1) !default;
301
+ $hr-border-color: rgba($black,.1) !default;
220
302
  $hr-border-width: $border-width !default;
221
303
 
222
304
  $mark-padding: .2em !default;
223
305
 
224
- $dt-font-weight: bold !default;
306
+ $dt-font-weight: $font-weight-bold !default;
225
307
 
226
- $kbd-box-shadow: inset 0 -.1rem 0 rgba(0,0,0,.25) !default;
227
- $nested-kbd-font-weight: bold !default;
308
+ $kbd-box-shadow: inset 0 -.1rem 0 rgba($black,.25) !default;
309
+ $nested-kbd-font-weight: $font-weight-bold !default;
228
310
 
229
311
  $list-inline-padding: 5px !default;
230
312
 
@@ -240,11 +322,14 @@ $border-radius: .25rem !default;
240
322
  $border-radius-lg: .3rem !default;
241
323
  $border-radius-sm: .2rem !default;
242
324
 
243
- $component-active-color: #fff !default;
325
+ $component-active-color: $white !default;
244
326
  $component-active-bg: $brand-primary !default;
245
327
 
246
328
  $caret-width: .3em !default;
247
- $caret-width-lg: $caret-width !default;
329
+
330
+ $transition-base: all .2s ease-in-out !default;
331
+ $transition-fade: opacity .15s linear !default;
332
+ $transition-collapse: height .35s ease !default;
248
333
 
249
334
 
250
335
  // Tables
@@ -255,10 +340,17 @@ $table-cell-padding: .75rem !default;
255
340
  $table-sm-cell-padding: .3rem !default;
256
341
 
257
342
  $table-bg: transparent !default;
258
- $table-bg-accent: rgba(0,0,0,.05) !default;
259
- $table-bg-hover: rgba(0,0,0,.075) !default;
343
+
344
+ $table-inverse-bg: $gray-dark !default;
345
+ $table-inverse-color: $body-bg !default;
346
+
347
+ $table-bg-accent: rgba($black,.05) !default;
348
+ $table-bg-hover: rgba($black,.075) !default;
260
349
  $table-bg-active: $table-bg-hover !default;
261
350
 
351
+ $table-head-bg: $gray-lighter !default;
352
+ $table-head-color: $gray !default;
353
+
262
354
  $table-border-width: $border-width !default;
263
355
  $table-border-color: $gray-lighter !default;
264
356
 
@@ -270,31 +362,32 @@ $table-border-color: $gray-lighter !default;
270
362
  $btn-padding-x: 1rem !default;
271
363
  $btn-padding-y: .5rem !default;
272
364
  $btn-line-height: 1.25 !default;
273
- $btn-font-weight: normal !default;
274
- $btn-box-shadow: inset 0 1px 0 rgba(255,255,255,.15), 0 1px 1px rgba(0,0,0,.075) !default;
275
- $btn-active-box-shadow: inset 0 3px 5px rgba(0,0,0,.125) !default;
365
+ $btn-font-weight: $font-weight-normal !default;
366
+ $btn-box-shadow: inset 0 1px 0 rgba($white,.15), 0 1px 1px rgba($black,.075) !default;
367
+ $btn-focus-box-shadow: 0 0 0 2px rgba($brand-primary, .25) !default;
368
+ $btn-active-box-shadow: inset 0 3px 5px rgba($black,.125) !default;
276
369
 
277
- $btn-primary-color: #fff !default;
370
+ $btn-primary-color: $white !default;
278
371
  $btn-primary-bg: $brand-primary !default;
279
372
  $btn-primary-border: $btn-primary-bg !default;
280
373
 
281
374
  $btn-secondary-color: $gray-dark !default;
282
- $btn-secondary-bg: #fff !default;
375
+ $btn-secondary-bg: $white !default;
283
376
  $btn-secondary-border: #ccc !default;
284
377
 
285
- $btn-info-color: #fff !default;
378
+ $btn-info-color: $white !default;
286
379
  $btn-info-bg: $brand-info !default;
287
380
  $btn-info-border: $btn-info-bg !default;
288
381
 
289
- $btn-success-color: #fff !default;
382
+ $btn-success-color: $white !default;
290
383
  $btn-success-bg: $brand-success !default;
291
384
  $btn-success-border: $btn-success-bg !default;
292
385
 
293
- $btn-warning-color: #fff !default;
386
+ $btn-warning-color: $white !default;
294
387
  $btn-warning-bg: $brand-warning !default;
295
388
  $btn-warning-border: $btn-warning-bg !default;
296
389
 
297
- $btn-danger-color: #fff !default;
390
+ $btn-danger-color: $white !default;
298
391
  $btn-danger-bg: $brand-danger !default;
299
392
  $btn-danger-border: $btn-danger-bg !default;
300
393
 
@@ -314,6 +407,8 @@ $btn-border-radius: $border-radius !default;
314
407
  $btn-border-radius-lg: $border-radius-lg !default;
315
408
  $btn-border-radius-sm: $border-radius-sm !default;
316
409
 
410
+ $btn-transition: all .2s ease-in-out !default;
411
+
317
412
 
318
413
  // Forms
319
414
 
@@ -321,24 +416,24 @@ $input-padding-x: .75rem !default;
321
416
  $input-padding-y: .5rem !default;
322
417
  $input-line-height: 1.25 !default;
323
418
 
324
- $input-bg: #fff !default;
419
+ $input-bg: $white !default;
325
420
  $input-bg-disabled: $gray-lighter !default;
326
421
 
327
422
  $input-color: $gray !default;
328
- $input-border-color: rgba(0,0,0,.15) !default;
423
+ $input-border-color: rgba($black,.15) !default;
329
424
  $input-btn-border-width: $border-width !default; // For form controls and buttons
330
- $input-box-shadow: inset 0 1px 1px rgba(0,0,0,.075) !default;
425
+ $input-box-shadow: inset 0 1px 1px rgba($black,.075) !default;
331
426
 
332
427
  $input-border-radius: $border-radius !default;
333
428
  $input-border-radius-lg: $border-radius-lg !default;
334
429
  $input-border-radius-sm: $border-radius-sm !default;
335
430
 
336
431
  $input-bg-focus: $input-bg !default;
337
- $input-border-focus: #66afe9 !default;
338
- $input-box-shadow-focus: $input-box-shadow, 0 0 8px rgba(102,175,233,.6) !default;
432
+ $input-border-focus: lighten($brand-primary, 25%) !default;
433
+ $input-box-shadow-focus: $input-box-shadow, rgba($input-border-focus, .6) !default;
339
434
  $input-color-focus: $input-color !default;
340
435
 
341
- $input-color-placeholder: #999 !default;
436
+ $input-color-placeholder: $gray-light !default;
342
437
 
343
438
  $input-padding-x-sm: .5rem !default;
344
439
  $input-padding-y-sm: .25rem !default;
@@ -346,10 +441,22 @@ $input-padding-y-sm: .25rem !default;
346
441
  $input-padding-x-lg: 1.5rem !default;
347
442
  $input-padding-y-lg: .75rem !default;
348
443
 
349
- $input-height: (($font-size-base * $line-height-base) + ($input-padding-y * 2)) !default;
444
+ $input-height: (($font-size-base * $input-line-height) + ($input-padding-y * 2)) !default;
350
445
  $input-height-lg: (($font-size-lg * $line-height-lg) + ($input-padding-y-lg * 2)) !default;
351
446
  $input-height-sm: (($font-size-sm * $line-height-sm) + ($input-padding-y-sm * 2)) !default;
352
447
 
448
+ $input-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s !default;
449
+
450
+ $form-text-margin-top: .25rem !default;
451
+ $form-feedback-margin-top: $form-text-margin-top !default;
452
+
453
+ $form-check-margin-bottom: .5rem !default;
454
+ $form-check-input-gutter: 1.25rem !default;
455
+ $form-check-input-margin-y: .25rem !default;
456
+ $form-check-input-margin-x: .25rem !default;
457
+
458
+ $form-check-inline-margin-x: .75rem !default;
459
+
353
460
  $form-group-margin-bottom: $spacer-y !default;
354
461
 
355
462
  $input-group-addon-bg: $gray-lighter !default;
@@ -362,70 +469,72 @@ $custom-control-spacer-x: 1rem !default;
362
469
  $custom-control-spacer-y: .25rem !default;
363
470
 
364
471
  $custom-control-indicator-size: 1rem !default;
472
+ $custom-control-indicator-margin-y: (($line-height-base * 1rem) - $custom-control-indicator-size) / -2 !default;
365
473
  $custom-control-indicator-bg: #ddd !default;
366
474
  $custom-control-indicator-bg-size: 50% 50% !default;
367
- $custom-control-indicator-box-shadow: inset 0 .25rem .25rem rgba(0,0,0,.1) !default;
475
+ $custom-control-indicator-box-shadow: inset 0 .25rem .25rem rgba($black,.1) !default;
368
476
 
369
477
  $custom-control-disabled-cursor: $cursor-disabled !default;
370
- $custom-control-disabled-indicator-bg: #eee !default;
371
- $custom-control-disabled-description-color: #767676 !default;
478
+ $custom-control-disabled-indicator-bg: $gray-lighter !default;
479
+ $custom-control-disabled-description-color: $gray-light !default;
372
480
 
373
- $custom-control-checked-indicator-color: #fff !default;
374
- $custom-control-checked-indicator-bg: #0074d9 !default;
481
+ $custom-control-checked-indicator-color: $white !default;
482
+ $custom-control-checked-indicator-bg: $brand-primary !default;
375
483
  $custom-control-checked-indicator-box-shadow: none !default;
376
484
 
377
- $custom-control-focus-indicator-box-shadow: 0 0 0 .075rem #fff, 0 0 0 .2rem #0074d9 !default;
485
+ $custom-control-focus-indicator-box-shadow: 0 0 0 1px $body-bg, 0 0 0 3px $brand-primary !default;
378
486
 
379
- $custom-control-active-indicator-color: #fff !default;
380
- $custom-control-active-indicator-bg: #84c6ff !default;
487
+ $custom-control-active-indicator-color: $white !default;
488
+ $custom-control-active-indicator-bg: lighten($brand-primary, 35%) !default;
381
489
  $custom-control-active-indicator-box-shadow: none !default;
382
490
 
383
491
  $custom-checkbox-radius: $border-radius !default;
384
- $custom-checkbox-checked-icon: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 8 8'%3E%3Cpath fill='#{$custom-control-checked-indicator-color}' d='M6.564.75l-3.59 3.612-1.538-1.55L0 4.26 2.974 7.25 8 2.193z'/%3E%3C/svg%3E") !default;
492
+ $custom-checkbox-checked-icon: str-replace(url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 8 8'%3E%3Cpath fill='#{$custom-control-checked-indicator-color}' d='M6.564.75l-3.59 3.612-1.538-1.55L0 4.26 2.974 7.25 8 2.193z'/%3E%3C/svg%3E"), "#", "%23") !default;
385
493
 
386
- $custom-checkbox-indeterminate-bg: #0074d9 !default;
494
+ $custom-checkbox-indeterminate-bg: $brand-primary !default;
387
495
  $custom-checkbox-indeterminate-indicator-color: $custom-control-checked-indicator-color !default;
388
- $custom-checkbox-indeterminate-icon: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 4 4'%3E%3Cpath stroke='#{$custom-checkbox-indeterminate-indicator-color}' d='M0 2h4'/%3E%3C/svg%3E") !default;
496
+ $custom-checkbox-indeterminate-icon: str-replace(url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 4 4'%3E%3Cpath stroke='#{$custom-checkbox-indeterminate-indicator-color}' d='M0 2h4'/%3E%3C/svg%3E"), "#", "%23") !default;
389
497
  $custom-checkbox-indeterminate-box-shadow: none !default;
390
498
 
391
499
  $custom-radio-radius: 50% !default;
392
- $custom-radio-checked-icon: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='-4 -4 8 8'%3E%3Ccircle r='3' fill='#{$custom-control-checked-indicator-color}'/%3E%3C/svg%3E") !default;
500
+ $custom-radio-checked-icon: str-replace(url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='-4 -4 8 8'%3E%3Ccircle r='3' fill='#{$custom-control-checked-indicator-color}'/%3E%3C/svg%3E"), "#", "%23") !default;
393
501
 
394
502
  $custom-select-padding-x: .75rem !default;
395
503
  $custom-select-padding-y: .375rem !default;
396
- $custom-select-indicator-padding: 1rem !default; // Extra padding to account for the presence of the background-image based indicator
397
- $custom-select-color: $input-color !default;
398
- $custom-select-disabled-color: $gray-light !default;
399
- $custom-select-bg: #fff !default;
504
+ $custom-select-indicator-padding: 1rem !default; // Extra padding to account for the presence of the background-image based indicator
505
+ $custom-select-line-height: $input-line-height !default;
506
+ $custom-select-color: $input-color !default;
507
+ $custom-select-disabled-color: $gray-light !default;
508
+ $custom-select-bg: $white !default;
400
509
  $custom-select-disabled-bg: $gray-lighter !default;
401
510
  $custom-select-bg-size: 8px 10px !default; // In pixels because image dimensions
402
511
  $custom-select-indicator-color: #333 !default;
403
- $custom-select-indicator: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 4 5'%3E%3Cpath fill='#{$custom-select-indicator-color}' d='M2 0L0 2h4zm0 5L0 3h4z'/%3E%3C/svg%3E") !default;
512
+ $custom-select-indicator: str-replace(url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 4 5'%3E%3Cpath fill='#{$custom-select-indicator-color}' d='M2 0L0 2h4zm0 5L0 3h4z'/%3E%3C/svg%3E"), "#", "%23") !default;
404
513
  $custom-select-border-width: $input-btn-border-width !default;
405
514
  $custom-select-border-color: $input-border-color !default;
406
515
  $custom-select-border-radius: $border-radius !default;
407
516
 
408
- $custom-select-focus-border-color: #51a7e8 !default;
409
- $custom-select-focus-box-shadow: inset 0 1px 2px rgba(0, 0, 0, .075), 0 0 5px rgba(81, 167, 232, .5) !default;
517
+ $custom-select-focus-border-color: lighten($brand-primary, 25%) !default;
518
+ $custom-select-focus-box-shadow: inset 0 1px 2px rgba($black, .075), 0 0 5px rgba($custom-select-focus-border-color, .5) !default;
410
519
 
411
- $custom-select-sm-padding-y: .2rem !default;
412
- $custom-select-sm-font-size: 75% !default;
520
+ $custom-select-sm-padding-y: .2rem !default;
521
+ $custom-select-sm-font-size: 75% !default;
413
522
 
414
523
  $custom-file-height: 2.5rem !default;
415
524
  $custom-file-width: 14rem !default;
416
- $custom-file-focus-box-shadow: 0 0 0 .075rem #fff, 0 0 0 .2rem #0074d9 !default;
525
+ $custom-file-focus-box-shadow: 0 0 0 .075rem $white, 0 0 0 .2rem $brand-primary !default;
417
526
 
418
527
  $custom-file-padding-x: .5rem !default;
419
528
  $custom-file-padding-y: 1rem !default;
420
529
  $custom-file-line-height: 1.5 !default;
421
- $custom-file-color: #555 !default;
422
- $custom-file-bg: #fff !default;
530
+ $custom-file-color: $gray !default;
531
+ $custom-file-bg: $white !default;
423
532
  $custom-file-border-width: $border-width !default;
424
- $custom-file-border-color: #ddd !default;
533
+ $custom-file-border-color: $input-border-color !default;
425
534
  $custom-file-border-radius: $border-radius !default;
426
- $custom-file-box-shadow: inset 0 .2rem .4rem rgba(0,0,0,.05) !default;
535
+ $custom-file-box-shadow: inset 0 .2rem .4rem rgba($black,.05) !default;
427
536
  $custom-file-button-color: $custom-file-color !default;
428
- $custom-file-button-bg: #eee !default;
537
+ $custom-file-button-bg: $gray-lighter !default;
429
538
  $custom-file-text: (
430
539
  placeholder: (
431
540
  en: "Choose file..."
@@ -438,13 +547,13 @@ $custom-file-text: (
438
547
 
439
548
  // Form validation icons
440
549
  $form-icon-success-color: $brand-success !default;
441
- $form-icon-success: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 8 8'%3E%3Cpath fill='#{$form-icon-success-color}' d='M2.3 6.73L.6 4.53c-.4-1.04.46-1.4 1.1-.8l1.1 1.4 3.4-3.8c.6-.63 1.6-.27 1.2.7l-4 4.6c-.43.5-.8.4-1.1.1z'/%3E%3C/svg%3E") !default;
550
+ $form-icon-success: str-replace(url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 8 8'%3E%3Cpath fill='#{$form-icon-success-color}' d='M2.3 6.73L.6 4.53c-.4-1.04.46-1.4 1.1-.8l1.1 1.4 3.4-3.8c.6-.63 1.6-.27 1.2.7l-4 4.6c-.43.5-.8.4-1.1.1z'/%3E%3C/svg%3E"), "#", "%23") !default;
442
551
 
443
552
  $form-icon-warning-color: $brand-warning !default;
444
- $form-icon-warning: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 8 8'%3E%3Cpath fill='#{$form-icon-warning-color}' d='M4.4 5.324h-.8v-2.46h.8zm0 1.42h-.8V5.89h.8zM3.76.63L.04 7.075c-.115.2.016.425.26.426h7.397c.242 0 .372-.226.258-.426C6.726 4.924 5.47 2.79 4.253.63c-.113-.174-.39-.174-.494 0z'/%3E%3C/svg%3E") !default;
553
+ $form-icon-warning: str-replace(url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 8 8'%3E%3Cpath fill='#{$form-icon-warning-color}' d='M4.4 5.324h-.8v-2.46h.8zm0 1.42h-.8V5.89h.8zM3.76.63L.04 7.075c-.115.2.016.425.26.426h7.397c.242 0 .372-.226.258-.426C6.726 4.924 5.47 2.79 4.253.63c-.113-.174-.39-.174-.494 0z'/%3E%3C/svg%3E"), "#", "%23") !default;
445
554
 
446
555
  $form-icon-danger-color: $brand-danger !default;
447
- $form-icon-danger: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' fill='#{$form-icon-danger-color}' viewBox='-2 -2 7 7'%3E%3Cpath stroke='%23d9534f' d='M0 0l3 3m0-3L0 3'/%3E%3Ccircle r='.5'/%3E%3Ccircle cx='3' r='.5'/%3E%3Ccircle cy='3' r='.5'/%3E%3Ccircle cx='3' cy='3' r='.5'/%3E%3C/svg%3E") !default;
556
+ $form-icon-danger: str-replace(url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' fill='#{$form-icon-danger-color}' viewBox='-2 -2 7 7'%3E%3Cpath stroke='%23d9534f' d='M0 0l3 3m0-3L0 3'/%3E%3Ccircle r='.5'/%3E%3Ccircle cx='3' r='.5'/%3E%3Ccircle cy='3' r='.5'/%3E%3Ccircle cx='3' cy='3' r='.5'/%3E%3C/svg%3E"), "#", "%23") !default;
448
557
 
449
558
 
450
559
  // Dropdowns
@@ -454,15 +563,15 @@ $form-icon-danger: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www
454
563
  $dropdown-min-width: 10rem !default;
455
564
  $dropdown-padding-y: .5rem !default;
456
565
  $dropdown-margin-top: .125rem !default;
457
- $dropdown-bg: #fff !default;
458
- $dropdown-border-color: rgba(0,0,0,.15) !default;
566
+ $dropdown-bg: $white !default;
567
+ $dropdown-border-color: rgba($black,.15) !default;
459
568
  $dropdown-border-width: $border-width !default;
460
- $dropdown-divider-bg: #e5e5e5 !default;
461
- $dropdown-box-shadow: 0 .5rem 1rem rgba(0,0,0,.175) !default;
569
+ $dropdown-divider-bg: $gray-lighter !default;
570
+ $dropdown-box-shadow: 0 .5rem 1rem rgba($black,.175) !default;
462
571
 
463
572
  $dropdown-link-color: $gray-dark !default;
464
573
  $dropdown-link-hover-color: darken($gray-dark, 5%) !default;
465
- $dropdown-link-hover-bg: #f5f5f5 !default;
574
+ $dropdown-link-hover-bg: $gray-lightest !default;
466
575
 
467
576
  $dropdown-link-active-color: $component-active-color !default;
468
577
  $dropdown-link-active-bg: $component-active-bg !default;
@@ -480,14 +589,14 @@ $dropdown-header-color: $gray-light !default;
480
589
  // of components dependent on the z-axis and are designed to all work together.
481
590
 
482
591
  $zindex-dropdown-backdrop: 990 !default;
483
- $zindex-navbar: 1000 !default;
484
- $zindex-dropdown: 1000 !default;
485
- $zindex-popover: 1060 !default;
486
- $zindex-tooltip: 1070 !default;
487
- $zindex-navbar-fixed: 1030 !default;
488
- $zindex-navbar-sticky: 1030 !default;
489
- $zindex-modal-bg: 1040 !default;
490
- $zindex-modal: 1050 !default;
592
+ $zindex-navbar: 1000 !default;
593
+ $zindex-dropdown: 1000 !default;
594
+ $zindex-fixed: 1030 !default;
595
+ $zindex-sticky: 1030 !default;
596
+ $zindex-modal-backdrop: 1040 !default;
597
+ $zindex-modal: 1050 !default;
598
+ $zindex-popover: 1060 !default;
599
+ $zindex-tooltip: 1070 !default;
491
600
 
492
601
 
493
602
  // Navbar
@@ -498,28 +607,24 @@ $navbar-padding-y: ($spacer / 2) !default;
498
607
 
499
608
  $navbar-brand-padding-y: .25rem !default;
500
609
 
501
- $navbar-divider-padding-y: .425rem !default;
502
-
503
610
  $navbar-toggler-padding-x: .75rem !default;
504
- $navbar-toggler-padding-y: .5rem !default;
611
+ $navbar-toggler-padding-y: .25rem !default;
505
612
  $navbar-toggler-font-size: $font-size-lg !default;
506
613
  $navbar-toggler-border-radius: $btn-border-radius !default;
507
- $navbar-toggler-padding-x: .75rem !default;
508
- $navbar-toggler-padding-y: .5rem !default;
509
-
510
- $navbar-dark-color: rgba(255,255,255,.5) !default;
511
- $navbar-dark-hover-color: rgba(255,255,255,.75) !default;
512
- $navbar-dark-active-color: rgba(255,255,255,1) !default;
513
- $navbar-dark-disabled-color: rgba(255,255,255,.25) !default;
514
- $navbar-dark-toggler-bg: url("data:image/svg+xml;charset=utf8,%3Csvg viewBox='0 0 32 32' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath stroke='#{$navbar-dark-color}' stroke-width='2' stroke-linecap='round' stroke-miterlimit='10' d='M4 8h24M4 16h24M4 24h24'/%3E%3C/svg%3E") !default;
515
- $navbar-dark-toggler-border: rgba(255,255,255,.1) !default;
516
-
517
- $navbar-light-color: rgba(0,0,0,.5) !default;
518
- $navbar-light-hover-color: rgba(0,0,0,.7) !default;
519
- $navbar-light-active-color: rgba(0,0,0,.9) !default;
520
- $navbar-light-disabled-color: rgba(0,0,0,.3) !default;
521
- $navbar-light-toggler-bg: url("data:image/svg+xml;charset=utf8,%3Csvg viewBox='0 0 32 32' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath stroke='#{$navbar-light-color}' stroke-width='2' stroke-linecap='round' stroke-miterlimit='10' d='M4 8h24M4 16h24M4 24h24'/%3E%3C/svg%3E") !default;
522
- $navbar-light-toggler-border: rgba(0,0,0,.1) !default;
614
+
615
+ $navbar-inverse-color: rgba($white,.5) !default;
616
+ $navbar-inverse-hover-color: rgba($white,.75) !default;
617
+ $navbar-inverse-active-color: rgba($white,1) !default;
618
+ $navbar-inverse-disabled-color: rgba($white,.25) !default;
619
+ $navbar-inverse-toggler-bg: str-replace(url("data:image/svg+xml;charset=utf8,%3Csvg viewBox='0 0 32 32' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath stroke='#{$navbar-inverse-color}' stroke-width='2' stroke-linecap='round' stroke-miterlimit='10' d='M4 8h24M4 16h24M4 24h24'/%3E%3C/svg%3E"), "#", "%23") !default;
620
+ $navbar-inverse-toggler-border: rgba($white,.1) !default;
621
+
622
+ $navbar-light-color: rgba($black,.5) !default;
623
+ $navbar-light-hover-color: rgba($black,.7) !default;
624
+ $navbar-light-active-color: rgba($black,.9) !default;
625
+ $navbar-light-disabled-color: rgba($black,.3) !default;
626
+ $navbar-light-toggler-bg: str-replace(url("data:image/svg+xml;charset=utf8,%3Csvg viewBox='0 0 32 32' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath stroke='#{$navbar-light-color}' stroke-width='2' stroke-linecap='round' stroke-miterlimit='10' d='M4 8h24M4 16h24M4 24h24'/%3E%3C/svg%3E"), "#", "%23") !default;
627
+ $navbar-light-toggler-border: rgba($black,.1) !default;
523
628
 
524
629
  // Navs
525
630
 
@@ -528,8 +633,6 @@ $nav-item-inline-spacer: 1rem !default;
528
633
  $nav-link-padding: .5em 1em !default;
529
634
  $nav-link-hover-bg: $gray-lighter !default;
530
635
  $nav-disabled-link-color: $gray-light !default;
531
- $nav-disabled-link-hover-color: $gray-light !default;
532
- $nav-disabled-link-hover-bg: transparent !default;
533
636
 
534
637
  $nav-tabs-border-color: #ddd !default;
535
638
  $nav-tabs-border-width: $border-width !default;
@@ -550,14 +653,14 @@ $nav-pills-active-link-bg: $component-active-bg !default;
550
653
 
551
654
  $pagination-padding-x: .75rem !default;
552
655
  $pagination-padding-y: .5rem !default;
553
- $pagination-padding-x-sm: .75rem !default;
554
- $pagination-padding-y-sm: .275rem !default;
656
+ $pagination-padding-x-sm: .5rem !default;
657
+ $pagination-padding-y-sm: .25rem !default;
555
658
  $pagination-padding-x-lg: 1.5rem !default;
556
659
  $pagination-padding-y-lg: .75rem !default;
557
-
660
+ $pagination-line-height: 1.25 !default;
558
661
 
559
662
  $pagination-color: $link-color !default;
560
- $pagination-bg: #fff !default;
663
+ $pagination-bg: $white !default;
561
664
  $pagination-border-width: $border-width !default;
562
665
  $pagination-border-color: #ddd !default;
563
666
 
@@ -565,12 +668,12 @@ $pagination-hover-color: $link-hover-color !default;
565
668
  $pagination-hover-bg: $gray-lighter !default;
566
669
  $pagination-hover-border: #ddd !default;
567
670
 
568
- $pagination-active-color: #fff !default;
671
+ $pagination-active-color: $white !default;
569
672
  $pagination-active-bg: $brand-primary !default;
570
673
  $pagination-active-border: $brand-primary !default;
571
674
 
572
675
  $pagination-disabled-color: $gray-light !default;
573
- $pagination-disabled-bg: #fff !default;
676
+ $pagination-disabled-bg: $white !default;
574
677
  $pagination-disabled-border: #ddd !default;
575
678
 
576
679
 
@@ -603,29 +706,32 @@ $state-danger-border: darken($state-danger-bg, 5%) !default;
603
706
 
604
707
 
605
708
  // Cards
709
+
606
710
  $card-spacer-x: 1.25rem !default;
607
711
  $card-spacer-y: .75rem !default;
608
712
  $card-border-width: 1px !default;
609
713
  $card-border-radius: $border-radius !default;
610
- $card-border-color: rgba(0,0,0,.125) !default;
714
+ $card-border-color: rgba($black,.125) !default;
611
715
  $card-border-radius-inner: calc(#{$card-border-radius} - #{$card-border-width}) !default;
612
- $card-cap-bg: #f5f5f5 !default;
613
- $card-bg: #fff !default;
716
+ $card-cap-bg: $gray-lightest !default;
717
+ $card-bg: $white !default;
614
718
 
615
- $card-link-hover-color: #fff !default;
719
+ $card-link-hover-color: $white !default;
616
720
 
617
721
  $card-img-overlay-padding: 1.25rem !default;
618
722
 
619
- $card-deck-margin: .625rem !default;
723
+ $card-deck-margin: ($grid-gutter-width-base / 2) !default;
620
724
 
621
- $card-columns-sm-up-column-gap: 1.25rem !default;
725
+ $card-columns-count: 3 !default;
726
+ $card-columns-gap: 1.25rem !default;
727
+ $card-columns-margin: $card-spacer-y !default;
622
728
 
623
729
 
624
730
  // Tooltips
625
731
 
626
732
  $tooltip-max-width: 200px !default;
627
- $tooltip-color: #fff !default;
628
- $tooltip-bg: #000 !default;
733
+ $tooltip-color: $white !default;
734
+ $tooltip-bg: $black !default;
629
735
  $tooltip-opacity: .9 !default;
630
736
  $tooltip-padding-y: 3px !default;
631
737
  $tooltip-padding-x: 8px !default;
@@ -638,11 +744,11 @@ $tooltip-arrow-color: $tooltip-bg !default;
638
744
  // Popovers
639
745
 
640
746
  $popover-inner-padding: 1px !default;
641
- $popover-bg: #fff !default;
747
+ $popover-bg: $white !default;
642
748
  $popover-max-width: 276px !default;
643
749
  $popover-border-width: $border-width !default;
644
- $popover-border-color: rgba(0,0,0,.2) !default;
645
- $popover-box-shadow: 0 5px 10px rgba(0,0,0,.2) !default;
750
+ $popover-border-color: rgba($black,.2) !default;
751
+ $popover-box-shadow: 0 5px 10px rgba($black,.2) !default;
646
752
 
647
753
  $popover-title-bg: darken($popover-bg, 3%) !default;
648
754
  $popover-title-padding-x: 14px !default;
@@ -658,26 +764,27 @@ $popover-arrow-outer-width: ($popover-arrow-width + 1px) !default;
658
764
  $popover-arrow-outer-color: fade-in($popover-border-color, .05) !default;
659
765
 
660
766
 
661
- // Tags
767
+ // Badges
662
768
 
663
- $tag-default-bg: $gray-light !default;
664
- $tag-primary-bg: $brand-primary !default;
665
- $tag-success-bg: $brand-success !default;
666
- $tag-info-bg: $brand-info !default;
667
- $tag-warning-bg: $brand-warning !default;
668
- $tag-danger-bg: $brand-danger !default;
769
+ $badge-default-bg: $gray-light !default;
770
+ $badge-primary-bg: $brand-primary !default;
771
+ $badge-success-bg: $brand-success !default;
772
+ $badge-info-bg: $brand-info !default;
773
+ $badge-warning-bg: $brand-warning !default;
774
+ $badge-danger-bg: $brand-danger !default;
669
775
 
670
- $tag-color: #fff !default;
671
- $tag-link-hover-color: #fff !default;
672
- $tag-font-size: 75% !default;
673
- $tag-font-weight: bold !default;
674
- $tag-padding-x: .4em !default;
675
- $tag-padding-y: .25em !default;
776
+ $badge-color: $white !default;
777
+ $badge-link-hover-color: $white !default;
778
+ $badge-font-size: 75% !default;
779
+ $badge-font-weight: $font-weight-bold !default;
780
+ $badge-padding-x: .4em !default;
781
+ $badge-padding-y: .25em !default;
676
782
 
677
- $tag-pill-padding-x: .6em !default;
783
+ $badge-pill-padding-x: .6em !default;
678
784
  // Use a higher than normal value to ensure completely rounded edges when
679
785
  // customizing padding or font-size on labels.
680
- $tag-pill-border-radius: 10rem !default;
786
+ $badge-pill-border-radius: 10rem !default;
787
+
681
788
 
682
789
  // Modals
683
790
 
@@ -687,26 +794,28 @@ $modal-inner-padding: 15px !default;
687
794
  $modal-dialog-margin: 10px !default;
688
795
  $modal-dialog-sm-up-margin-y: 30px !default;
689
796
 
690
- $modal-title-padding: 15px !default;
691
797
  $modal-title-line-height: $line-height-base !default;
692
798
 
693
- $modal-content-bg: #fff !default;
694
- $modal-content-border-color: rgba(0,0,0,.2) !default;
799
+ $modal-content-bg: $white !default;
800
+ $modal-content-border-color: rgba($black,.2) !default;
695
801
  $modal-content-border-width: $border-width !default;
696
- $modal-content-xs-box-shadow: 0 3px 9px rgba(0,0,0,.5) !default;
697
- $modal-content-sm-up-box-shadow: 0 5px 15px rgba(0,0,0,.5) !default;
802
+ $modal-content-xs-box-shadow: 0 3px 9px rgba($black,.5) !default;
803
+ $modal-content-sm-up-box-shadow: 0 5px 15px rgba($black,.5) !default;
698
804
 
699
- $modal-backdrop-bg: #000 !default;
805
+ $modal-backdrop-bg: $black !default;
700
806
  $modal-backdrop-opacity: .5 !default;
701
- $modal-header-border-color: #e5e5e5 !default;
807
+ $modal-header-border-color: $gray-lighter !default;
702
808
  $modal-footer-border-color: $modal-header-border-color !default;
703
809
  $modal-header-border-width: $modal-content-border-width !default;
704
810
  $modal-footer-border-width: $modal-header-border-width !default;
811
+ $modal-header-padding: 15px !default;
705
812
 
706
- $modal-lg: 900px !default;
707
- $modal-md: 600px !default;
813
+ $modal-lg: 800px !default;
814
+ $modal-md: 500px !default;
708
815
  $modal-sm: 300px !default;
709
816
 
817
+ $modal-transition: transform .3s ease-out !default;
818
+
710
819
 
711
820
  // Alerts
712
821
  //
@@ -714,8 +823,9 @@ $modal-sm: 300px !default;
714
823
 
715
824
  $alert-padding-x: 1.25rem !default;
716
825
  $alert-padding-y: .75rem !default;
826
+ $alert-margin-bottom: $spacer-y !default;
717
827
  $alert-border-radius: $border-radius !default;
718
- $alert-link-font-weight: bold !default;
828
+ $alert-link-font-weight: $font-weight-bold !default;
719
829
  $alert-border-width: $border-width !default;
720
830
 
721
831
  $alert-success-bg: $state-success-bg !default;
@@ -737,42 +847,42 @@ $alert-danger-border: $state-danger-border !default;
737
847
 
738
848
  // Progress bars
739
849
 
740
- $progress-bg: #eee !default;
741
- $progress-bar-color: #0074d9 !default;
742
- $progress-border-radius: $border-radius !default;
743
- $progress-box-shadow: inset 0 .1rem .1rem rgba(0,0,0,.1) !default;
744
-
745
- $progress-bar-bg: $brand-primary !default;
746
- $progress-bar-success-bg: $brand-success !default;
747
- $progress-bar-warning-bg: $brand-warning !default;
748
- $progress-bar-danger-bg: $brand-danger !default;
749
- $progress-bar-info-bg: $brand-info !default;
750
-
850
+ $progress-height: 1rem !default;
851
+ $progress-font-size: .75rem !default;
852
+ $progress-bg: $gray-lighter !default;
853
+ $progress-border-radius: $border-radius !default;
854
+ $progress-box-shadow: inset 0 .1rem .1rem rgba($black,.1) !default;
855
+ $progress-bar-color: $white !default;
856
+ $progress-bar-bg: $brand-primary !default;
857
+ $progress-bar-animation-timing: 1s linear infinite !default;
751
858
 
752
859
  // List group
753
860
 
754
- $list-group-bg: #fff !default;
755
- $list-group-border-color: #ddd !default;
756
- $list-group-border-width: $border-width !default;
757
- $list-group-border-radius: $border-radius !default;
861
+ $list-group-color: $body-color !default;
862
+ $list-group-bg: $white !default;
863
+ $list-group-border-color: rgba($black,.125) !default;
864
+ $list-group-border-width: $border-width !default;
865
+ $list-group-border-radius: $border-radius !default;
866
+
867
+ $list-group-item-padding-x: 1.25rem !default;
868
+ $list-group-item-padding-y: .75rem !default;
758
869
 
759
- $list-group-hover-bg: #f5f5f5 !default;
760
- $list-group-active-color: $component-active-color !default;
761
- $list-group-active-bg: $component-active-bg !default;
762
- $list-group-active-border: $list-group-active-bg !default;
763
- $list-group-active-text-color: lighten($list-group-active-bg, 40%) !default;
870
+ $list-group-hover-bg: $gray-lightest !default;
871
+ $list-group-active-color: $component-active-color !default;
872
+ $list-group-active-bg: $component-active-bg !default;
873
+ $list-group-active-border: $list-group-active-bg !default;
874
+ $list-group-active-text-color: lighten($list-group-active-bg, 50%) !default;
764
875
 
765
876
  $list-group-disabled-color: $gray-light !default;
766
- $list-group-disabled-bg: $gray-lighter !default;
877
+ $list-group-disabled-bg: $list-group-bg !default;
767
878
  $list-group-disabled-text-color: $list-group-disabled-color !default;
768
879
 
769
- $list-group-link-color: #555 !default;
770
- $list-group-link-hover-color: $list-group-link-color !default;
771
- $list-group-link-heading-color: #333 !default;
880
+ $list-group-link-color: $gray !default;
881
+ $list-group-link-heading-color: $gray-dark !default;
882
+ $list-group-link-hover-color: $list-group-link-color !default;
772
883
 
773
- $list-group-item-padding-x: 1.25rem !default;
774
- $list-group-item-padding-y: .75rem !default;
775
- $list-group-item-heading-margin-bottom: 5px !default;
884
+ $list-group-link-active-color: $list-group-color !default;
885
+ $list-group-link-active-bg: $gray-lighter !default;
776
886
 
777
887
 
778
888
  // Image thumbnails
@@ -782,12 +892,14 @@ $thumbnail-bg: $body-bg !default;
782
892
  $thumbnail-border-width: $border-width !default;
783
893
  $thumbnail-border-color: #ddd !default;
784
894
  $thumbnail-border-radius: $border-radius !default;
785
- $thumbnail-box-shadow: 0 1px 2px rgba(0,0,0,.075) !default;
895
+ $thumbnail-box-shadow: 0 1px 2px rgba($black,.075) !default;
896
+ $thumbnail-transition: all .2s ease-in-out !default;
786
897
 
787
898
 
788
899
  // Figures
789
900
 
790
901
  $figure-caption-font-size: 90% !default;
902
+ $figure-caption-color: $gray-light !default;
791
903
 
792
904
 
793
905
  // Breadcrumbs
@@ -802,42 +914,34 @@ $breadcrumb-active-color: $gray-light !default;
802
914
  $breadcrumb-divider: "/" !default;
803
915
 
804
916
 
805
- // Media objects
806
-
807
- $media-margin-top: 15px !default;
808
- $media-heading-margin-bottom: 5px !default;
809
- $media-alignment-padding-x: 10px !default;
810
-
811
-
812
917
  // Carousel
813
918
 
814
- $carousel-text-shadow: 0 1px 2px rgba(0,0,0,.6) !default;
815
-
816
- $carousel-control-color: #fff !default;
919
+ $carousel-control-color: $white !default;
817
920
  $carousel-control-width: 15% !default;
818
- $carousel-control-sm-up-size: 30px !default;
819
921
  $carousel-control-opacity: .5 !default;
820
- $carousel-control-font-size: 20px !default;
821
-
822
- $carousel-indicators-width: 60% !default;
823
922
 
824
- $carousel-indicator-size: 10px !default;
825
- $carousel-indicator-active-size: 12px !default;
826
- $carousel-indicator-active-bg: #fff !default;
827
- $carousel-indicator-border-color: #fff !default;
923
+ $carousel-indicator-width: 30px !default;
924
+ $carousel-indicator-height: 3px !default;
925
+ $carousel-indicator-spacer: 3px !default;
926
+ $carousel-indicator-active-bg: $white !default;
828
927
 
829
928
  $carousel-caption-width: 70% !default;
830
- $carousel-caption-sm-up-width: 60% !default;
831
- $carousel-caption-color: #fff !default;
929
+ $carousel-caption-color: $white !default;
930
+
931
+ $carousel-control-icon-width: 20px !default;
932
+
933
+ $carousel-control-prev-icon-bg: str-replace(url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' fill='#{$carousel-control-color}' viewBox='0 0 8 8'%3E%3Cpath d='M4 0l-4 4 4 4 1.5-1.5-2.5-2.5 2.5-2.5-1.5-1.5z'/%3E%3C/svg%3E"), "#", "%23") !default;
934
+ $carousel-control-next-icon-bg: str-replace(url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' fill='#{$carousel-control-color}' viewBox='0 0 8 8'%3E%3Cpath d='M1.5 0l-1.5 1.5 2.5 2.5-2.5 2.5 1.5 1.5 4-4-4-4z'/%3E%3C/svg%3E"), "#", "%23") !default;
832
935
 
833
- $carousel-icon-width: 20px !default;
936
+ $carousel-transition: transform .6s ease-in-out !default;
834
937
 
835
938
 
836
939
  // Close
837
940
 
838
- $close-font-weight: bold !default;
839
- $close-color: #000 !default;
840
- $close-text-shadow: 0 1px 0 #fff !default;
941
+ $close-font-size: $font-size-base * 1.5 !default;
942
+ $close-font-weight: $font-weight-bold !default;
943
+ $close-color: $black !default;
944
+ $close-text-shadow: 0 1px 0 $white !default;
841
945
 
842
946
 
843
947
  // Code
@@ -846,12 +950,12 @@ $code-font-size: 90% !default;
846
950
  $code-padding-x: .4rem !default;
847
951
  $code-padding-y: .2rem !default;
848
952
  $code-color: #bd4147 !default;
849
- $code-bg: #f7f7f9 !default;
953
+ $code-bg: $gray-lightest !default;
850
954
 
851
- $kbd-color: #fff !default;
852
- $kbd-bg: #333 !default;
955
+ $kbd-color: $white !default;
956
+ $kbd-bg: $gray-dark !default;
853
957
 
854
- $pre-bg: #f7f7f9 !default;
958
+ $pre-bg: $gray-lightest !default;
855
959
  $pre-color: $gray-dark !default;
856
960
  $pre-border-color: #ccc !default;
857
961
  $pre-scrollable-max-height: 340px !default;