Skip to content

Commit c8c2519

Browse files
author
Calvin Allen
committed
Upgrade all teh things
1 parent 0097eeb commit c8c2519

File tree

6 files changed

+91
-98
lines changed

6 files changed

+91
-98
lines changed

‎.ruby-version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
ruby-2.7.2
1+
ruby-3.3.2

‎Gemfile.lock‎

Lines changed: 32 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,26 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
addressable (2.8.1)
4+
addressable (2.8.6)
55
public_suffix (>= 2.0.2, < 6.0)
6+
bigdecimal (3.1.8)
67
colorator (1.1.0)
7-
concurrent-ruby (1.1.10)
8+
concurrent-ruby (1.3.1)
89
configatron (4.5.1)
910
em-websocket (0.5.3)
1011
eventmachine (>= 0.12.9)
1112
http_parser.rb (~> 0)
1213
eventmachine (1.2.7)
1314
eventmachine (1.2.7-x64-mingw32)
14-
ffi (1.15.5)
15-
ffi (1.15.5-x64-mingw32)
16-
ffi (1.15.5-x64-unknown)
15+
ffi (1.16.3)
1716
forwardable-extended (2.6.0)
17+
google-protobuf (4.27.0)
18+
bigdecimal
19+
rake (>= 13)
1820
http_parser.rb (0.8.0)
19-
i18n (1.12.0)
21+
i18n (1.14.5)
2022
concurrent-ruby (~> 1.0)
21-
jekyll (4.3.1)
23+
jekyll (4.3.3)
2224
addressable (~> 2.4)
2325
colorator (~> 1.0)
2426
em-websocket (~> 0.5)
@@ -37,42 +39,50 @@ GEM
3739
jekyll-environment-variables (1.0.1)
3840
jekyll (>= 3.0, < 5.x)
3941
jekyll-paginate (1.1.0)
40-
jekyll-sass-converter (2.2.0)
41-
sassc (> 2.0.1, < 3.0)
42+
jekyll-sass-converter (3.0.0)
43+
sass-embedded (~> 1.54)
4244
jekyll-watch (2.2.1)
4345
listen (~> 3.0)
4446
kramdown (2.4.0)
4547
rexml
4648
kramdown-parser-gfm (1.1.0)
4749
kramdown (~> 2.0)
48-
liquid (4.0.3)
49-
listen (3.7.1)
50+
liquid (4.0.4)
51+
listen (3.9.0)
5052
rb-fsevent (~> 0.10, >= 0.10.3)
5153
rb-inotify (~> 0.9, >= 0.9.10)
5254
mercenary (0.4.0)
5355
pathutil (0.16.2)
5456
forwardable-extended (~> 2.6)
55-
public_suffix (5.0.1)
57+
public_suffix (5.0.5)
58+
rake (13.2.1)
5659
rb-fsevent (0.11.2)
57-
rb-inotify (0.10.1)
60+
rb-inotify (0.11.1)
5861
ffi (~> 1.0)
59-
rexml (3.2.5)
60-
rouge (4.0.0)
62+
rexml (3.2.8)
63+
strscan (>= 3.0.9)
64+
rouge (4.2.1)
6165
safe_yaml (1.0.5)
62-
sassc (2.4.0)
63-
ffi (~> 1.9)
64-
sassc (2.4.0-x64-mingw32)
65-
ffi (~> 1.9)
66+
sass-embedded (1.77.4)
67+
google-protobuf (>= 3.25, < 5.0)
68+
rake (>= 13)
69+
sass-embedded (1.77.4-arm64-darwin)
70+
google-protobuf (>= 3.25, < 5.0)
71+
sass-embedded (1.77.4-x64-mingw32)
72+
google-protobuf (>= 3.25, < 5.0)
73+
sass-embedded (1.77.4-x86_64-darwin)
74+
google-protobuf (>= 3.25, < 5.0)
75+
strscan (3.1.0)
6676
terminal-table (3.0.2)
6777
unicode-display_width (>= 1.1.1, < 3)
68-
unicode-display_width (2.3.0)
69-
webrick (1.7.0)
78+
unicode-display_width (2.5.0)
79+
webrick (1.8.1)
7080

