Skip to content

Commit 3ba7ca4

Browse files
XhmikosRmdo
authored andcommitted
Update RFS to v10.0.0
1 parent ae43f0c commit 3ba7ca4

File tree

2 files changed

+24
-30
lines changed

2 files changed

+24
-30
lines changed

config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ params:
5555
current_version: "5.3.0-alpha2"
5656
current_ruby_version: "5.3.0-alpha2"
5757
docs_version: "5.3"
58-
rfs_version: "v9.0.6"
58+
rfs_version: "v10.0.0"
5959
github_org: "https://github.com/twbs"
6060
repo: "https://github.com/twbs/bootstrap"
6161
twitter: "getbootstrap"

scss/vendor/_rfs.scss

Lines changed: 23 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// stylelint-disable property-disallowed-list, scss/dollar-variable-default
1+
// stylelint-disable scss/dimension-no-non-numeric-values
22

33
// SCSS RFS mixin
44
//
@@ -154,8 +154,7 @@ $rfs-mq-property-height: if($rfs-mode == max-media-query, max-height, min-height
154154
&.enable-rfs {
155155
@content;
156156
}
157-
}
158-
@else {
157+
} @else {
159158
@content;
160159
}
161160
}
@@ -168,7 +167,7 @@ $rfs-mq-property-height: if($rfs-mode == max-media-query, max-height, min-height
168167
@content;
169168
}
170169

171-
@include _rfs-media-query {
170+
@include _rfs-media-query () {
172171
.enable-rfs &,
173172
&.enable-rfs {
174173
@content;
@@ -182,7 +181,7 @@ $rfs-mq-property-height: if($rfs-mode == max-media-query, max-height, min-height
182181
@content;
183182
}
184183
}
185-
@include _rfs-media-query {
184+
@include _rfs-media-query () {
186185
@content;
187186
}
188187
}
@@ -193,28 +192,27 @@ $rfs-mq-property-height: if($rfs-mode == max-media-query, max-height, min-height
193192
// Convert to list
194193
$values: if(type-of($values) != list, ($values,), $values);
195194

196-
$val: '';
195+
$val: "";
197196

198197
// Loop over each value and calculate value
199198
@each $value in $values {
200199
@if $value == 0 {
201-
$val: $val + ' 0';
200+
$val: $val + " 0";
202201
}
203202
@else {
204203
// Cache $value unit
205204
$unit: if(type-of($value) == "number", unit($value), false);
206205

207206
@if $unit == px {
208207
// Convert to rem if needed
209-
$val: $val + ' ' + if($rfs-unit == rem, #{divide($value, $value * 0 + $rfs-rem-value)}rem, $value);
208+
$val: $val + " " + if($rfs-unit == rem, #{divide($value, $value * 0 + $rfs-rem-value)}rem, $value);
210209
}
211210
@else if $unit == rem {
212211
// Convert to px if needed
213-
$val: $val + ' ' + if($rfs-unit == px, #{divide($value, $value * 0 + 1) * $rfs-rem-value}px, $value);
214-
}
215-
@else {
212+
$val: $val + " " + if($rfs-unit == px, #{divide($value, $value * 0 + 1) * $rfs-rem-value}px, $value);
213+
} @else {
216214
// If $value isn't a number (like inherit) or $value has a unit (not px or rem, like 1.5em) or $ is 0, just print the value
217-
$val: $val + ' ' + $value;
215+
$val: $val + " " + $value;
218216
}
219217
}
220218
}
@@ -228,30 +226,26 @@ $rfs-mq-property-height: if($rfs-mode == max-media-query, max-height, min-height
228226
// Convert to list
229227
$values: if(type-of($values) != list, ($values,), $values);
230228

231-
$val: '';
229+
$val: "";
232230

233231
// Loop over each value and calculate value
234232
@each $value in $values {
235233
@if $value == 0 {
236-
$val: $val + ' 0';
237-
}
238-
239-
@else {
234+
$val: $val + " 0";
235+
} @else {
240236
// Cache $value unit
241237
$unit: if(type-of($value) == "number", unit($value), false);
242238

243239
// If $value isn't a number (like inherit) or $value has a unit (not px or rem, like 1.5em) or $ is 0, just print the value
244240
@if not $unit or $unit != px and $unit != rem {
245-
$val: $val + ' ' + $value;
246-
}
247-
248-
@else {
241+
$val: $val + " " + $value;
242+
} @else {
249243
// Remove unit from $value for calculations
250244
$value: divide($value, $value * 0 + if($unit == px, 1, divide(1, $rfs-rem-value)));
251245

252246
// Only add the media query if the value is greater than the minimum value
253247
@if abs($value) <= $rfs-base-value or not $enable-rfs {
254-
$val: $val + ' ' + if($rfs-unit == rem, #{divide($value, $rfs-rem-value)}rem, #{$value}px);
248+
$val: $val + " " + if($rfs-unit == rem, #{divide($value, $rfs-rem-value)}rem, #{$value}px);
255249
}
256250
@else {
257251
// Calculate the minimum value
@@ -273,7 +267,7 @@ $rfs-mq-property-height: if($rfs-mode == max-media-query, max-height, min-height
273267
$variable-width: #{divide($value-diff * 100, $rfs-breakpoint)}#{$variable-unit};
274268

275269
// Return the calculated value
276-
$val: $val + ' calc(' + $min-width + if($value < 0, ' - ', ' + ') + $variable-width + ')';
270+
$val: $val + " calc(" + $min-width + if($value < 0, " - ", " + ") + $variable-width + ")";
277271
}
278272
}
279273
}
@@ -287,22 +281,22 @@ $rfs-mq-property-height: if($rfs-mode == max-media-query, max-height, min-height
287281
@mixin rfs($values, $property: font-size) {
288282
@if $values != null {
289283
$val: rfs-value($values);
290-
$fluidVal: rfs-fluid-value($values);
284+
$fluid-val: rfs-fluid-value($values);
291285

292286
// Do not print the media query if responsive & non-responsive values are the same
293-
@if $val == $fluidVal {
287+
@if $val == $fluid-val {
294288
#{$property}: $val;
295289
}
296290
@else {
297-
@include _rfs-rule {
298-
#{$property}: if($rfs-mode == max-media-query, $val, $fluidVal);
291+
@include _rfs-rule () {
292+
#{$property}: if($rfs-mode == max-media-query, $val, $fluid-val);
299293

300294
// Include safari iframe resize fix if needed
301295
min-width: if($rfs-safari-iframe-resize-bug-fix, (0 * 1vw), null);
302296
}
303297

304-
@include _rfs-media-query-rule {
305-
#{$property}: if($rfs-mode == max-media-query, $fluidVal, $val);
298+
@include _rfs-media-query-rule () {
299+
#{$property}: if($rfs-mode == max-media-query, $fluid-val, $val);
306300
}
307301
}
308302
}

0 commit comments

Comments
 (0)