bootstrap 4.6.0 → 4.6.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/README.md +1 -1
- data/assets/javascripts/bootstrap/alert.js +31 -36
- data/assets/javascripts/bootstrap/button.js +31 -36
- data/assets/javascripts/bootstrap/carousel.js +86 -96
- data/assets/javascripts/bootstrap/collapse.js +68 -74
- data/assets/javascripts/bootstrap/dropdown.js +71 -80
- data/assets/javascripts/bootstrap/modal.js +119 -125
- data/assets/javascripts/bootstrap/popover.js +40 -35
- data/assets/javascripts/bootstrap/scrollspy.js +47 -55
- data/assets/javascripts/bootstrap/tab.js +54 -53
- data/assets/javascripts/bootstrap/toast.js +42 -46
- data/assets/javascripts/bootstrap/tooltip.js +111 -114
- data/assets/javascripts/bootstrap/util.js +16 -19
- data/assets/javascripts/bootstrap-sprockets.js +7 -7
- data/assets/javascripts/bootstrap.js +792 -868
- data/assets/javascripts/bootstrap.min.js +3 -3
- data/assets/stylesheets/_bootstrap-grid.scss +3 -3
- data/assets/stylesheets/_bootstrap-reboot.scss +3 -3
- data/assets/stylesheets/_bootstrap.scss +3 -3
- data/assets/stylesheets/bootstrap/_card.scss +5 -5
- data/assets/stylesheets/bootstrap/_carousel.scss +5 -2
- data/assets/stylesheets/bootstrap/_custom-forms.scss +8 -8
- data/assets/stylesheets/bootstrap/_forms.scss +10 -10
- data/assets/stylesheets/bootstrap/_functions.scss +47 -1
- data/assets/stylesheets/bootstrap/_images.scss +1 -1
- data/assets/stylesheets/bootstrap/_input-group.scss +3 -0
- data/assets/stylesheets/bootstrap/_jumbotron.scss +1 -1
- data/assets/stylesheets/bootstrap/_modal.scss +2 -2
- data/assets/stylesheets/bootstrap/_nav.scss +5 -0
- data/assets/stylesheets/bootstrap/_popover.scss +9 -9
- data/assets/stylesheets/bootstrap/_print.scss +0 -9
- data/assets/stylesheets/bootstrap/_spinners.scss +4 -4
- data/assets/stylesheets/bootstrap/_tooltip.scss +4 -4
- data/assets/stylesheets/bootstrap/_transitions.scss +6 -0
- data/assets/stylesheets/bootstrap/_variables.scss +14 -11
- data/assets/stylesheets/bootstrap/mixins/_forms.scss +13 -3
- data/assets/stylesheets/bootstrap/mixins/_grid-framework.scss +2 -2
- data/assets/stylesheets/bootstrap/mixins/_grid.scss +11 -11
- data/assets/stylesheets/bootstrap/mixins/_reset-text.scss +1 -1
- data/assets/stylesheets/bootstrap/mixins/_screen-reader.scss +1 -1
- data/assets/stylesheets/bootstrap/utilities/_embed.scss +1 -1
- data/assets/stylesheets/bootstrap/utilities/_spacing.scss +1 -1
- data/assets/stylesheets/bootstrap/vendor/_rfs.scss +126 -102
- data/bootstrap.gemspec +1 -1
- data/lib/bootstrap/version.rb +2 -2
- data/tasks/updater/js.rb +18 -6
- data/tasks/updater/network.rb +7 -1
- metadata +4 -4
@@ -2,9 +2,9 @@
|
|
2
2
|
|
3
3
|
// SCSS RFS mixin
|
4
4
|
//
|
5
|
-
// Automated font
|
5
|
+
// Automated responsive font sizes
|
6
6
|
//
|
7
|
-
//
|
7
|
+
// Licensed under MIT (https://github.com/twbs/rfs/blob/v8.x/LICENSE)
|
8
8
|
|
9
9
|
// Configuration
|
10
10
|
|
@@ -12,11 +12,19 @@
|
|
12
12
|
$rfs-base-font-size: 1.25rem !default;
|
13
13
|
$rfs-font-size-unit: rem !default;
|
14
14
|
|
15
|
+
@if $rfs-font-size-unit != rem and $rfs-font-size-unit != px {
|
16
|
+
@error "`#{$rfs-font-size-unit}` is not a valid unit for $rfs-font-size-unit. Use `px` or `rem`.";
|
17
|
+
}
|
18
|
+
|
15
19
|
// Breakpoint at where font-size starts decreasing if screen width is smaller
|
16
20
|
$rfs-breakpoint: 1200px !default;
|
17
21
|
$rfs-breakpoint-unit: px !default;
|
18
22
|
|
19
|
-
|
23
|
+
@if $rfs-breakpoint-unit != px and $rfs-breakpoint-unit != em and $rfs-breakpoint-unit != rem {
|
24
|
+
@error "`#{$rfs-breakpoint-unit}` is not a valid unit for $rfs-breakpoint-unit. Use `px`, `em` or `rem`.";
|
25
|
+
}
|
26
|
+
|
27
|
+
// Resize font size based on screen height and width
|
20
28
|
$rfs-two-dimensional: false !default;
|
21
29
|
|
22
30
|
// Factor of decrease
|
@@ -41,12 +49,54 @@ $enable-responsive-font-sizes: true !default;
|
|
41
49
|
// Cache $rfs-base-font-size unit
|
42
50
|
$rfs-base-font-size-unit: unit($rfs-base-font-size);
|
43
51
|
|
52
|
+
@function divide($dividend, $divisor, $precision: 10) {
|
53
|
+
$sign: if($dividend > 0 and $divisor > 0 or $dividend < 0 and $divisor < 0, 1, -1);
|
54
|
+
$dividend: abs($dividend);
|
55
|
+
$divisor: abs($divisor);
|
56
|
+
@if $dividend == 0 {
|
57
|
+
@return 0;
|
58
|
+
}
|
59
|
+
@if $divisor == 0 {
|
60
|
+
@error "Cannot divide by 0";
|
61
|
+
}
|
62
|
+
$remainder: $dividend;
|
63
|
+
$result: 0;
|
64
|
+
$factor: 10;
|
65
|
+
@while ($remainder > 0 and $precision >= 0) {
|
66
|
+
$quotient: 0;
|
67
|
+
@while ($remainder >= $divisor) {
|
68
|
+
$remainder: $remainder - $divisor;
|
69
|
+
$quotient: $quotient + 1;
|
70
|
+
}
|
71
|
+
$result: $result * 10 + $quotient;
|
72
|
+
$factor: $factor * .1;
|
73
|
+
$remainder: $remainder * 10;
|
74
|
+
$precision: $precision - 1;
|
75
|
+
@if ($precision < 0 and $remainder >= $divisor * 5) {
|
76
|
+
$result: $result + 1;
|
77
|
+
}
|
78
|
+
}
|
79
|
+
$result: $result * $factor * $sign;
|
80
|
+
$dividend-unit: unit($dividend);
|
81
|
+
$divisor-unit: unit($divisor);
|
82
|
+
$unit-map: (
|
83
|
+
"px": 1px,
|
84
|
+
"rem": 1rem,
|
85
|
+
"em": 1em,
|
86
|
+
"%": 1%
|
87
|
+
);
|
88
|
+
@if ($dividend-unit != $divisor-unit and map-has-key($unit-map, $dividend-unit)) {
|
89
|
+
$result: $result * map-get($unit-map, $dividend-unit);
|
90
|
+
}
|
91
|
+
@return $result;
|
92
|
+
}
|
93
|
+
|
44
94
|
// Remove px-unit from $rfs-base-font-size for calculations
|
45
95
|
@if $rfs-base-font-size-unit == "px" {
|
46
|
-
$rfs-base-font-size: $rfs-base-font-size
|
96
|
+
$rfs-base-font-size: divide($rfs-base-font-size, $rfs-base-font-size * 0 + 1);
|
47
97
|
}
|
48
98
|
@else if $rfs-base-font-size-unit == "rem" {
|
49
|
-
$rfs-base-font-size: $rfs-base-font-size
|
99
|
+
$rfs-base-font-size: divide($rfs-base-font-size, divide($rfs-base-font-size * 0 + 1, $rfs-rem-value));
|
50
100
|
}
|
51
101
|
|
52
102
|
// Cache $rfs-breakpoint unit to prevent multiple calls
|
@@ -54,13 +104,55 @@ $rfs-breakpoint-unit-cache: unit($rfs-breakpoint);
|
|
54
104
|
|
55
105
|
// Remove unit from $rfs-breakpoint for calculations
|
56
106
|
@if $rfs-breakpoint-unit-cache == "px" {
|
57
|
-
$rfs-breakpoint: $rfs-breakpoint
|
107
|
+
$rfs-breakpoint: divide($rfs-breakpoint, $rfs-breakpoint * 0 + 1);
|
58
108
|
}
|
59
109
|
@else if $rfs-breakpoint-unit-cache == "rem" or $rfs-breakpoint-unit-cache == "em" {
|
60
|
-
$rfs-breakpoint: $rfs-breakpoint
|
110
|
+
$rfs-breakpoint: divide($rfs-breakpoint, divide($rfs-breakpoint * 0 + 1, $rfs-rem-value));
|
111
|
+
}
|
112
|
+
|
113
|
+
// Internal mixin that adds disable classes to the selector if needed.
|
114
|
+
@mixin _rfs-disable-class {
|
115
|
+
@if $rfs-class == "disable" {
|
116
|
+
// Adding an extra class increases specificity, which prevents the media query to override the font size
|
117
|
+
&,
|
118
|
+
.disable-responsive-font-size &,
|
119
|
+
&.disable-responsive-font-size {
|
120
|
+
@content;
|
121
|
+
}
|
122
|
+
}
|
123
|
+
@else {
|
124
|
+
@content;
|
125
|
+
}
|
126
|
+
}
|
127
|
+
|
128
|
+
// Internal mixin that adds enable classes to the selector if needed.
|
129
|
+
@mixin _rfs-enable-class {
|
130
|
+
@if $rfs-class == "enable" {
|
131
|
+
.enable-responsive-font-size &,
|
132
|
+
&.enable-responsive-font-size {
|
133
|
+
@content;
|
134
|
+
}
|
135
|
+
}
|
136
|
+
@else {
|
137
|
+
@content;
|
138
|
+
}
|
61
139
|
}
|
62
140
|
|
63
|
-
//
|
141
|
+
// Internal mixin used to determine which media query needs to be used
|
142
|
+
@mixin _rfs-media-query($mq-value) {
|
143
|
+
@if $rfs-two-dimensional {
|
144
|
+
@media (max-width: #{$mq-value}), (max-height: #{$mq-value}) {
|
145
|
+
@content;
|
146
|
+
}
|
147
|
+
}
|
148
|
+
@else {
|
149
|
+
@media (max-width: #{$mq-value}) {
|
150
|
+
@content;
|
151
|
+
}
|
152
|
+
}
|
153
|
+
}
|
154
|
+
|
155
|
+
// Responsive font size mixin
|
64
156
|
@mixin rfs($fs, $important: false) {
|
65
157
|
// Cache $fs unit
|
66
158
|
$fs-unit: if(type-of($fs) == "number", unit($fs), false);
|
@@ -73,128 +165,60 @@ $rfs-breakpoint-unit-cache: unit($rfs-breakpoint);
|
|
73
165
|
font-size: #{$fs}#{$rfs-suffix};
|
74
166
|
}
|
75
167
|
@else {
|
76
|
-
//
|
77
|
-
$rfs-static: null;
|
78
|
-
$rfs-fluid: null;
|
79
|
-
|
80
|
-
// Remove px-unit from $fs for calculations
|
168
|
+
// Remove unit from $fs for calculations
|
81
169
|
@if $fs-unit == "px" {
|
82
|
-
$fs: $fs
|
170
|
+
$fs: divide($fs, $fs * 0 + 1);
|
83
171
|
}
|
84
172
|
@else if $fs-unit == "rem" {
|
85
|
-
$fs: $fs
|
173
|
+
$fs: divide($fs, divide($fs * 0 + 1, $rfs-rem-value));
|
86
174
|
}
|
87
175
|
|
88
|
-
// Set default font
|
89
|
-
|
90
|
-
|
91
|
-
|
92
|
-
@
|
93
|
-
|
176
|
+
// Set default font size
|
177
|
+
$rfs-static: if($rfs-font-size-unit == rem, #{divide($fs, $rfs-rem-value)}rem, #{$fs}px);
|
178
|
+
|
179
|
+
// Only add the media query if the font size is bigger than the minimum font size
|
180
|
+
@if $fs <= $rfs-base-font-size or not $enable-responsive-font-sizes {
|
181
|
+
font-size: #{$rfs-static}#{$rfs-suffix};
|
94
182
|
}
|
95
183
|
@else {
|
96
|
-
|
97
|
-
|
98
|
-
|
99
|
-
// Only add media query if font-size is bigger as the minimum font-size
|
100
|
-
// If $rfs-factor == 1, no rescaling will take place
|
101
|
-
@if $fs > $rfs-base-font-size and $enable-responsive-font-sizes {
|
102
|
-
$min-width: null;
|
103
|
-
$variable-unit: null;
|
184
|
+
// Calculate the minimum font size for $fs
|
185
|
+
$fs-min: $rfs-base-font-size + divide($fs - $rfs-base-font-size, $rfs-factor);
|
104
186
|
|
105
|
-
// Calculate
|
106
|
-
$fs-min: $rfs-base-font-size + ($fs - $rfs-base-font-size) / $rfs-factor;
|
107
|
-
|
108
|
-
// Calculate difference between given font-size and minimum font-size for given font-size
|
187
|
+
// Calculate difference between $fs and the minimum font size
|
109
188
|
$fs-diff: $fs - $fs-min;
|
110
189
|
|
111
190
|
// Base font-size formatting
|
112
|
-
|
113
|
-
$min-width: if($rfs-font-size-unit == rem, #{$fs-min / $rfs-rem-value}rem, #{$fs-min}px);
|
191
|
+
$min-width: if($rfs-font-size-unit == rem, #{divide($fs-min, $rfs-rem-value)}rem, #{$fs-min}px);
|
114
192
|
|
115
|
-
//
|
193
|
+
// Use `vmin` if two-dimensional is enabled
|
116
194
|
$variable-unit: if($rfs-two-dimensional, vmin, vw);
|
117
195
|
|
118
196
|
// Calculate the variable width between 0 and $rfs-breakpoint
|
119
|
-
$variable-width: #{$fs-diff * 100
|
197
|
+
$variable-width: #{divide($fs-diff * 100, $rfs-breakpoint)}#{$variable-unit};
|
120
198
|
|
121
|
-
// Set the calculated font-size
|
199
|
+
// Set the calculated font-size
|
122
200
|
$rfs-fluid: calc(#{$min-width} + #{$variable-width}) #{$rfs-suffix};
|
123
|
-
}
|
124
201
|
|
125
|
-
|
126
|
-
|
127
|
-
// Only render static font-size if no fluid font-size is available
|
128
|
-
font-size: $rfs-static;
|
129
|
-
}
|
130
|
-
@else {
|
131
|
-
$mq-value: null;
|
202
|
+
// Breakpoint formatting
|
203
|
+
$mq-value: if($rfs-breakpoint-unit == px, #{$rfs-breakpoint}px, #{divide($rfs-breakpoint, $rfs-rem-value)}#{$rfs-breakpoint-unit});
|
132
204
|
|
133
|
-
|
134
|
-
|
135
|
-
$mq-value: #{$rfs-breakpoint / $rfs-rem-value}#{$rfs-breakpoint-unit};
|
136
|
-
}
|
137
|
-
@else if $rfs-breakpoint-unit == px {
|
138
|
-
$mq-value: #{$rfs-breakpoint}px;
|
139
|
-
}
|
140
|
-
@else {
|
141
|
-
@error "`#{$rfs-breakpoint-unit}` is not a valid unit for $rfs-breakpoint-unit. Use `px`, `em` or `rem`.";
|
205
|
+
@include _rfs-disable-class {
|
206
|
+
font-size: #{$rfs-static}#{$rfs-suffix};
|
142
207
|
}
|
143
208
|
|
144
|
-
@
|
145
|
-
|
146
|
-
|
147
|
-
&,
|
148
|
-
.disable-responsive-font-size &,
|
149
|
-
&.disable-responsive-font-size {
|
150
|
-
font-size: $rfs-static;
|
209
|
+
@include _rfs-media-query($mq-value) {
|
210
|
+
@include _rfs-enable-class {
|
211
|
+
font-size: $rfs-fluid;
|
151
212
|
}
|
152
|
-
}
|
153
|
-
@else {
|
154
|
-
font-size: $rfs-static;
|
155
|
-
}
|
156
213
|
|
157
|
-
|
158
|
-
|
159
|
-
@if $rfs-class == "enable" {
|
160
|
-
.enable-responsive-font-size &,
|
161
|
-
&.enable-responsive-font-size {
|
162
|
-
font-size: $rfs-fluid;
|
163
|
-
}
|
164
|
-
}
|
165
|
-
@else {
|
166
|
-
font-size: $rfs-fluid;
|
167
|
-
}
|
168
|
-
|
169
|
-
@if $rfs-safari-iframe-resize-bug-fix {
|
170
|
-
// stylelint-disable-next-line length-zero-no-unit
|
171
|
-
min-width: 0vw;
|
172
|
-
}
|
173
|
-
}
|
174
|
-
}
|
175
|
-
@else {
|
176
|
-
@media (max-width: #{$mq-value}) {
|
177
|
-
@if $rfs-class == "enable" {
|
178
|
-
.enable-responsive-font-size &,
|
179
|
-
&.enable-responsive-font-size {
|
180
|
-
font-size: $rfs-fluid;
|
181
|
-
}
|
182
|
-
}
|
183
|
-
@else {
|
184
|
-
font-size: $rfs-fluid;
|
185
|
-
}
|
186
|
-
|
187
|
-
@if $rfs-safari-iframe-resize-bug-fix {
|
188
|
-
// stylelint-disable-next-line length-zero-no-unit
|
189
|
-
min-width: 0vw;
|
190
|
-
}
|
191
|
-
}
|
214
|
+
// Include safari iframe resize fix if needed
|
215
|
+
min-width: if($rfs-safari-iframe-resize-bug-fix, (0 * 1vw), null);
|
192
216
|
}
|
193
217
|
}
|
194
218
|
}
|
195
219
|
}
|
196
220
|
|
197
|
-
// The font-size & responsive-font-size
|
221
|
+
// The font-size & responsive-font-size mixins use RFS to rescale the font size
|
198
222
|
@mixin font-size($fs, $important: false) {
|
199
223
|
@include rfs($fs, $important);
|
200
224
|
}
|
data/bootstrap.gemspec
CHANGED
@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
|
|
14
14
|
# SassC requires Ruby 2.3.3. Also specify here to make it obvious.
|
15
15
|
s.required_ruby_version = '>= 2.3.3'
|
16
16
|
|
17
|
-
s.add_runtime_dependency 'popper_js', '>= 1.
|
17
|
+
s.add_runtime_dependency 'popper_js', '>= 1.16.1', '< 2'
|
18
18
|
|
19
19
|
s.add_runtime_dependency 'sassc-rails', '>= 2.0.0'
|
20
20
|
s.add_runtime_dependency 'autoprefixer-rails', '>= 9.1.0'
|
data/lib/bootstrap/version.rb
CHANGED
data/tasks/updater/js.rb
CHANGED
@@ -1,7 +1,11 @@
|
|
1
|
+
require 'pathname'
|
1
2
|
require 'tsort'
|
2
3
|
|
3
4
|
class Updater
|
4
5
|
module Js
|
6
|
+
INLINED_SRCS = %w[index.js tools/sanitizer.js].freeze
|
7
|
+
EXTERNAL_JS = %w[popper.js].freeze
|
8
|
+
|
5
9
|
def update_javascript_assets
|
6
10
|
log_status 'Updating javascripts...'
|
7
11
|
save_to = @save_to[:js]
|
@@ -29,13 +33,15 @@ class Updater
|
|
29
33
|
|
30
34
|
def bootstrap_js_files
|
31
35
|
@bootstrap_js_files ||= begin
|
32
|
-
src_files = get_paths_by_type('js/src', /\.js$/) -
|
36
|
+
src_files = get_paths_by_type('js/src', /\.js$/) - INLINED_SRCS
|
37
|
+
puts "src_files: #{src_files.inspect}"
|
33
38
|
imports = Deps.new
|
34
39
|
# Get the imports from the ES6 files to order requires correctly.
|
35
40
|
read_files('js/src', src_files).each do |name, content|
|
36
|
-
|
37
|
-
|
38
|
-
|
41
|
+
file_imports = content.scan(%r{import *(?:[a-zA-Z]*|\{[a-zA-Z ,]*\}) *from '([\w/.-]+)}).flatten(1).map do |f|
|
42
|
+
Pathname.new(name).dirname.join(f.end_with?(".js") ? f : "#{f}.js").cleanpath.to_s
|
43
|
+
end.uniq
|
44
|
+
imports.add name, *(file_imports - INLINED_SRCS - EXTERNAL_JS)
|
39
45
|
end
|
40
46
|
imports.tsort
|
41
47
|
end
|
@@ -53,11 +59,17 @@ class Updater
|
|
53
59
|
end
|
54
60
|
|
55
61
|
def add(from, *tos)
|
56
|
-
(@imports[from] ||= [])
|
62
|
+
imports = (@imports[from] ||= [])
|
63
|
+
imports.push(*tos)
|
64
|
+
imports.sort!
|
57
65
|
end
|
58
66
|
|
59
67
|
def tsort_each_child(node, &block)
|
60
|
-
@imports[node]
|
68
|
+
node_imports = @imports[node]
|
69
|
+
if node_imports.nil?
|
70
|
+
raise "No imports found for #{node.inspect}\nImports:\n#{@imports.inspect}"
|
71
|
+
end
|
72
|
+
node_imports.each(&block)
|
61
73
|
end
|
62
74
|
|
63
75
|
def tsort_each_node(&block)
|
data/tasks/updater/network.rb
CHANGED
@@ -25,7 +25,13 @@ class Updater
|
|
25
25
|
log_http_get_files files, path_url, false
|
26
26
|
files.map do |name|
|
27
27
|
Thread.start {
|
28
|
-
|
28
|
+
begin
|
29
|
+
url = "#{path_url}/#{name}"
|
30
|
+
contents[name] = URI.open(url).read
|
31
|
+
rescue Exception => e
|
32
|
+
log "Error downloading #{url}: #{e}"
|
33
|
+
exit 1
|
34
|
+
end
|
29
35
|
WRITE_FILES_MUTEX.synchronize { write_cached_files path, name => contents[name] }
|
30
36
|
}
|
31
37
|
end.each(&:join)
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: bootstrap
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 4.6.
|
4
|
+
version: 4.6.2
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Twitter, Inc.
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2022-09-18 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: popper_js
|
@@ -16,7 +16,7 @@ dependencies:
|
|
16
16
|
requirements:
|
17
17
|
- - ">="
|
18
18
|
- !ruby/object:Gem::Version
|
19
|
-
version: 1.
|
19
|
+
version: 1.16.1
|
20
20
|
- - "<"
|
21
21
|
- !ruby/object:Gem::Version
|
22
22
|
version: '2'
|
@@ -26,7 +26,7 @@ dependencies:
|
|
26
26
|
requirements:
|
27
27
|
- - ">="
|
28
28
|
- !ruby/object:Gem::Version
|
29
|
-
version: 1.
|
29
|
+
version: 1.16.1
|
30
30
|
- - "<"
|
31
31
|
- !ruby/object:Gem::Version
|
32
32
|
version: '2'
|