7181
PLATFORMS
7282
arm64-darwin-22
83+
arm64-darwin-23
7384
x64-mingw32
7485
x64-unknown
75-
x64-unknown
7686
x86_64-darwin-20
7787

7888
DEPENDENCIES

‎_sass/framework/_variables.scss‎

Lines changed: 25 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -12,37 +12,36 @@ $container-max-widths: (
1212
md: 720px,
1313
lg: 960px,
1414
xl: 1140px,
15-
xxl: 1320px
15+
xxl: 1320px,
1616
);
1717

1818
$grid-gutter-width: 30px;
1919
$section-gutter: 30px;
2020

21-
$spacers:
22-
(
23-
"gutter": $grid-gutter-width,
24-
"gutter-half": $grid-gutter-width / 2,
25-
0: 0,
26-
1: 10px,
27-
2: 20px,
28-
3: 30px,
29-
4: 40px,
30-
5: 50px,
31-
6: 60px,
32-
7: 70px,
33-
8: 80px,
34-
9: 90px,
35-
10: 100px,
36-
11: 110px,
37-
12: 120px,
38-
13: 130px,
39-
14: 140px,
40-
15: 150px,
41-
16: 160px,
42-
17: 170px,
43-
18: 180px,
44-
19: 190px,
45-
20: 200px
21+
$spacers: (
22+
"gutter": $grid-gutter-width,
23+
"gutter-half": calc($grid-gutter-width / 2),
24+
0: 0,
25+
1: 10px,
26+
2: 20px,
27+
3: 30px,
28+
4: 40px,
29+
5: 50px,
30+
6: 60px,
31+
7: 70px,
32+
8: 80px,
33+
9: 90px,
34+
10: 100px,
35+
11: 110px,
36+
12: 120px,
37+
13: 130px,
38+
14: 140px,
39+
15: 150px,
40+
16: 160px,
41+
17: 170px,
42+
18: 180px,
43+
19: 190px,
44+
20: 200px,
4645
);
4746

4847
// Theme Variables

‎_sass/framework/bootstrap/vendor/_rfs.scss‎

Lines changed: 30 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
// Licensed under MIT (https://github.com/twbs/rfs/blob/main/LICENSE)
88

99
// Configuration
10+
@use "sass:math";
1011

1112
// Base value
1213
$rfs-base-value: 1.25rem !default;
@@ -54,7 +55,7 @@ $rfs-base-value-unit: unit($rfs-base-value);
5455

5556
@function divide($dividend, $divisor, $precision: 10) {
5657
$sign: if($dividend > 0 and $divisor > 0 or $dividend < 0 and $divisor < 0, 1, -1);
57-
$dividend: abs($dividend);
58+
$dividend: math.abs($dividend);
5859
$divisor: abs($divisor);
5960
@if $dividend == 0 {
6061
@return 0;
@@ -72,7 +73,7 @@ $rfs-base-value-unit: unit($rfs-base-value);
7273
$quotient: $quotient + 1;
7374
}
7475
$result: $result * 10 + $quotient;
75-
$factor: $factor * .1;
76+
$factor: $factor * 0.1;
7677
$remainder: $remainder * 10;
7778
$precision: $precision - 1;
7879
@if ($precision < 0 and $remainder >= $divisor * 5) {
@@ -86,7 +87,7 @@ $rfs-base-value-unit: unit($rfs-base-value);
8687
"px": 1px,
8788
"rem": 1rem,
8889
"em": 1em,
89-
"%": 1%
90+
"%": 1%,
9091
);
9192
@if ($dividend-unit != $divisor-unit and map-has-key($unit-map, $dividend-unit)) {
9293
$result: $result * map-get($unit-map, $dividend-unit);
@@ -97,8 +98,7 @@ $rfs-base-value-unit: unit($rfs-base-value);
9798
// Remove px-unit from $rfs-base-value for calculations
9899
@if $rfs-base-value-unit == px {
99100
$rfs-base-value: divide($rfs-base-value, $rfs-base-value * 0 + 1);
100-
}
101-
@else if $rfs-base-value-unit == rem {
101+
} @else if $rfs-base-value-unit == rem {
102102
$rfs-base-value: divide($rfs-base-value, divide($rfs-base-value * 0 + 1, $rfs-rem-value));
103103
}
104104

@@ -108,8 +108,7 @@ $rfs-breakpoint-unit-cache: unit($rfs-breakpoint);
108108
// Remove unit from $rfs-breakpoint for calculations
109109
@if $rfs-breakpoint-unit-cache == px {
110110
$rfs-breakpoint: divide($rfs-breakpoint, $rfs-breakpoint * 0 + 1);
111-
}
112-
@else if $rfs-breakpoint-unit-cache == rem or $rfs-breakpoint-unit-cache == "em" {
111+
} @else if $rfs-breakpoint-unit-cache == rem or $rfs-breakpoint-unit-cache == "em" {
113112
$rfs-breakpoint: divide($rfs-breakpoint, divide($rfs-breakpoint * 0 + 1, $rfs-rem-value));
114113
}
115114

@@ -125,14 +124,12 @@ $rfs-mq-property-height: if($rfs-mode == max-media-query, max-height, min-height
125124
@media (#{$rfs-mq-property-width}: #{$rfs-mq-value}), (#{$rfs-mq-property-height}: #{$rfs-mq-value}) {
126125
@content;
127126
}
128-
}
129-
@else {
127+
} @else {
130128
@media (#{$rfs-mq-property-width}: #{$rfs-mq-value}) and (#{$rfs-mq-property-height}: #{$rfs-mq-value}) {
131129
@content;
132130
}
133131
}
134-
}
135-
@else {
132+
} @else {
136133
@media (#{$rfs-mq-property-width}: #{$rfs-mq-value}) {
137134
@content;
138135
}
@@ -148,21 +145,18 @@ $rfs-mq-property-height: if($rfs-mode == max-media-query, max-height, min-height
148145
&.disable-rfs {
149146
@content;
150147
}
151-
}
152-
@else if $rfs-class == enable and $rfs-mode == min-media-query {
148+
} @else if $rfs-class == enable and $rfs-mode == min-media-query {
153149
.enable-rfs &,
154150
&.enable-rfs {
155151
@content;
156152
}
157-
}
158-
@else {
153+
} @else {
159154
@content;
160155
}
161156
}
162157

163158
// Internal mixin that adds enable classes to the selector if needed.
164159
@mixin _rfs-media-query-rule {
165-
166160
@if $rfs-class == enable {
167161
@if $rfs-mode == min-media-query {
168162
@content;
@@ -174,8 +168,7 @@ $rfs-mq-property-height: if($rfs-mode == max-media-query, max-height, min-height
174168
@content;
175169
}
176170
}
177-
}
178-
@else {
171+
} @else {
179172
@if $rfs-class == disable and $rfs-mode == min-media-query {
180173
.disable-rfs &,
181174
&.disable-rfs {
@@ -191,30 +184,27 @@ $rfs-mq-property-height: if($rfs-mode == max-media-query, max-height, min-height
191184
// Helper function to get the formatted non-responsive value
192185
@function rfs-value($values) {
193186
// Convert to list
194-
$values: if(type-of($values) != list, ($values,), $values);
187+
$values: if(type-of($values) != list, ($values), $values);
195188

196-
$val: '';
189+
$val: "";
197190

198191
// Loop over each value and calculate value
199192
@each $value in $values {
200193
@if $value == 0 {
201-
$val: $val + ' 0';
202-
}
203-
@else {
194+
$val: $val + " 0";
195+
} @else {
204196
// Cache $value unit
205197
$unit: if(type-of($value) == "number", unit($value), false);
206198

207199
@if $unit == px {
208200
// Convert to rem if needed
209-
$val: $val + ' ' + if($rfs-unit == rem, #{divide($value, $value * 0 + $rfs-rem-value)}rem, $value);
210-
}
211-
@else if $unit == rem {
201+
$val: $val + " " + if($rfs-unit == rem, #{divide($value, $value * 0 + $rfs-rem-value)}rem, $value);
202+
} @else if $unit == rem {
212203
// 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 {
204+
$val: $val + " " + if($rfs-unit == px, #{divide($value, $value * 0 + 1) * $rfs-rem-value}px, $value);
205+
} @else {
216206
// 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;
207+
$val: $val + " " + $value;
218208
}
219209
}
220210
}
@@ -226,34 +216,29 @@ $rfs-mq-property-height: if($rfs-mode == max-media-query, max-height, min-height
226216
// Helper function to get the responsive value calculated by RFS
227217
@function rfs-fluid-value($values) {
228218
// Convert to list
229-
$values: if(type-of($values) != list, ($values,), $values);
219+
$values: if(type-of($values) != list, ($values), $values);
230220

231-
$val: '';
221+
$val: "";
232222

233223
// Loop over each value and calculate value
234224
@each $value in $values {
235225
@if $value == 0 {
236-
$val: $val + ' 0';
237-
}
238-
239-
@else {
226+
$val: $val + " 0";
227+
} @else {
240228
// Cache $value unit
241229
$unit: if(type-of($value) == "number", unit($value), false);
242230

243231
// 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
244232
@if not $unit or $unit != px and $unit != rem {
245-
$val: $val + ' ' + $value;
246-
}
247-
248-
@else {
233+
$val: $val + " " + $value;
234+
} @else {
249235
// Remove unit from $value for calculations
250236
$value: divide($value, $value * 0 + if($unit == px, 1, divide(1, $rfs-rem-value)));
251237

252238
// Only add the media query if the value is greater than the minimum value
253239
@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);
255-
}
256-
@else {
240+
$val: $val + " " + if($rfs-unit == rem, #{divide($value, $rfs-rem-value)}rem, #{$value}px);
241+
} @else {
257242
// Calculate the minimum value
258243
$value-min: $rfs-base-value + divide(abs($value) - $rfs-base-value, $rfs-factor);
259244

@@ -273,7 +258,7 @@ $rfs-mq-property-height: if($rfs-mode == max-media-query, max-height, min-height
273258
$variable-width: #{divide($value-diff * 100, $rfs-breakpoint)}#{$variable-unit};
274259

275260
// Return the calculated value
276-
$val: $val + ' calc(' + $min-width + if($value < 0, ' - ', ' + ') + $variable-width + ')';
261+
$val: $val + " calc(" + $min-width + if($value < 0, " - ", " + ") + $variable-width + ")";
277262
}
278263
}
279264
}
@@ -292,8 +277,7 @@ $rfs-mq-property-height: if($rfs-mode == max-media-query, max-height, min-height
292277
// Do not print the media query if responsive & non-responsive values are the same
293278
@if $val == $fluidVal {
294279
#{$property}: $val;
295-
}
296-
@else {
280+
} @else {
297281
@include _rfs-rule {
298282
#{$property}: if($rfs-mode == max-media-query, $val, $fluidVal);
299283

‎_sass/framework/zerostatic/blocks/sections/_title.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
}
9191
.title-cols {
9292
display: flex;
93-
gap: $grid-gutter-width / 2;
93+
gap: calc($grid-gutter-width / 2);
9494
flex-direction: column;
9595
@include media-breakpoint-up(md) {
9696
gap: $grid-gutter-width;

‎_sass/framework/zerostatic/global/_bottom.scss‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.bottom {
22
background-color: var(--color-bottom-bg);
3-
padding-top: $section-gutter / 2;
4-
padding-bottom: $section-gutter / 2;
3+
padding-top: calc($section-gutter / 2);
4+
padding-bottom: calc($section-gutter / 2);
55
font-size: 12px;
66
.copyright {
77
padding: 3px 0;

0 commit comments

Comments
 (0)