Skip to content

Commit 415995c

Browse files
committed
rake update[v4-dev]
1 parent 6b1d5dd commit 415995c

3 files changed

Lines changed: 13 additions & 10 deletions

File tree

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
//= require ./bootstrap/util
2-
//= require ./bootstrap/tab
3-
//= require ./bootstrap/collapse
4-
//= require ./bootstrap/alert
52
//= require ./bootstrap/tooltip
63
//= require ./bootstrap/popover
74
//= require ./bootstrap/dropdown
85
//= require ./bootstrap/button
6+
//= require ./bootstrap/collapse
7+
//= require ./bootstrap/tab
98
//= require ./bootstrap/scrollspy
10-
//= require ./bootstrap/modal
119
//= require ./bootstrap/carousel
10+
//= require ./bootstrap/modal
11+
//= require ./bootstrap/alert
Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
11
:root {
2+
// Custom variable values only support SassScript inside `#{}`.
23
@each $color, $value in $colors {
3-
--#{$color}: $value;
4+
--#{$color}: #{$value};
45
}
56

67
@each $color, $value in $theme-colors {
7-
--#{$color}: $value;
8+
--#{$color}: #{$value};
89
}
910

1011
@each $bp, $value in $grid-breakpoints {
11-
--breakpoint-#{$bp}: $value;
12+
--breakpoint-#{$bp}: #{$value};
1213
}
1314

14-
--font-family-sans-serif: $font-family-sans-serif;
15-
--font-family-monospace: $font-family-monospace;
15+
// Use `inspect` for lists so that quoted items keep the quotes.
16+
// See https://github.com/sass/sass/issues/2383#issuecomment-336349172
17+
--font-family-sans-serif: #{inspect($font-family-sans-serif)};
18+
--font-family-monospace: #{inspect($font-family-monospace)};
1619
}

lib/bootstrap/version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
module Bootstrap
22
VERSION = '4.0.0.beta'
3-
BOOTSTRAP_SHA = 'c8ee8509cb72edd2f758398664bed8a0eeeb2dc4'
3+
BOOTSTRAP_SHA = 'a9fa21e701536e84789169fec6a1f4a0f821ee3c'
44
end

0 commit comments

Comments
 (0)